This revision was automatically updated to reflect the committed changes.
Closed by commit rL247598: [Static Analyzer] Relaxing a caching out related 
assert. (authored by xazax).

Changed prior to commit:
  http://reviews.llvm.org/D12818?vs=34579&id=34719#toc

Repository:
  rL LLVM

http://reviews.llvm.org/D12818

Files:
  cfe/trunk/lib/StaticAnalyzer/Core/ExprEngineObjC.cpp

Index: cfe/trunk/lib/StaticAnalyzer/Core/ExprEngineObjC.cpp
===================================================================
--- cfe/trunk/lib/StaticAnalyzer/Core/ExprEngineObjC.cpp
+++ cfe/trunk/lib/StaticAnalyzer/Core/ExprEngineObjC.cpp
@@ -186,8 +186,11 @@
 
         // Generate a transition to non-Nil state.
         if (notNilState != State) {
+          bool HasTag = Pred->getLocation().getTag();
           Pred = Bldr.generateNode(ME, Pred, notNilState);
-          assert(Pred && "Should have cached out already!");
+          assert((Pred || HasTag) && "Should have cached out already!");
+          if (!Pred)
+            continue;
         }
       }
     } else {


Index: cfe/trunk/lib/StaticAnalyzer/Core/ExprEngineObjC.cpp
===================================================================
--- cfe/trunk/lib/StaticAnalyzer/Core/ExprEngineObjC.cpp
+++ cfe/trunk/lib/StaticAnalyzer/Core/ExprEngineObjC.cpp
@@ -186,8 +186,11 @@
 
         // Generate a transition to non-Nil state.
         if (notNilState != State) {
+          bool HasTag = Pred->getLocation().getTag();
           Pred = Bldr.generateNode(ME, Pred, notNilState);
-          assert(Pred && "Should have cached out already!");
+          assert((Pred || HasTag) && "Should have cached out already!");
+          if (!Pred)
+            continue;
         }
       }
     } else {
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Reply via email to