Revert "Kotlin: Fix extraction of dispatch and extension receivers"

tamasvajk · igfoo · commit 04daa7f28fce · 2022-05-10T19:51:08.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
@@ -683,17 +683,20 @@ open class KotlinFileExtractor(
             tw.writeStatementEnclosingExpr(id, enclosingStmt)
 
             if (extractTypeArguments) {
-                // type arguments at index -3, -4, ...
-                extractTypeArguments(c, id, callable, enclosingStmt, -3, true)
+                // type arguments at index -2, -3, ...
+                extractTypeArguments(c, id, callable, enclosingStmt, -2, true)
             }
 
             val dr = c.dispatchReceiver
             val er = c.extensionReceiver
             if (dr != null) {
                 extractExpressionExpr(dr, callable, id, -1, enclosingStmt)
-            }
-            if (er != null) {
-                extractExpressionExpr(er, callable, id, -2, enclosingStmt)
+
+                if (er != null && er != dr) {
+                    logger.warnElement(Severity.ErrorSevere, "Expected to only find extension receiver or dispatch receiver. Found both. Extracting dispatch receiver only", c)
+                }
+            } else if (er != null) {
+                extractExpressionExpr(er, callable, id, -1, enclosingStmt)
             }
 
             for(i in 0 until c.valueArgumentsCount) {
@@ -964,7 +967,7 @@ open class KotlinFileExtractor(
 
                 if (isBuiltinCallKotlin(c, "arrayOf")) {
                     if (c.typeArgumentsCount == 1) {
-                        extractTypeArguments(c, id, callable, enclosingStmt, -1)
+                        extractTypeArguments(c, id, callable, enclosingStmt,-1)
                     } else {
                         logger.warnElement( Severity.ErrorSevere, "Expected to find one type argument in arrayOf call", c )
                     }
diff --git a/java/ql/consistency-queries/children.ql b/java/ql/consistency-queries/children.ql
@@ -29,8 +29,6 @@ predicate gapInChildren(Element e, int i) {
   and not e instanceof TryStmt
   // TODO: Tighten this up:
   and not e instanceof ForStmt
-  // TODO: Tighten this up:
-  and not e instanceof MethodAccess // extension receiver is now a gap for Java
   // Kotlin bug?
   and not (e instanceof MethodAccess and e.getFile().getExtension() = "kt")
 }
diff --git a/java/ql/lib/semmle/code/java/Expr.qll b/java/ql/lib/semmle/code/java/Expr.qll
@@ -1741,22 +1741,19 @@ class MethodAccess extends Expr, Call, @methodaccess {
   /** Holds if this method access has a qualifier. */
   predicate hasQualifier() { exists(this.getQualifier()) }
 
-  /** Gets the extension receiver expression of this method access, if any. */
-  Expr getExtensionReceiver() { result.isNthChildOf(this, -2) }
-
   /** Gets an argument supplied to the method that is invoked using this method access. */
   override Expr getAnArgument() { result.getIndex() >= 0 and result.getParent() = this }
 
   /** Gets the argument at the specified (zero-based) position in this method access. */
   override Expr getArgument(int index) { exprs(result, _, _, _, this, index) and index >= 0 }
 
   /** Gets a type argument supplied as part of this method access, if any. */
-  Expr getATypeArgument() { result.getIndex() <= -3 and result.getParent() = this }
+  Expr getATypeArgument() { result.getIndex() <= -2 and result.getParent() = this }
 
   /** Gets the type argument at the specified (zero-based) position in this method access, if any. */
   Expr getTypeArgument(int index) {
     result = this.getATypeArgument() and
-    (-3 - result.getIndex()) = index
+    (-2 - result.getIndex()) = index
   }
 
   /** Gets the method accessed by this method access. */
diff --git a/java/ql/test/kotlin/library-tests/variables/variableAccesses.expected b/java/ql/test/kotlin/library-tests/variables/variableAccesses.expected
@@ -6,7 +6,6 @@ varAcc
 | variables.kt:16:11:16:18 | o |
 | variables.kt:16:11:16:18 | o |
 instAcc
-| variables.kt:21:9:21:9 | this |
 | variables.kt:21:11:21:15 | this |
 | variables.kt:24:9:24:9 | this |
 | variables.kt:25:9:25:9 | this |

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,6 @@ predicate gapInChildren(Element e, int i) {`
`29`	`29`	`and not e instanceof TryStmt`
`30`	`30`	`// TODO: Tighten this up:`
`31`	`31`	`and not e instanceof ForStmt`
`32`		`- // TODO: Tighten this up:`
`33`		`- and not e instanceof MethodAccess // extension receiver is now a gap for Java`
`34`	`32`	`// Kotlin bug?`
`35`	`33`	`and not (e instanceof MethodAccess and e.getFile().getExtension() = "kt")`
`36`	`34`	`}`