tracking the instructions causing loads and stores provides more information than just the pointer being loaded or stored
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@22311 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
index 8a34a59..8614e3e 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
@@ -1394,8 +1394,6 @@
}
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 fa6d6d4..6815054 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
@@ -644,7 +644,7 @@
}
SDOperand L = DAG.getLoad(TLI.getValueType(I.getType()), Root, Ptr,
- DAG.getSrcValue(I.getOperand(0)));
+ DAG.getSrcValue(&I));
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.getOperand(1))));
+ DAG.getSrcValue(&I)));
}
void SelectionDAGLowering::visitCall(CallInst &I) {
diff --git a/lib/Target/Alpha/AlphaISelPattern.cpp b/lib/Target/Alpha/AlphaISelPattern.cpp
index 6cba016..bab3c6e 100644
--- a/lib/Target/Alpha/AlphaISelPattern.cpp
+++ b/lib/Target/Alpha/AlphaISelPattern.cpp
@@ -607,16 +607,15 @@
//Find the offset of the arg in it's parent's function
static int getValueOffset(const Value* v)
{
- static int uniqneg = -1;
if (v == NULL)
- return uniqneg--;
+ return 0;
const Instruction* itarget = dyn_cast<Instruction>(v);
const BasicBlock* btarget = itarget->getParent();
const Function* ftarget = btarget->getParent();
//offset due to earlier BBs
- int i = 0;
+ int i = 1;
for(Function::const_iterator ii = ftarget->begin(); &*ii != btarget; ++ii)
i += ii->size();
@@ -1299,7 +1298,7 @@
has_sym = true;
if (EnableAlphaLSMark)
- BuildMI(BB, Alpha::MEMLABEL, 3).addImm(0).addImm(0).addImm(getUID());
+ BuildMI(BB, Alpha::MEMLABEL, 3).addImm(0).addImm(1).addImm(getUID());
BuildMI(BB, Alpha::LDQl, 2, Result)
.addGlobalAddress(cast<GlobalAddressSDNode>(N)->getGlobal())