[llvm-branch-commits] [llvm-branch] r223635 - Merging rr222376:

[David Majnemer]

Author: majnemer
Date: Mon Dec  8 02:48:58 2014
New Revision: 223635

URL: http://llvm.org/viewvc/llvm-project?rev=223635&view=rev
Log:
Merging rr222376:
------------------------------------------------------------------------
r222376 | majnemer | 2014-11-19 11:36:18 -0800 (Wed, 19 Nov 2014) | 3 lines

AliasSet: Simplify mergeSetIn

No functional change intended.
------------------------------------------------------------------------

Modified:
    llvm/branches/release_35/   (props changed)
    llvm/branches/release_35/lib/Analysis/AliasSetTracker.cpp

Propchange: llvm/branches/release_35/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec  8 02:48:58 2014
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,213653,213665,213726,213749,213773,213793,213798-213799,213815,213847,213880,213883-213884,213894-213896,213899,213915,213966,213999,214060,214129,214180,214287,214331,214423,214429,214519,214670,214674,214679,215685,215711,215806,216064,216262,216531,216920,217257,218745,221009,221408,221453,222338,223163,223170-223171
+/llvm/trunk:155241,213653,213665,213726,213749,213773,213793,213798-213799,213815,213847,213880,213883-213884,213894-213896,213899,213915,213966,213999,214060,214129,214180,214287,214331,214423,214429,214519,214670,214674,214679,215685,215711,215806,216064,216262,216531,216920,217257,218745,221009,221408,221453,222338,222376,223163,223170-223171

Modified: llvm/branches/release_35/lib/Analysis/AliasSetTracker.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_35/lib/Analysis/AliasSetTracker.cpp?rev=223635&r1=223634&r2=223635&view=diff
==============================================================================
--- llvm/branches/release_35/lib/Analysis/AliasSetTracker.cpp (original)
+++ llvm/branches/release_35/lib/Analysis/AliasSetTracker.cpp Mon Dec  8 02:48:58 2014
@@ -55,16 +55,15 @@ void AliasSet::mergeSetIn(AliasSet &AS,
       AliasTy = MayAlias;
   }
 
-  bool ASHadUnknownInsts = false;
+  bool ASHadUnknownInsts = !AS.UnknownInsts.empty();
   if (UnknownInsts.empty()) {            // Merge call sites...
-    if (!AS.UnknownInsts.empty()) {
+    if (ASHadUnknownInsts) {
       std::swap(UnknownInsts, AS.UnknownInsts);
       addRef();
     }
-  } else if (!AS.UnknownInsts.empty()) {
+  } else if (ASHadUnknownInsts) {
     UnknownInsts.insert(UnknownInsts.end(), AS.UnknownInsts.begin(), AS.UnknownInsts.end());
     AS.UnknownInsts.clear();
-    ASHadUnknownInsts = true;
   }
 
   AS.Forward = this;  // Forward across AS now...