ValueFlow: For convenience, return constant folded value

danmar · danmar · commit b94eaeca6aaa · 2016-05-08T11:17:10.000+02:00
diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
@@ -2377,13 +2377,14 @@ static void valueFlowFunctionReturn(TokenList *tokenlist, ErrorLogger *errorLogg
     }
 }
 
-void ValueFlow::valueFlowConstantFoldAST(const Token *expr)
+const ValueFlow::Value *ValueFlow::valueFlowConstantFoldAST(const Token *expr)
 {
-    if (!expr || !expr->values.empty())
-        return;
-    valueFlowConstantFoldAST(expr->astOperand1());
-    valueFlowConstantFoldAST(expr->astOperand2());
-    valueFlowSetConstantValue(expr);
+    if (expr && expr->values.empty()) {
+        valueFlowConstantFoldAST(expr->astOperand1());
+        valueFlowConstantFoldAST(expr->astOperand2());
+        valueFlowSetConstantValue(expr);
+    }
+    return expr && expr->values.size() == 1U && expr->values.front().isKnown() ? &expr->values.front() : nullptr;    
 }
 
 
diff --git a/lib/valueflow.h b/lib/valueflow.h
@@ -95,7 +95,7 @@ namespace ValueFlow {
     };
 
     /// Constant folding of expression. This can be used before the full ValueFlow has been executed (ValueFlow::setValues).
-    void valueFlowConstantFoldAST(const Token *expr);
+    const ValueFlow::Value * valueFlowConstantFoldAST(const Token *expr);
 
     /// Perform valueflow analysis.
     void setValues(TokenList *tokenlist, SymbolDatabase* symboldatabase, ErrorLogger *errorLogger, const Settings *settings);

Original file line number	Diff line number	Diff line change
`@@ -2377,13 +2377,14 @@ static void valueFlowFunctionReturn(TokenList tokenlist, ErrorLogger errorLogg`
`2377`	`2377`	`}`
`2378`	`2378`	`}`
`2379`	`2379`
`2380`		`-void ValueFlow::valueFlowConstantFoldAST(const Token *expr)`
	`2380`	`+const ValueFlow::Value ValueFlow::valueFlowConstantFoldAST(const Token expr)`
`2381`	`2381`	`{`
`2382`		`- if (!expr \|\| !expr->values.empty())`
`2383`		`- return;`
`2384`		`- valueFlowConstantFoldAST(expr->astOperand1());`
`2385`		`- valueFlowConstantFoldAST(expr->astOperand2());`
`2386`		`- valueFlowSetConstantValue(expr);`
	`2382`	`+ if (expr && expr->values.empty()) {`
	`2383`	`+ valueFlowConstantFoldAST(expr->astOperand1());`
	`2384`	`+ valueFlowConstantFoldAST(expr->astOperand2());`
	`2385`	`+ valueFlowSetConstantValue(expr);`
	`2386`	`+ }`
	`2387`	`+ return expr && expr->values.size() == 1U && expr->values.front().isKnown() ? &expr->values.front() : nullptr;`
`2387`	`2388`	`}`
`2388`	`2389`
`2389`	`2390`