Use call site mergeWith method to simplify code

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

diff --git a/lib/Analysis/DataStructure/DataStructure.cpp b/lib/Analysis/DataStructure/DataStructure.cpp
index 67778181ef18f273b382f8a95aeef0d3b8b78604..b07a0f7d8541120577bb32730d4a1cceff62bf93 100644 (file)
--- a/lib/Analysis/DataStructure/DataStructure.cpp
+++ b/lib/Analysis/DataStructure/DataStructure.cpp
@@ -830,12 +830,8 @@ static void removeIdenticalCalls(vector<DSCallSite> &Calls,
           // FIXME: Evaluate how many times this is tripped!
           NumDuplicateCalls > 20) {
         DSCallSite &OCS = Calls[i-1];
-        OCS.getRetVal().mergeWith(CS.getRetVal());
+        OCS.mergeWith(CS);
 
-        for (unsigned a = 0,
-               e = std::min(CS.getNumPtrArgs(), OCS.getNumPtrArgs());
-             a != e; ++a)
-          OCS.getPtrArg(a).mergeWith(CS.getPtrArg(a));
         // The node will now be eliminated as a duplicate!
         if (CS.getNumPtrArgs() < OCS.getNumPtrArgs())
           CS = OCS;