diff options
| -rw-r--r-- | llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp | 1 | ||||
| -rw-r--r-- | llvm/test/CodeGen/ARM/constantpool-promote-ldrh.ll | 22 |
2 files changed, 23 insertions, 0 deletions
diff --git a/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp b/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp index 6eb4d463965..d818030be33 100644 --- a/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp +++ b/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp @@ -1188,6 +1188,7 @@ ARMDAGToDAGISel::SelectThumbAddrModeImm5S(SDValue N, unsigned Scale, } else if (N.getOpcode() == ARMISD::Wrapper && N.getOperand(0).getOpcode() != ISD::TargetGlobalAddress && N.getOperand(0).getOpcode() != ISD::TargetExternalSymbol && + N.getOperand(0).getOpcode() != ISD::TargetConstantPool && N.getOperand(0).getOpcode() != ISD::TargetGlobalTLSAddress) { Base = N.getOperand(0); } else { diff --git a/llvm/test/CodeGen/ARM/constantpool-promote-ldrh.ll b/llvm/test/CodeGen/ARM/constantpool-promote-ldrh.ll new file mode 100644 index 00000000000..5d9a31a82d1 --- /dev/null +++ b/llvm/test/CodeGen/ARM/constantpool-promote-ldrh.ll @@ -0,0 +1,22 @@ +; RUN: llc < %s -O0 -fast-isel=false | FileCheck %s +; RUN: llc < %s -O0 -fast-isel=false -filetype=obj +target datalayout = "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64" +target triple = "thumbv6m-arm-linux-gnueabi" + +@fn1.a = private unnamed_addr constant [4 x i16] [i16 6, i16 0, i16 0, i16 0], align 2 + +; We must not try and emit this bad instruction: "ldrh r1, .LCPI0_0" +; CHECK-LABEL: fn1: +; CHECK: adr [[base:r[0-9]+]], .LCPI0_0 +; CHECK-NOT: ldrh {{r[0-9]+}}, .LCPI0_0 +; FIXME: We want to use [[base]] below instead of "r0", but the preceding square bracket confuses FileCheck. +; CHECK: ldrh r{{[0-9]+}}, [r0] +define hidden i32 @fn1() #0 { +entry: + call void @llvm.memcpy.p0i8.p0i8.i32(i8* undef, i8* bitcast ([4 x i16]* @fn1.a to i8*), i32 8, i32 2, i1 false) + ret i32 undef +} + +; Function Attrs: argmemonly nounwind +declare void @llvm.memcpy.p0i8.p0i8.i32(i8* nocapture writeonly, i8* nocapture readonly, i32, i32, i1) +attributes #0 = { "target-features"="+strict-align" } |
