Includes: Improve performance

Author: lcartey

cpp/common/src/codingstandards/cpp/Includes.qll

@@ -1,20 +1,26 @@
 /** A library which supports analysis of includes. */
 
 import cpp
+import codingstandards.cpp.PreprocessorDirective
 import semmle.code.cpp.headers.MultipleInclusion
 
+pragma[noinline]
+private predicate hasIncludeLocation(Include include, string filepath, int startline) {
+  include.getLocation().hasLocationInfo(filepath, startline, _, _, _)
+}
+
 /**
  * Holds if `include` is included conditionally based on the branch directive `b1`.
  */
-predicate conditionallyIncluded(PreprocessorBranchDirective b1, Include include) {
-  exists(File f, int include1StartLine |
-    not b1 = any(CorrectIncludeGuard c).getIfndef() and
-    not b1.getHead().regexpMatch(".*_H(_.*)?") and
-    include.getLocation().hasLocationInfo(f.getAbsolutePath(), include1StartLine, _, _, _) and
-    f.getAbsolutePath() = b1.getFile().getAbsolutePath()
-  |
-    b1.getLocation().getStartLine() < include1StartLine and
-    b1.getNext().getLocation().getStartLine() > include1StartLine
+pragma[noinline]
+predicate isConditionallyIncluded(PreprocessorBranchDirective bd, Include include) {
+  not bd = any(CorrectIncludeGuard c).getIfndef() and
+  not bd.getHead().regexpMatch(".*_H(_.*)?") and
+  exists(string filepath, int startline, int endline, int includeline |
+    isBranchDirectiveRange(bd, filepath, startline, endline) and
+    hasIncludeLocation(include, filepath, includeline) and
+    startline < includeline and
+    endline > includeline
   )
 }
 
@@ -25,7 +31,7 @@ File getAnUnconditionallyIncludedFile(File fromFile) {
   // Find an include which isn't conditional
   exists(Include i |
     i.getFile() = fromFile and
-    not conditionallyIncluded(_, i) and
+    not isConditionallyIncluded(_, i) and
     result = i.getIncludedFile()
   )
 }

cpp/common/src/codingstandards/cpp/PreprocessorDirective.qll

@@ -44,7 +44,8 @@ class PreprocessorIfOrElif extends PreprocessorBranch {
 /**
  * Holds if the preprocessor directive `m` is located at `filepath` and `startline`.
  */
-private predicate hasPreprocessorLocation(PreprocessorDirective m, string filepath, int startline) {
+pragma[noinline]
+predicate hasPreprocessorLocation(PreprocessorDirective m, string filepath, int startline) {
   m.getLocation().hasLocationInfo(filepath, startline, _, _, _)
 }