[llvm-commits] [llvm] r54226 - in /llvm/trunk: lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp test/CodeGen/Generic/empty-load-store.ll

[Dan Gohman]

Author: djg
Date: Wed Jul 30 13:36:51 2008
New Revision: 54226

URL: http://llvm.org/viewvc/llvm-project?rev=54226&view=rev
Log:
Don't look for leaf values to store when lowering stores of
empty structs. This fixes PR2612.

Added:
    llvm/trunk/test/CodeGen/Generic/empty-load-store.ll
Modified:
    llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp?rev=54226&r1=54225&r2=54226&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Wed Jul 30 13:36:51 2008
@@ -2928,9 +2928,7 @@
 
 void SelectionDAGLowering::visitStore(StoreInst &I) {
   Value *SrcV = I.getOperand(0);
-  SDValue Src = getValue(SrcV);
   Value *PtrV = I.getOperand(1);
-  SDValue Ptr = getValue(PtrV);
 
   SmallVector<MVT, 4> ValueVTs;
   SmallVector<uint64_t, 4> Offsets;
@@ -2939,6 +2937,12 @@
   if (NumValues == 0)
     return;
 
+  // Get the lowered operands. Note that we do this after
+  // checking if NumResults is zero, because with zero results
+  // the operands won't have values in the map.
+  SDValue Src = getValue(SrcV);
+  SDValue Ptr = getValue(PtrV);
+
   SDValue Root = getRoot();
   SmallVector<SDValue, 4> Chains(NumValues);
   MVT PtrVT = Ptr.getValueType();

Added: llvm/trunk/test/CodeGen/Generic/empty-load-store.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Generic/empty-load-store.ll?rev=54226&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/Generic/empty-load-store.ll (added)
+++ llvm/trunk/test/CodeGen/Generic/empty-load-store.ll Wed Jul 30 13:36:51 2008
@@ -0,0 +1,18 @@
+; RUN: llvm-as < %s | llc
+; PR2612
+
+ at current_foo = internal global {  } zeroinitializer
+
+define i32 @foo() {
+entry:
+        %retval = alloca i32
+        store i32 0, i32* %retval
+        %local_foo = alloca {  }
+        load {  }* @current_foo
+        store {  } %0, {  }* %local_foo
+        br label %return
+
+return:
+        load i32* %retval
+        ret i32 %1
+}