[IC] Update inline function snapshotting

This is a more robust version with extra tests and better support for
non-lambda local classes

^KT-75883

Author: mazhukinevgeniy

build-common/src/org/jetbrains/kotlin/incremental/impl/ExtraClassInfoGenerator.kt

@@ -25,7 +25,16 @@ open class ExtraClassInfoGenerator() {
         return classNode
     }
 
-    protected open fun calculateInlineMethodHash(methodSignature: JvmMemberSignature.Method, ownMethodHash: Long): Long {
+    /**
+     * @param methodSignature well-typed method signature. doesn't include the containing class' internal name
+     * @param inlinedClassPrefix - includes class internal name and method name. example value is "com/bar/OuterClass$InnerClass$calculate"
+     * @param ownMethodHash - a basic intuition is that it's based on bytecode and debug info
+     */
+    protected open fun calculateInlineMethodHash(
+        methodSignature: JvmMemberSignature.Method,
+        inlinedClassPrefix: String,
+        ownMethodHash: Long
+    ): Long {
         return ownMethodHash
     }
 
@@ -89,8 +98,9 @@ open class ExtraClassInfoGenerator() {
             //     class metadata (also in the source file), but not in the bytecode. However, we can safely ignore those
             //     inline functions/accessors because they are not declared in the bytecode and therefore can't be referenced.
             val methodSignature = JvmMemberSignature.Method(name = methodNode.name, desc = methodNode.desc)
+            val innerClassPrefix = "${classNode.name}\$${methodNode.name}"
             var methodHash = snapshotMethod(methodNode, classNode.version)
-            inlineFunctionsAndAccessors[methodSignature]!! to calculateInlineMethodHash(methodSignature, methodHash)
+            inlineFunctionsAndAccessors[methodSignature]!! to calculateInlineMethodHash(methodSignature, innerClassPrefix, methodHash)
         }
 
         return ExtraInfo(classSnapshotExcludingMembers, constantSnapshots, inlineFunctionOrAccessorSnapshots)

build-common/src/org/jetbrains/kotlin/incremental/impl/InstanceOwnerRecordingClassVisitor.kt

@@ -32,13 +32,26 @@ class InstanceOwnerRecordingClassVisitor(
 
         return object : MethodVisitor(Opcodes.ASM9, super.visitMethod(access, name, descriptor, signature, exceptions)) {
             override fun visitFieldInsn(opcode: Int, owner: String?, name: String?, descriptor: String?) {
-                if (owner != null && opcode == Opcodes.GETSTATIC && name == "INSTANCE") {
-                    val jvmClassName = JvmClassName.byInternalName(owner)
-                    methodToUsedClassesMap?.getOrPut(methodSignature) { mutableSetOf() }?.add(jvmClassName)
-                    allUsedClassesSet?.add(jvmClassName)
+                if (opcode == Opcodes.GETSTATIC && name == "INSTANCE" && owner?.contains("$") == true) {
+                    storeUsage(owner)
                 }
                 super.visitFieldInsn(opcode, owner, name, descriptor)
             }
+
+            override fun visitTypeInsn(opcode: Int, type: String?) {
+                if (opcode == Opcodes.NEW && type?.contains("$") == true) {
+                    // here we might be instantiating a class from another inline function in the same module
+                    // better safe than sorry, so:
+                    storeUsage(type)
+                }
+                super.visitTypeInsn(opcode, type)
+            }
+
+            private fun storeUsage(internalName: String) {
+                val jvmClassName = JvmClassName.byInternalName(internalName)
+                methodToUsedClassesMap?.getOrPut(methodSignature) { mutableSetOf() }?.add(jvmClassName)
+                allUsedClassesSet?.add(jvmClassName)
+            }
         }
     }
 }

compiler/build-tools/kotlin-build-tools-api-tests/src/main/resources/modules/ic-scenarios/inline-local-class/nested-inline-as-anonymous-object/app/callSite.kt

@@ -0,0 +1,5 @@
+val result = calculateA()
+
+fun main(args: Array<String>) {
+    println(result)
+}

compiler/build-tools/kotlin-build-tools-api-tests/src/main/resources/modules/ic-scenarios/inline-local-class/nested-inline-as-anonymous-object/lib/inlinedA.kt

@@ -0,0 +1,3 @@
+inline fun calculateA(): Int {
+    return calculateB()
+}

compiler/build-tools/kotlin-build-tools-api-tests/src/main/resources/modules/ic-scenarios/inline-local-class/nested-inline-as-anonymous-object/lib/inlinedB.kt

@@ -0,0 +1,6 @@
+inline fun calculateB(): Int {
+    val calculator = object {
+        fun calc(): Int = 42
+    }
+    return calculator.calc()
+}

compiler/build-tools/kotlin-build-tools-api-tests/src/main/resources/modules/ic-scenarios/inline-local-class/nested-inline-as-anonymous-object/lib/inlinedB.kt.changeObjectInB

@@ -0,0 +1,6 @@
+inline fun calculateB(): Int {
+    val calculator = object {
+        fun calc(): Int = 42 + 3
+    }
+    return calculator.calc()
+}

compiler/build-tools/kotlin-build-tools-api-tests/src/main/resources/modules/ic-scenarios/inline-local-class/nested-inline-as-typed-object/app/callSite.kt

@@ -0,0 +1,5 @@
+val result = calculateA()
+
+fun main(args: Array<String>) {
+    println(result)
+}

compiler/build-tools/kotlin-build-tools-api-tests/src/main/resources/modules/ic-scenarios/inline-local-class/nested-inline-as-typed-object/lib/inlinedA.kt

@@ -0,0 +1,3 @@
+inline fun calculateA(): Int {
+    return calculateB()
+}

compiler/build-tools/kotlin-build-tools-api-tests/src/main/resources/modules/ic-scenarios/inline-local-class/nested-inline-as-typed-object/lib/inlinedB.kt

@@ -0,0 +1,10 @@
+interface NiceType {
+    fun calc(): Int
+}
+
+inline fun calculateB(): Int {
+    val calculator = object : NiceType {
+        override fun calc(): Int = 42
+    }
+    return calculator.calc()
+}

compiler/build-tools/kotlin-build-tools-api-tests/src/main/resources/modules/ic-scenarios/inline-local-class/nested-inline-as-typed-object/lib/inlinedB.kt.changeObjectInB

@@ -0,0 +1,10 @@
+interface NiceType {
+    fun calc(): Int
+}
+
+inline fun calculateB(): Int {
+    val calculator = object : NiceType {
+        override fun calc(): Int = 42 + 3
+    }
+    return calculator.calc()
+}