[llvm-branch-commits] [llvm-branch] r155955 - in /llvm/branches/release_31: ./ lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp test/CodeGen/X86/GC/cg-O0.ll

[Bill Wendling]

Author: void
Date: Tue May  1 17:51:49 2012
New Revision: 155955

URL: http://llvm.org/viewvc/llvm-project?rev=155955&view=rev
Log:
Merging r155954:
------------------------------------------------------------------------
r155954 | void | 2012-05-01 15:50:45 -0700 (Tue, 01 May 2012) | 3 lines

Strip the pointer casts off of allocas so that the selection DAG can find them.
PR10799

------------------------------------------------------------------------

Added:
    llvm/branches/release_31/test/CodeGen/X86/GC/cg-O0.ll
      - copied unchanged from r155954, llvm/trunk/test/CodeGen/X86/GC/cg-O0.ll
Modified:
    llvm/branches/release_31/   (props changed)
    llvm/branches/release_31/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp

Propchange: llvm/branches/release_31/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May  1 17:51:49 2012
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155166,155230,155284-155288,155307,155342,155466,155536,155668,155809,155813,155817-155818,155844,155895,155902
+/llvm/trunk:155166,155230,155284-155288,155307,155342,155466,155536,155668,155809,155813,155817-155818,155844,155895,155902,155954

Modified: llvm/branches/release_31/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_31/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp?rev=155955&r1=155954&r2=155955&view=diff
==============================================================================
--- llvm/branches/release_31/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp (original)
+++ llvm/branches/release_31/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp Tue May  1 17:51:49 2012
@@ -5050,7 +5050,7 @@
   }
   case Intrinsic::gcroot:
     if (GFI) {
-      const Value *Alloca = I.getArgOperand(0);
+      const Value *Alloca = I.getArgOperand(0)->stripPointerCasts();
       const Constant *TypeMap = cast<Constant>(I.getArgOperand(1));
 
       FrameIndexSDNode *FI = cast<FrameIndexSDNode>(getValue(Alloca).getNode());