ValueFlow: Refactoring, removed redundant assignment

danmar · danmar · commit 35d18be311ae · 2018-11-06T07:02:20.000+01:00
diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
@@ -3442,13 +3442,9 @@ static bool evaluate(const Token *expr, const std::vector<std::list<ValueFlow::V
 static std::list<ValueFlow::Value> getFunctionArgumentValues(const Token *argtok)
 {
     std::list<ValueFlow::Value> argvalues(argtok->values());
-    if (argvalues.empty()) {
-        if (Token::Match(argtok, "%comp%|%oror%|&&|!")) {
-            argvalues.emplace_back(0);
-            argvalues.emplace_back(1);
-        } else {
-            argvalues = argtok->values();
-        }
+    if (argvalues.empty() && Token::Match(argtok, "%comp%|%oror%|&&|!")) {
+        argvalues.emplace_back(0);
+        argvalues.emplace_back(1);
     }
     return argvalues;
 }

Original file line number	Diff line number	Diff line change
`@@ -3442,13 +3442,9 @@ static bool evaluate(const Token *expr, const std::vector<std::list<ValueFlow::V`
`3442`	`3442`	`static std::list<ValueFlow::Value> getFunctionArgumentValues(const Token *argtok)`
`3443`	`3443`	`{`
`3444`	`3444`	`std::list<ValueFlow::Value> argvalues(argtok->values());`
`3445`		`- if (argvalues.empty()) {`
`3446`		`- if (Token::Match(argtok, "%comp%\|%oror%\|&&\|!")) {`
`3447`		`- argvalues.emplace_back(0);`
`3448`		`- argvalues.emplace_back(1);`
`3449`		`- } else {`
`3450`		`- argvalues = argtok->values();`
`3451`		`- }`
	`3445`	`+ if (argvalues.empty() && Token::Match(argtok, "%comp%\|%oror%\|&&\|!")) {`
	`3446`	`+ argvalues.emplace_back(0);`
	`3447`	`+ argvalues.emplace_back(1);`
`3452`	`3448`	`}`
`3453`	`3449`	`return argvalues;`
`3454`	`3450`	`}`