Merge pull request #129 from tautschnig/taint-analyzer

Daniel Kroening · web-flow · commit 79d9fbe1b7e5 · 2016-06-20T10:09:03.000+01:00
Avoid string contents comparison, perform cheap operation first in ||
diff --git a/src/goto-analyzer/taint_analysis.cpp b/src/goto-analyzer/taint_analysis.cpp
@@ -134,8 +134,8 @@ void taint_analysist::instrument(
           {
             bool match=false;
             for(const auto & i : identifiers)
-              if(has_prefix(id2string(i), "java::"+id2string(rule.function_identifier)+":") ||
-                 id2string(i)==id2string(rule.function_identifier))
+              if(i==rule.function_identifier ||
+                 has_prefix(id2string(i), "java::"+id2string(rule.function_identifier)+":"))
               {
                 match=true;
                 break;

Original file line number	Diff line number	Diff line change
`@@ -134,8 +134,8 @@ void taint_analysist::instrument(`
`134`	`134`	`{`
`135`	`135`	`bool match=false;`
`136`	`136`	`for(const auto & i : identifiers)`
`137`		`- if(has_prefix(id2string(i), "java::"+id2string(rule.function_identifier)+":") \|\|`
`138`		`- id2string(i)==id2string(rule.function_identifier))`
	`137`	`+ if(i==rule.function_identifier \|\|`
	`138`	`+ has_prefix(id2string(i), "java::"+id2string(rule.function_identifier)+":"))`
`139`	`139`	`{`
`140`	`140`	`match=true;`
`141`	`141`	`break;`