6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-08-15 06:29:05 +00:00
Code Issues Projects Releases Wiki Activity

ARM64: fix assertion in ISelDAGToDAG

Browse Source 
Also an unused variable, so double bonus!

This should deal with PR19548.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@207221 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Tim Northover
2014-04-25 10:48:47 +00:00
parent 8aa927abb5
commit 5c4d1570ca
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Target/ARM64/ARM64ISelDAGToDAG.cpp
View File

@@ -1403,8 +1403,6 @@ static bool isBitfieldDstMask(uint64_t DstMask, APInt BitsToBeInserted,
assert((VT == MVT::i32 || VT == MVT::i64) && assert((VT == MVT::i32 || VT == MVT::i64) &&
"i32 or i64 mask type expected!"); "i32 or i64 mask type expected!");
unsigned BitWidth = VT.getSizeInBits() - NumberOfIgnoredHighBits; unsigned BitWidth = VT.getSizeInBits() - NumberOfIgnoredHighBits;
APInt SignificantBits =
~APInt::getHighBitsSet(BitWidth, NumberOfIgnoredHighBits);
APInt SignificantDstMask = APInt(BitWidth, DstMask); APInt SignificantDstMask = APInt(BitWidth, DstMask);
APInt SignificantBitsToBeInserted = BitsToBeInserted.zextOrTrunc(BitWidth); APInt SignificantBitsToBeInserted = BitsToBeInserted.zextOrTrunc(BitWidth);

17
test/CodeGen/ARM64/bitfield-extract.ll
View File

@@ -500,3 +500,20 @@ end:
%conv3 = phi i80 [%conv, %entry], [%conv2, %then] %conv3 = phi i80 [%conv, %entry], [%conv2, %then]
ret i80 %conv3 ret i80 %conv3
} }
define i16 @test_ignored_rightbits(i32 %dst, i32 %in) {
; CHECK-LABEL: test_ignored_rightbits:
%positioned_field = shl i32 %in, 3
%positioned_masked_field = and i32 %positioned_field, 120
%masked_dst = and i32 %dst, 7
%insertion = or i32 %masked_dst, %positioned_masked_field
; CHECK: {{bfm|bfi}}
%shl16 = shl i32 %insertion, 8
%or18 = or i32 %shl16, %insertion
%conv19 = trunc i32 %or18 to i16
; CHECK: {{bfm w[0-9]+, w[0-9]+, #24, #6|bfi w[0-9]+, w[0-9]+, #8, #7}}
ret i16 %conv19
}