From 02713453686eb7c00c6d2c34108a199c29f03f7c Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Wed, 5 Nov 2003 05:55:45 +0000 Subject: [PATCH] Fix name collision git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@9722 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Analysis/DataStructure/IPModRef.cpp | 4 ++-- lib/Analysis/IPA/IPModRef.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Analysis/DataStructure/IPModRef.cpp b/lib/Analysis/DataStructure/IPModRef.cpp index 754b86b74b7..64b60d48ba2 100644 --- 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 754b86b74b7..64b60d48ba2 100644 --- 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); -- 2.34.1