Fix type access extraction of nested generic constructor references

tamasvajk · igfoo · commit 7b2b40cc86d6 · 2022-05-10T19:51:21.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
@@ -2614,7 +2614,12 @@ open class KotlinFileExtractor(
                 val callId = tw.getFreshIdLabel<DbNewexpr>()
                 tw.writeExprs_newexpr(callId, callType.javaResult.id, retId, 0)
                 tw.writeExprsKotlinType(callId, callType.kotlinResult.id)
-                extractTypeAccessRecursive(expressionTypeArgs.first(), locId, callId, -3, labels.methodId, retId)
+
+                val typeAccessId = extractTypeAccess(callType, locId, callId, -3, labels.methodId, retId)
+                if (returnType is IrSimpleType) {
+                    // Only extract type arguments relating to the constructed type, not the constructor itself:
+                    extractTypeArguments(returnType.arguments.take(target.owner.parentAsClass.typeParameters.size).filterIsInstance<IrType>(), locId, typeAccessId, labels.methodId, retId)
+                }
                 callId
             } else {
                 var callId = tw.getFreshIdLabel<DbMethodaccess>()
@@ -2949,7 +2954,23 @@ open class KotlinFileExtractor(
             tw.writeStatementEnclosingExpr(idMemberRef, exprParent.enclosingStmt)
             tw.writeCallableBinding(idMemberRef, ids.constructor)
 
-            extractTypeAccessRecursive(fnInterfaceType, locId, idMemberRef, -3, callable, exprParent.enclosingStmt)
+            var typeAccessArguments = if (isBigArity) listOf(parameterTypes.last()) else parameterTypes
+            if (target is IrConstructorSymbol) {
+                val returnType = typeAccessArguments.last()
+
+                val typeAccessId = extractTypeAccess(useType(fnInterfaceType, TypeContext.OTHER), locId, idMemberRef, -3, callable, exprParent.enclosingStmt)
+                typeAccessArguments.dropLast(1).forEachIndexed { argIdx, arg ->
+                    extractTypeAccessRecursive(arg, locId, typeAccessId, argIdx, callable, exprParent.enclosingStmt, TypeContext.GENERIC_ARGUMENT)
+                }
+
+                val returnTypeAccessId = extractTypeAccess(useType(returnType), locId, typeAccessId, typeAccessArguments.count() - 1, callable, exprParent.enclosingStmt)
+                if (returnType is IrSimpleType) {
+                    // Only extract type arguments relating to the constructed type, not the constructor itself:
+                    extractTypeArguments(returnType.arguments.take(target.owner.parentAsClass.typeParameters.size).filterIsInstance<IrType>(), locId, returnTypeAccessId, callable, exprParent.enclosingStmt)
+                }
+            } else {
+                extractTypeAccessRecursive(fnInterfaceType, locId, idMemberRef, -3, callable, exprParent.enclosingStmt)
+            }
 
             tw.writeMemberRefBinding(idMemberRef, targetCallableId)
 
diff --git a/java/ql/test/kotlin/library-tests/reflection/PrintAst.expected b/java/ql/test/kotlin/library-tests/reflection/PrintAst.expected
@@ -157,7 +157,6 @@ reflection.kt:
 #   93|                       0: [ClassInstanceExpr] new Inner<String>(...)
 #   93|                         -3: [TypeAccess] Inner<String>
 #   93|                           0: [TypeAccess] String
-#   93|                           1: [TypeAccess] Integer
 #   93|                         -2: [VarAccess] this.<dispatchReceiver>
 #   93|                           -1: [ThisAccess] this
 #   93|                         0: [VarAccess] a0
@@ -168,7 +167,6 @@ reflection.kt:
 #   93|                 0: [TypeAccess] String
 #   93|                 1: [TypeAccess] Inner<String>
 #   93|                   0: [TypeAccess] String
-#   93|                   1: [TypeAccess] Integer
 #   93|               0: [ClassInstanceExpr] new Class2<Integer>(...)
 #   93|                 -3: [TypeAccess] Class2<Integer>
 #   93|                   0: [TypeAccess] Integer
@@ -829,7 +827,6 @@ reflection.kt:
 #   84|                       0: [ClassInstanceExpr] new Inner<String>(...)
 #   84|                         -3: [TypeAccess] Inner<String>
 #   84|                           0: [TypeAccess] String
-#   84|                           1: [TypeAccess] T
 #   84|                         -2: [VarAccess] this.<dispatchReceiver>
 #   84|                           -1: [ThisAccess] this
 #   84|                         0: [VarAccess] a0
@@ -840,5 +837,4 @@ reflection.kt:
 #   84|                 0: [TypeAccess] String
 #   84|                 1: [TypeAccess] Inner<String>
 #   84|                   0: [TypeAccess] String
-#   84|                   1: [TypeAccess] T
 #   84|               0: [ThisAccess] this
