Fix calls to static methods defined in association with local functions

smowton · smowton · commit bec948682d01 · 2022-10-06T12:40:03.000+01:00
These are a bit weird since they involve static calls to unnamed synthetic class members, but while unwriteable as Java they ought to work as a database description.
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
@@ -1726,7 +1726,7 @@ open class KotlinFileExtractor(
         val id = extractMethodAccessWithoutArgs(callsite.type, locId, enclosingCallable, callsiteParent, childIdx, enclosingStmt, defaultMethodLabel)
 
         if (callTarget.isLocalFunction()) {
-            extractNewExprForLocalFunction(getLocallyVisibleFunctionLabels(callTarget), id, locId, enclosingCallable, enclosingStmt)
+            extractTypeAccess(getLocallyVisibleFunctionLabels(callTarget).type, locId, id, -1, enclosingCallable, enclosingStmt)
         } else {
             extractStaticTypeAccessQualifierUnchecked(callTarget.parent, id, locId, enclosingCallable, enclosingStmt)
         }
diff --git a/java/ql/test/kotlin/library-tests/parameter-defaults/PrintAst.expected b/java/ql/test/kotlin/library-tests/parameter-defaults/PrintAst.expected
@@ -568,17 +568,15 @@ test.kt:
 #   90|               5: [BlockStmt] { ... }
 #   91|                 0: [ExprStmt] <Expr>;
 #   91|                   0: [MethodAccess] f$default(...)
-#   91|                     -1: [ClassInstanceExpr] new (...)
-#   91|                       -3: [TypeAccess] Object
+#   91|                     -1: [TypeAccess] 
 #   91|                     0: [StringLiteral] local sunk
 #    1|                     1: [NullLiteral] null
 #    1|                     2: [NullLiteral] null
 #    1|                     3: [IntegerLiteral] 1
 #    1|                     4: [NullLiteral] null
 #   92|                 1: [ExprStmt] <Expr>;
 #   92|                   0: [MethodAccess] f$default(...)
-#   92|                     -1: [ClassInstanceExpr] new (...)
-#   92|                       -3: [TypeAccess] Object
+#   92|                     -1: [TypeAccess] 
 #   92|                     0: [StringLiteral] local sunk fp
 #   92|                     1: [StringLiteral] local sunk 2
 #    1|                     2: [NullLiteral] null

Original file line number	Diff line number	Diff line change
`@@ -1726,7 +1726,7 @@ open class KotlinFileExtractor(`
`1726`	`1726`	`val id = extractMethodAccessWithoutArgs(callsite.type, locId, enclosingCallable, callsiteParent, childIdx, enclosingStmt, defaultMethodLabel)`
`1727`	`1727`
`1728`	`1728`	`if (callTarget.isLocalFunction()) {`
`1729`		`- extractNewExprForLocalFunction(getLocallyVisibleFunctionLabels(callTarget), id, locId, enclosingCallable, enclosingStmt)`
	`1729`	`+ extractTypeAccess(getLocallyVisibleFunctionLabels(callTarget).type, locId, id, -1, enclosingCallable, enclosingStmt)`
`1730`	`1730`	`} else {`
`1731`	`1731`	`extractStaticTypeAccessQualifierUnchecked(callTarget.parent, id, locId, enclosingCallable, enclosingStmt)`
`1732`	`1732`	`}`