[llvm-commits] CVS: llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp SelectionDAGISel.cpp

[Andrew Lenharth]

Changes in directory llvm/lib/CodeGen/SelectionDAG:

SelectionDAG.cpp updated: 1.121 -> 1.122
SelectionDAGISel.cpp updated: 1.63 -> 1.64
---
Log message:

restore old srcValueNode behavior and try to to work around it

---
Diffs of the changes:  (+4 -2)

 SelectionDAG.cpp     |    2 ++
 SelectionDAGISel.cpp |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)


Index: llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp:1.121 llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp:1.122
--- llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp:1.121	Wed Jun 29 10:57:19 2005
+++ llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp	Wed Jun 29 13:54:02 2005
@@ -1394,6 +1394,8 @@
 }
 
 SDOperand SelectionDAG::getSrcValue(const Value *V, int Offset) {
+  assert((!V || isa<PointerType>(V->getType())) &&
+         "SrcValue is not a pointer?");
   SDNode *&N = ValueNodes[std::make_pair(V, Offset)];
   if (N) return SDOperand(N, 0);
 


Index: llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1.63 llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1.64
--- llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1.63	Wed Jun 29 10:57:19 2005
+++ llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp	Wed Jun 29 13:54:02 2005
@@ -644,7 +644,7 @@
   }
 
   SDOperand L = DAG.getLoad(TLI.getValueType(I.getType()), Root, Ptr,
-                            DAG.getSrcValue(&I));
+                            DAG.getSrcValue(I.getOperand(0)));
   setValue(&I, L);
 
   if (I.isVolatile())
@@ -659,7 +659,7 @@
   SDOperand Src = getValue(SrcV);
   SDOperand Ptr = getValue(I.getOperand(1));
   DAG.setRoot(DAG.getNode(ISD::STORE, MVT::Other, getRoot(), Src, Ptr,
-                          DAG.getSrcValue(&I)));
+                          DAG.getSrcValue(I.getOperand(1))));
 }
 
 void SelectionDAGLowering::visitCall(CallInst &I) {