From c6718526632313a36b33912e63c3287448bf6eb1 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 2 Jul 2015 02:23:47 +0300 Subject: Fix knownVars collection again. --- src/analysis/statement.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/analysis/statement.cpp b/src/analysis/statement.cpp index 1126e90..d421387 100644 --- a/src/analysis/statement.cpp +++ b/src/analysis/statement.cpp @@ -113,9 +113,12 @@ void analyseCondition(Node *node, wo.knownNonNullVars.insert(it); removeNeedCheckNullVar(wo, it); } - FOR_EACH (it, wco.checkedNonNullVars) + if (wco.cleanExpr) { - wo.knownNullVars.insert(it); + FOR_EACH (it, wco.checkedNonNullVars) + { + wo.knownNullVars.insert(it); + } } } if (wo3.isReturned) @@ -127,9 +130,12 @@ void analyseCondition(Node *node, wo.knownNonNullVars.insert(it); removeNeedCheckNullVar(wo, it); } - FOR_EACH (it, wco.checkedNullVars) + if (wco.cleanExpr) { - wo.knownNullVars.insert(it); + FOR_EACH (it, wco.checkedNullVars) + { + wo.knownNullVars.insert(it); + } } } -- cgit v1.2.3-60-g2f50