From fd414a27fdc85e45af00ed4329cb0e6508470dea Mon Sep 17 00:00:00 2001
From: Chris Lattner <sabre@nondot.org>
Date: Mon, 9 May 2005 04:28:51 +0000
Subject: [PATCH] Don't use the load/store instruction as the source pointer,
use the pointer being stored/loaded through!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@21806 91177308-0d34-0410-b5e6-96231b3b80d8
---
lib/CodeGen/SelectionDAG/SelectionDAG.cpp | 2 ++
lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
index c9ce7962200..26aa570e937 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
@@ -1329,6 +1329,8 @@ SDOperand SelectionDAG::getNode(unsigned Opcode, MVT::ValueType VT,
}
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);
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
index 7595e84f026..c89f16a6e95 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
@@ -624,7 +624,7 @@ void SelectionDAGLowering::visitLoad(LoadInst &I) {
}
SDOperand L = DAG.getLoad(TLI.getValueType(I.getType()), Root, Ptr,
- DAG.getSrcValue(&I));
+ DAG.getSrcValue(I.getOperand(0)));
setValue(&I, L);
if (I.isVolatile())
@@ -640,7 +640,7 @@ void SelectionDAGLowering::visitStore(StoreInst &I) {
SDOperand Ptr = getValue(I.getOperand(1));
// DAG.setRoot(DAG.getNode(ISD::STORE, MVT::Other, getRoot(), Src, Ptr));
DAG.setRoot(DAG.getNode(ISD::STORE, MVT::Other, getRoot(), Src, Ptr,
- DAG.getSrcValue(&I)));
+ DAG.getSrcValue(I.getOperand(1))));
}
void SelectionDAGLowering::visitCall(CallInst &I) {