CPP: Optimize AV Rule 35's usesMacro.

geoffw0 · geoffw0 · commit 7fd08233c389 · 2019-03-22T14:43:58.000Z
diff --git a/cpp/ql/src/jsf/4.07 Header Files/AV Rule 35.ql b/cpp/ql/src/jsf/4.07 Header Files/AV Rule 35.ql
@@ -88,6 +88,7 @@ string extraDetail(HeaderFile hf, SomePreprocessorDirective detail1, SomePreproc
  * Header file `hf` uses a macro called `macroName`.
  */
 predicate usesMacro(HeaderFile hf, string macroName) {
+  not hf instanceof IncludeGuardedHeader and // restrict to cases the query looks at
   exists(MacroAccess ma |
     ma.getFile() = hf and
     ma.getMacro().getName() = macroName
