Make llvm.eh.actions an intrinsic and add docs for it

[oota-llvm.git] / lib / Analysis / AliasSetTracker.cpp

diff --git a/lib/Analysis/AliasSetTracker.cpp b/lib/Analysis/AliasSetTracker.cpp
index 5b85f65d44257e5d013be77b7189cca5a59c6e2f..45442b0256292f96c917d24e3011a1624251442d 100644 (file)
--- a/lib/Analysis/AliasSetTracker.cpp
+++ b/lib/Analysis/AliasSetTracker.cpp
@@ -55,16 +55,15 @@ void AliasSet::mergeSetIn(AliasSet &AS, AliasSetTracker &AST) {
       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...