diff options
| -rw-r--r-- | lib/CodeGen/SelectionDAG/SelectionDAG.cpp | 2 | ||||
| -rw-r--r-- | lib/Target/X86/X86ISelLowering.cpp | 2 | ||||
| -rw-r--r-- | test/CodeGen/X86/x86-64-disp.ll | 14 |
3 files changed, 16 insertions, 2 deletions
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp index 2ad3da0..7c70cd4 100644 --- a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp +++ b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp @@ -974,7 +974,7 @@ SDValue SelectionDAG::getGlobalAddress(const GlobalValue *GV, unsigned Opc; // Truncate (with sign-extension) the offset value to the pointer size. - unsigned BitWidth = VT.getSizeInBits(); + unsigned BitWidth = TLI.getPointerTy().getSizeInBits(); if (BitWidth < 64) Offset = (Offset << (64 - BitWidth) >> (64 - BitWidth)); diff --git a/lib/Target/X86/X86ISelLowering.cpp b/lib/Target/X86/X86ISelLowering.cpp index ebf9eec..eee3840 100644 --- a/lib/Target/X86/X86ISelLowering.cpp +++ b/lib/Target/X86/X86ISelLowering.cpp @@ -4400,7 +4400,7 @@ X86TargetLowering::LowerGlobalAddress(const GlobalValue *GV, // Create the TargetGlobalAddress node, folding in the constant // offset if it is legal. SDValue Result; - if (!IsPic && !ExtraLoadRequired) { + if (!IsPic && !ExtraLoadRequired && isInt32(Offset)) { Result = DAG.getTargetGlobalAddress(GV, getPointerTy(), Offset); Offset = 0; } else diff --git a/test/CodeGen/X86/x86-64-disp.ll b/test/CodeGen/X86/x86-64-disp.ll new file mode 100644 index 0000000..4a8f6cd --- /dev/null +++ b/test/CodeGen/X86/x86-64-disp.ll @@ -0,0 +1,14 @@ +; RUN: llvm-as < %s | llc -march=x86-64 | grep mov | count 2 + +; Fold an offset into an address even if it's not a 32-bit +; signed integer. + +target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128" +target triple = "x86_64-unknown-linux-gnu" +@call_used_regs = external global [53 x i8], align 32 + +define fastcc void @foo() nounwind { + %t = getelementptr [53 x i8]* @call_used_regs, i64 0, i64 4294967295 + store i8 1, i8* %t, align 1 + ret void +} |