[analyzer] Restore behavior change introduced by r247657.

r247657 fixed warnings about unused variables when compiling without asserts
but changed behavior. This commit restores the old behavior but still suppresses
the warnings.

llvm-svn: 247660

1 files changed, 6 insertions, 4 deletions

diff --git a/clang/lib/StaticAnalyzer/Core/ExprEngineObjC.cpp b/clang/lib/StaticAnalyzer/Core/ExprEngineObjC.cpp
index eb035acee96..92c5fe6b6f1 100644
--- a/clang/lib/StaticAnalyzer/Core/ExprEngineObjC.cpp
+++ b/clang/lib/StaticAnalyzer/Core/ExprEngineObjC.cpp
@@ -182,10 +182,11 @@ void ExprEngine::VisitObjCMessage(const ObjCMessageExpr *ME,
       // Receiver is definitely nil, so run ObjCMessageNil callbacks and return.
       if (nilState && !notNilState) {
         StmtNodeBuilder Bldr(Pred, Dst, *currBldrCtx);
+        bool HasTag = Pred->getLocation().getTag();
         Pred = Bldr.generateNode(ME, Pred, nilState, nullptr,
                                  ProgramPoint::PreStmtKind);
-        assert((Pred || Pred->getLocation().getTag()) &&
-               "Should have cached out already!");
+        assert((Pred || HasTag) && "Should have cached out already!");
+        (void)HasTag;
         if (!Pred)
           return;
         getCheckerManager().runCheckersForObjCMessageNil(Dst, Pred,
@@ -198,9 +199,10 @@ void ExprEngine::VisitObjCMessage(const ObjCMessageExpr *ME,
       // Generate a transition to the non-nil state, dropping any potential
       // nil flow.
       if (notNilState != State) {
+        bool HasTag = Pred->getLocation().getTag();
         Pred = Bldr.generateNode(ME, Pred, notNilState);
-        assert((Pred || Pred->getLocation().getTag()) &&
-               "Should have cached out already!");
+        assert((Pred || HasTag) && "Should have cached out already!");
+        (void)HasTag;
         if (!Pred)
           return;
       }