RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2024-11-24 20:29:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ARM: fix fast-isel assertion failure

Browse Source 
Missing braces on if meant we inserted both ARM and Thumb load for a litpool
entry. This didn't end well.

rdar://problem/15959157

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@200752 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Tim Northover 2014-02-04 10:38:46 +00:00
parent c55ee815d4
commit 284c931330
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Target/ARM/ARMFastISel.cpp
View File

@ -653,13 +653,14 @@ unsigned ARMFastISel::ARMMaterializeInt(const Constant *C, MVT VT) {
AddOptionalDefs(BuildMI(*FuncInfo.MBB, FuncInfo.InsertPt, DL, AddOptionalDefs(BuildMI(*FuncInfo.MBB, FuncInfo.InsertPt, DL,
TII.get(ARM::t2LDRpci), DestReg) TII.get(ARM::t2LDRpci), DestReg)
.addConstantPoolIndex(Idx)); .addConstantPoolIndex(Idx));
else else {
// The extra immediate is for addrmode2. // The extra immediate is for addrmode2.
DestReg = constrainOperandRegClass(TII.get(ARM::LDRcp), DestReg, 0); DestReg = constrainOperandRegClass(TII.get(ARM::LDRcp), DestReg, 0);
AddOptionalDefs(BuildMI(*FuncInfo.MBB, FuncInfo.InsertPt, DL, AddOptionalDefs(BuildMI(*FuncInfo.MBB, FuncInfo.InsertPt, DL,
TII.get(ARM::LDRcp), DestReg) TII.get(ARM::LDRcp), DestReg)
.addConstantPoolIndex(Idx) .addConstantPoolIndex(Idx)
.addImm(0)); .addImm(0));
}
return DestReg; return DestReg;
} }

11
test/CodeGen/ARM/fastisel-thumb-litpool.ll Normal file
View File

@ -0,0 +1,11 @@
; RUN: llc -mtriple=thumbv7-apple-ios -O0 -o - %s | FileCheck %s
; We used to accidentally create both an ARM and a Thumb ldr here. It led to an
; assertion failure at the time, but could go all the way through to emission,
; hence the CHECK-NOT.
define i32 @test_thumb_ldrlit() minsize {
; CHECK: ldr r0, LCPI0_0
; CHECK-NOT: ldr
ret i32 12345678
}