Fix name collision

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@9722 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Analysis/DataStructure/IPModRef.cpp b/lib/Analysis/DataStructure/IPModRef.cpp
index 754b86b74b7b10755ed63261823f5ed6de8fda05..64b60d48ba29f2a410e8471313a7bb085a1c98b2 100644 (file)
--- a/lib/Analysis/DataStructure/IPModRef.cpp
+++ b/lib/Analysis/DataStructure/IPModRef.cpp
@@ -167,11 +167,11 @@ DSGraph* FunctionModRefInfo::ResolveCallSiteModRefInfo(CallSite CS,
           Args.push_back(Result->getNodeForValue(*I));
 
       // Build the call site...
-      DSCallSite CS(CS, RetVal, F, Args);
+      DSCallSite NCS(CS, RetVal, F, Args);
 
       // Perform the merging now of the graph for the callee, which will
       // come with mod/ref bits set...
-      Result->mergeInGraph(CS, *F, IPModRefObj.getBUDSGraph(*F),
+      Result->mergeInGraph(NCS, *F, IPModRefObj.getBUDSGraph(*F),
                            DSGraph::StripAllocaBit
                            | DSGraph::DontCloneCallNodes
                            | DSGraph::DontCloneAuxCallNodes);

diff --git a/lib/Analysis/IPA/IPModRef.cpp b/lib/Analysis/IPA/IPModRef.cpp
index 754b86b74b7b10755ed63261823f5ed6de8fda05..64b60d48ba29f2a410e8471313a7bb085a1c98b2 100644 (file)
--- a/lib/Analysis/IPA/IPModRef.cpp
+++ b/lib/Analysis/IPA/IPModRef.cpp
@@ -167,11 +167,11 @@ DSGraph* FunctionModRefInfo::ResolveCallSiteModRefInfo(CallSite CS,
           Args.push_back(Result->getNodeForValue(*I));
 
       // Build the call site...
-      DSCallSite CS(CS, RetVal, F, Args);
+      DSCallSite NCS(CS, RetVal, F, Args);
 
       // Perform the merging now of the graph for the callee, which will
       // come with mod/ref bits set...
-      Result->mergeInGraph(CS, *F, IPModRefObj.getBUDSGraph(*F),
+      Result->mergeInGraph(NCS, *F, IPModRefObj.getBUDSGraph(*F),
                            DSGraph::StripAllocaBit
                            | DSGraph::DontCloneCallNodes
                            | DSGraph::DontCloneAuxCallNodes);