C#: Group cached predicates

hvitved · hvitved · commit c4a167cb0e7b · 2018-09-28T14:59:39.000+02:00
diff --git a/csharp/ql/src/semmle/code/csharp/Element.qll b/csharp/ql/src/semmle/code/csharp/Element.qll
@@ -57,24 +57,3 @@ class Element extends DotNet::Element, @element {
     exists(Element parent | parent.getChild(result) = this)
   }
 }
-
-/**
- * Gets the "best" location for element `e`. Where an element has locations in
- * source and assemblies, choose the source location. If there are multiple assembly
- * locations, choose only one.
- */
-cached
-private Location bestLocation(Element e) {
-  result = e.getALocation().(SourceLocation) and
-  (mustHaveLocationInFile(e, _) implies mustHaveLocationInFile(e, result.getFile()))
-  or
-  (
-    hasNoSourceLocation(e)
-    and
-    result = min(Location l | l = e.getALocation() | l order by l.getFile().toString())
-  )
-}
-
-private predicate hasNoSourceLocation(Element e) {
-  not e.getALocation() instanceof SourceLocation
-}
diff --git a/csharp/ql/src/semmle/code/csharp/ExprOrStmtParent.qll b/csharp/ql/src/semmle/code/csharp/ExprOrStmtParent.qll
@@ -370,7 +370,29 @@ private cached module Cached {
       t = getTopLevelDeclaringType(d) or d = t or d = p
     )
   }
+
+  private predicate hasNoSourceLocation(Element e) {
+    not e.getALocation() instanceof SourceLocation
+  }
+
+  /**
+   * Gets the "best" location for element `e`. Where an element has locations in
+   * source and assemblies, choose the source location. If there are multiple assembly
+   * locations, choose only one.
+   */
+  cached
+  Location bestLocationCached(Element e) {
+    result = e.getALocation().(SourceLocation) and
+    (mustHaveLocationInFile(e, _) implies mustHaveLocationInFile(e, result.getFile()))
+    or
+    (
+      hasNoSourceLocation(e)
+      and
+      result = min(Location l | l = e.getALocation() | l order by l.getFile().toString())
+    )
+  }
 }
 private import Cached
 
 predicate mustHaveLocationInFile = mustHaveLocationInFileCached/2;
+predicate bestLocation = bestLocationCached/1;
diff --git a/csharp/ql/src/semmle/code/csharp/Stmt.qll b/csharp/ql/src/semmle/code/csharp/Stmt.qll
@@ -173,17 +173,7 @@ class SwitchStmt extends SelectionStmt, @switch_stmt {
    * }
    * ```
    */
-  cached
-  CaseStmt getCase(int i) {
-    exists(int index, int rankIndex |
-      result = getChildStmt(index) and
-      rankIndex = i + 1 and
-      index = rank[rankIndex](int j, CaseStmt cs |
-        cs = this.getChildStmt(j) |
-        j
-      )
-    )
-  }
+  CaseStmt getCase(int i) { result = SwithStmtInternal::getCase(this, i) }
 
   /** Gets a case of this `switch` statement. */
   CaseStmt getACase() { result = this.getCase(_) }
@@ -221,29 +211,45 @@ class SwitchStmt extends SelectionStmt, @switch_stmt {
    * Note that each non-`default` case is a labeled statement, so the statement
    * that follows is a child of the labeled statement, and not the `switch` block.
    */
+  Stmt getStmt(int i) { result = SwithStmtInternal::getStmt(this, i) }
+
+  /** Gets a statement in the body of this `switch` statement. */
+  Stmt getAStmt() { result = this.getStmt(_) }
+}
+
+private cached module SwithStmtInternal {
   cached
-  Stmt getStmt(int i) {
+  CaseStmt getCase(SwitchStmt ss, int i) {
     exists(int index, int rankIndex |
-      result = getChildStmt(index) and
+      result = ss.getChildStmt(index) and
+      rankIndex = i + 1 and
+      index = rank[rankIndex](int j, CaseStmt cs |
+        cs = ss.getChildStmt(j) |
+        j
+      )
+    )
+  }
+
+  cached
+  Stmt getStmt(SwitchStmt ss, int i) {
+    exists(int index, int rankIndex |
+      result = ss.getChildStmt(index) and
       rankIndex = i + 1 and
       index = rank[rankIndex](int j, Stmt s |
         // `getChild` includes both labeled statements and the targeted
         // statements of labeled statement as separate children, but we
         // only want the labeled statement
-        s = getLabeledStmt(j) |
+        s = getLabeledStmt(ss, j) |
         j
       )
     )
   }
 
-  private Stmt getLabeledStmt(int i) {
-    result = this.getChildStmt(i) and
+  private Stmt getLabeledStmt(SwitchStmt ss, int i) {
+    result = ss.getChildStmt(i) and
     not result = any(ConstCase cc).getStmt() and
     not result = any(TypeCase tc).getStmt()
   }
-
-  /** Gets a statement in the body of this `switch` statement. */
-  Stmt getAStmt() { result = this.getStmt(_) }
 }
 
 /**
