Remove ExtensionMethodAccess to see extension method flows

tamasvajk · igfoo · commit a9711b8c886a · 2022-05-10T19:51:27.000+01:00
diff --git a/java/ql/lib/semmle/code/java/ControlFlowGraph.qll b/java/ql/lib/semmle/code/java/ControlFlowGraph.qll
@@ -550,12 +550,13 @@ private module ControlFlowGraphImpl {
       or
       index = 0 and result = this.(RValue).getQualifier() and not result instanceof TypeAccess
       or
-      exists(Call e | e = this and not e instanceof ExtensionMethodAccess |
+      exists(Call e | e = this | // and not e instanceof ExtensionMethodAccess |
         index = -1 and result = e.getQualifier() and not result instanceof TypeAccess
         or
         result = e.getArgument(index)
       )
       or
+      /*
       exists(ExtensionMethodAccess e | e = this |
         // the actual qualifier of the expression method access
         index = -1 and result.(Expr).isNthChildOf(this, index) and not result instanceof TypeAccess
@@ -567,6 +568,7 @@ private module ControlFlowGraphImpl {
         result = e.getArgument(index - 1)
       )
       or
+      */
       exists(StringTemplateExpr e | e = this | result = e.getComponent(index))
       or
       index = 0 and result = this.(ClassExpr).getExpr()
diff --git a/java/ql/lib/semmle/code/java/Expr.qll b/java/ql/lib/semmle/code/java/Expr.qll
@@ -1987,6 +1987,7 @@ class MethodAccess extends Expr, Call, @methodaccess {
 /**
  * An invocation of a Kotlin `ExtensionMethod`.
  */
+/*
 class ExtensionMethodAccess extends MethodAccess {
   ExtensionMethodAccess() { this.getMethod() instanceof ExtensionMethod }
 
@@ -1998,6 +1999,7 @@ class ExtensionMethodAccess extends MethodAccess {
 
   override Expr getArgument(int index) { result = super.getArgument(index + 1) and index >= 0 }
 }
+*/
 
 /** A type access is a (possibly qualified) reference to a type. */
 class TypeAccess extends Expr, Annotatable, @typeaccess {
diff --git a/java/ql/lib/semmle/code/java/Variable.qll b/java/ql/lib/semmle/code/java/Variable.qll
@@ -111,16 +111,18 @@ class Parameter extends Element, @param, LocalScopeVariable {
       (
         exists(int idx |
           (
-            idx = i and not call instanceof ExtensionMethodAccess
-            or
-            idx = i - 1 and call instanceof ExtensionMethodAccess
+            idx = i //and not call instanceof ExtensionMethodAccess
+            // or
+            // idx = i - 1 and call instanceof ExtensionMethodAccess
           ) and
           result = call.getArgument(idx)
         )
+        /*
         or
         i = 0 and
         call instanceof ExtensionMethodAccess and
         result = call.getQualifier()
+        */
       ) and
       call.getCallee().getSourceDeclaration().getAParameter() = this
     )
diff --git a/java/ql/test/kotlin/library-tests/dataflow/extensionMethod/test.expected b/java/ql/test/kotlin/library-tests/dataflow/extensionMethod/test.expected
@@ -1,2 +1,6 @@
 | test.kt:20:29:20:31 | new C(...) | test.kt:23:22:23:28 | self1(...) |
+| test.kt:20:29:20:31 | new C(...) | test.kt:26:22:26:28 | self2(...) |
 | test.kt:20:29:20:31 | new C(...) | test.kt:29:18:29:29 | fn1(...) |
+| test.kt:20:29:20:31 | new C(...) | test.kt:32:18:32:29 | fn2(...) |
+| test.kt:20:29:20:31 | new C(...) | test.kt:35:18:35:31 | call1(...) |
+| test.kt:20:29:20:31 | new C(...) | test.kt:38:22:38:28 | call2(...) |

Original file line number	Diff line number	Diff line change
`@@ -111,16 +111,18 @@ class Parameter extends Element, @param, LocalScopeVariable {`
`111`	`111`	`(`
`112`	`112`	`exists(int idx \|`
`113`	`113`	`(`
`114`		`- idx = i and not call instanceof ExtensionMethodAccess`
`115`		`- or`
`116`		`- idx = i - 1 and call instanceof ExtensionMethodAccess`
	`114`	`+ idx = i //and not call instanceof ExtensionMethodAccess`
	`115`	`+ // or`
	`116`	`+ // idx = i - 1 and call instanceof ExtensionMethodAccess`
`117`	`117`	`) and`
`118`	`118`	`result = call.getArgument(idx)`
`119`	`119`	`)`
	`120`	`+ /*`
`120`	`121`	`or`
`121`	`122`	`i = 0 and`
`122`	`123`	`call instanceof ExtensionMethodAccess and`
`123`	`124`	`result = call.getQualifier()`
	`125`	`+ */`
`124`	`126`	`) and`
`125`	`127`	`call.getCallee().getSourceDeclaration().getAParameter() = this`
`126`	`128`	`)`