Rename ValueMap to ScalarMap
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@4516 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/DataStructure/Steensgaard.cpp b/lib/Analysis/DataStructure/Steensgaard.cpp
index f2b6e87..9fb5f57 100644
--- a/lib/Analysis/DataStructure/Steensgaard.cpp
+++ b/lib/Analysis/DataStructure/Steensgaard.cpp
@@ -84,7 +84,7 @@
const DSCallSite &Call,
DSNodeHandle &RetVal) {
assert(ResultGraph != 0 && "Result graph not allocated!");
- std::map<Value*, DSNodeHandle> &ValMap = ResultGraph->getValueMap();
+ std::map<Value*, DSNodeHandle> &ValMap = ResultGraph->getScalarMap();
// Handle the return value of the function...
if (Call.getRetVal().getNode() && RetVal.getNode())
@@ -135,8 +135,9 @@
RetValMap[I] = RetNode;
}
- // Incorporate the inlined Function's ValueMap into the global ValueMap...
- std::map<Value*, DSNodeHandle> &GVM = ResultGraph->getValueMap();
+ // Incorporate the inlined Function's ScalarMap into the global
+ // ScalarMap...
+ std::map<Value*, DSNodeHandle> &GVM = ResultGraph->getScalarMap();
while (!ValMap.empty()) { // Loop over value map, moving entries over...
const std::pair<Value*, DSNodeHandle> &DSN = *ValMap.begin();
@@ -198,7 +199,7 @@
AliasAnalysis::Result Steens::alias(const Value *V1, const Value *V2) const {
assert(ResultGraph && "Result grcaph has not yet been computed!");
- std::map<Value*, DSNodeHandle> &GVM = ResultGraph->getValueMap();
+ std::map<Value*, DSNodeHandle> &GVM = ResultGraph->getScalarMap();
std::map<Value*, DSNodeHandle>::iterator I = GVM.find(const_cast<Value*>(V1));
if (I != GVM.end() && I->second.getNode()) {