diff options
Diffstat (limited to 'lib/Analysis/DataStructure/DataStructure.cpp')
-rw-r--r-- | lib/Analysis/DataStructure/DataStructure.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/Analysis/DataStructure/DataStructure.cpp b/lib/Analysis/DataStructure/DataStructure.cpp index 1133743b5d..6460287ac7 100644 --- a/lib/Analysis/DataStructure/DataStructure.cpp +++ b/lib/Analysis/DataStructure/DataStructure.cpp @@ -1321,8 +1321,12 @@ void DSGraph::spliceFrom(DSGraph &RHS) { AuxFunctionCalls.splice(AuxFunctionCalls.end(), RHS.AuxFunctionCalls); // Take all of the return nodes. - ReturnNodes.insert(RHS.ReturnNodes.begin(), RHS.ReturnNodes.end()); - RHS.ReturnNodes.clear(); + if (ReturnNodes.empty()) { + ReturnNodes.swap(RHS.ReturnNodes); + } else { + ReturnNodes.insert(RHS.ReturnNodes.begin(), RHS.ReturnNodes.end()); + RHS.ReturnNodes.clear(); + } // Merge the scalar map in. ScalarMap.spliceFrom(RHS.ScalarMap); |