C#: Improve performance in ForwarderAssertMethod

hvitved · hvitved · commit cddc51954636 · 2018-10-29T15:49:42.000+01:00
diff --git a/csharp/ql/src/semmle/code/csharp/commons/Assertions.qll b/csharp/ql/src/semmle/code/csharp/commons/Assertions.qll
@@ -126,30 +126,33 @@ class VSTestAssertNonNullMethod extends AssertNonNullMethod {
 
 /** A method that forwards to another assertion method. */
 class ForwarderAssertMethod extends AssertMethod {
-  AssertMethod forwardee;
+  Assertion a;
   Parameter p;
 
   ForwarderAssertMethod() {
     p = this.getAParameter() and
     strictcount(AssignableDefinition def | def.getTarget() = p) = 1 and
     forex(ControlFlowElement body |
       body = this.getABody() |
-      exists(Assertion a |
-        body = getAnAssertingElement(a) and
-        a.getExpr() = p.getAnAccess() and
-        forwardee = a.getAssertMethod()
-      )
+      bodyAsserts(this, body, a) and
+      a.getExpr() = p.getAnAccess()
     )
   }
 
   override int getAssertionIndex() { result = p.getPosition() }
 
   override ExceptionClass getExceptionClass() {
-    result = forwardee.getExceptionClass()
+    result = this.getUnderlyingAssertMethod().getExceptionClass()
   }
   
   /** Gets the underlying assertion method that is being forwarded to. */
-  AssertMethod getUnderlyingAssertMethod() { result = forwardee }
+  AssertMethod getUnderlyingAssertMethod() { result = a.getAssertMethod() }
+}
+
+pragma[noinline]
+private predicate bodyAsserts(Callable c, ControlFlowElement body, Assertion a) {
+  c.getABody() = body and
+  body = getAnAssertingElement(a)
 }
 
 private ControlFlowElement getAnAssertingElement(Assertion a) {
