[llvm-commits] [llvm] r64165 - in /llvm/branches/Apple/Dib: lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp test/CodeGen/X86/negative-subscript.ll

[Bill Wendling]

Author: void
Date: Mon Feb  9 15:04:05 2009
New Revision: 64165

URL: http://llvm.org/viewvc/llvm-project?rev=64165&view=rev
Log:
Pull r64163 into Dib:

Make sure constant subscript is truncated to ptr size if it may not fit.

Added:
    llvm/branches/Apple/Dib/test/CodeGen/X86/negative-subscript.ll
Modified:
    llvm/branches/Apple/Dib/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp

Modified: llvm/branches/Apple/Dib/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Dib/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp?rev=64165&r1=64164&r2=64165&view=diff

==============================================================================
--- llvm/branches/Apple/Dib/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp (original)
+++ llvm/branches/Apple/Dib/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp Mon Feb  9 15:04:05 2009
@@ -2695,8 +2695,15 @@
         if (CI->getZExtValue() == 0) continue;
         uint64_t Offs =
             TD->getTypePaddedSize(Ty)*cast<ConstantInt>(CI)->getSExtValue();
+        SDValue OffsVal = DAG.getConstant(Offs, MVT::i64);
+        unsigned PtrBits = TLI.getPointerTy().getSizeInBits();
+        if (PtrBits < 64)
+          OffsVal = DAG.getNode(ISD::TRUNCATE, getCurDebugLoc(), 
+                                TLI.getPointerTy(), OffsVal);
+        else
+          OffsVal = DAG.getIntPtrConstant(Offs);
         N = DAG.getNode(ISD::ADD, getCurDebugLoc(), N.getValueType(), N,
-                        DAG.getIntPtrConstant(Offs));
+                        OffsVal);
         continue;
       }
 

Added: llvm/branches/Apple/Dib/test/CodeGen/X86/negative-subscript.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Dib/test/CodeGen/X86/negative-subscript.ll?rev=64165&view=auto

==============================================================================
--- llvm/branches/Apple/Dib/test/CodeGen/X86/negative-subscript.ll (added)
+++ llvm/branches/Apple/Dib/test/CodeGen/X86/negative-subscript.ll Mon Feb  9 15:04:05 2009
@@ -0,0 +1,10 @@
+; RUN: llvm-as < %s | llc -march=x86
+; rdar://6559995
+
+ at a = external global [255 x i8*], align 32
+
+define i32 @main() nounwind {
+entry:
+	store i8* bitcast (i8** getelementptr ([255 x i8*]* @a, i32 0, i32 -2147483624) to i8*), i8** getelementptr ([255 x i8*]* @a, i32 0, i32 16), align 32
+	ret i32 0
+}