[IC] Additional test cases for inlined lambda snapshotting

Test cases are disabled while implementation is in work.

^KT-62555
^KT-75529
^KT-74481

Author: mazhukinevgeniy

compiler/build-tools/kotlin-build-statistics/src/org/jetbrains/kotlin/build/report/metrics/BuildTime.kt

@@ -130,6 +130,7 @@ enum class GradleBuildTime(private val parent: GradleBuildTime? = null, private
             LOAD_CONTENTS_OF_CLASSES(parent = SNAPSHOT_CLASSES, "Load contents of classes"),
             SNAPSHOT_KOTLIN_CLASSES(parent = SNAPSHOT_CLASSES, "Snapshot Kotlin classes"),
             SNAPSHOT_JAVA_CLASSES(parent = SNAPSHOT_CLASSES, "Snapshot Java classes"),
+            SNAPSHOT_INLINED_CLASSES(parent = SNAPSHOT_CLASSES, "Snapshot inlined classes"),
         SAVE_CLASSPATH_ENTRY_SNAPSHOT(parent = CLASSPATH_ENTRY_SNAPSHOT_TRANSFORM, "Save classpath entry snapshot"),
     ;
     // @formatter:on
@@ -148,10 +149,10 @@ enum class GradleBuildTime(private val parent: GradleBuildTime? = null, private
     override fun getName(): String = this.name
 
     companion object {
-        const val serialVersionUID = 2L
+        const val serialVersionUID = 2121L // to avoid collision between release branch and mainline versions
 
         val children by lazy {
             entries.filter { it.parent != null }.groupBy { it.parent }
         }
     }
-}
+}

compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/model/JvmModule.kt

@@ -21,6 +21,7 @@ class JvmModule(
     moduleDirectory: Path,
     dependencies: List<Dependency>,
     defaultStrategyConfig: CompilerExecutionStrategyConfiguration,
+    private val snapshotConfig: SnapshotConfig,
     additionalCompilationArguments: List<String> = emptyList(),
 ) : AbstractModule(
     project,
@@ -73,7 +74,8 @@ class JvmModule(
     private fun generateClasspathSnapshot(dependency: Dependency): Path {
         val snapshot = BaseTest.compilationService.calculateClasspathSnapshot(
             dependency.location.toFile(),
-            ClassSnapshotGranularity.CLASS_MEMBER_LEVEL
+            snapshotConfig.granularity,
+            //snapshotConfig.useInlineLambdaSnapshotting, //TODO(KT-62555)
         )
         val hash = snapshot.classSnapshots.values
             .filterIsInstance<AccessibleClassSnapshot>()

compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/model/Project.kt

@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.buildtools.api.tests.compilation.model
 
 import org.jetbrains.kotlin.buildtools.api.CompilerExecutionStrategyConfiguration
 import org.jetbrains.kotlin.buildtools.api.ProjectId
+import org.jetbrains.kotlin.buildtools.api.jvm.ClassSnapshotGranularity
 import org.jetbrains.kotlin.buildtools.api.tests.BaseTest
 import org.jetbrains.kotlin.buildtools.api.tests.compilation.BaseCompilationTest
 import java.nio.file.Path
@@ -26,11 +27,20 @@ class Project(
     fun module(
         moduleName: String,
         dependencies: List<Module> = emptyList(),
+        snapshotConfig: SnapshotConfig = SnapshotConfig(ClassSnapshotGranularity.CLASS_MEMBER_LEVEL, false),
         additionalCompilationArguments: List<String> = emptyList(),
     ): Module {
         val moduleDirectory = projectDirectory.resolve(moduleName)
         val sanitizedModuleName = moduleName.replace(invalidModuleNameCharactersRegex, "_")
-        val module = JvmModule(this, sanitizedModuleName, moduleDirectory, dependencies, defaultStrategyConfig, additionalCompilationArguments)
+        val module = JvmModule(
+            project = this,
+            moduleName = sanitizedModuleName,
+            moduleDirectory = moduleDirectory,
+            dependencies = dependencies,
+            defaultStrategyConfig = defaultStrategyConfig,
+            snapshotConfig = snapshotConfig,
+            additionalCompilationArguments = additionalCompilationArguments
+        )
         module.sourcesDirectory.createDirectories()
         val templatePath = Paths.get("src/main/resources/modules/$moduleName")
         assert(templatePath.isDirectory()) {
@@ -50,4 +60,4 @@ fun BaseCompilationTest.project(strategyConfig: CompilerExecutionStrategyConfigu
         action()
         endCompilationRound()
     }
-}
+}

compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/model/SnapshotConfig.kt

@@ -0,0 +1,16 @@
+/*
+ * Copyright 2010-2025 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.buildtools.api.tests.compilation.model
+
+import org.jetbrains.kotlin.buildtools.api.jvm.ClassSnapshotGranularity
+
+/**
+ * Configures how classpath snapshots are done for module's dependencies
+ */
+data class SnapshotConfig(
+    val granularity: ClassSnapshotGranularity,
+    val useInlineLambdaSnapshotting: Boolean, // TODO(KT-62555) - now has no effect
+)

compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/scenario/Scenario.kt

@@ -5,9 +5,11 @@
 
 package org.jetbrains.kotlin.buildtools.api.tests.compilation.scenario
 
+import org.jetbrains.kotlin.buildtools.api.jvm.ClassSnapshotGranularity
 import org.jetbrains.kotlin.buildtools.api.jvm.IncrementalJvmCompilationConfiguration
 import org.jetbrains.kotlin.buildtools.api.jvm.JvmCompilationConfiguration
 import org.jetbrains.kotlin.buildtools.api.tests.compilation.model.Module
+import org.jetbrains.kotlin.buildtools.api.tests.compilation.model.SnapshotConfig
 
 interface Scenario {
     /**
@@ -19,6 +21,7 @@ interface Scenario {
      *
      * @param moduleName The name of the module.
      * @param dependencies (optional) The list of scenario modules that this module depends on. Defaults to an empty list.
+     * @param snapshotInlinedClassesInDependencies (optional) Snapshotter setting to enable snapshotting inlined classes. Defaults to false.
      * @param additionalCompilationArguments (optional) The list of additional compilation arguments for this module. Defaults to an empty list.
      * @param compilationOptionsModifier (optional) A function that can be used to modify the compilation configuration for this module.
      * @param incrementalCompilationOptionsModifier (optional) A function that can be used to modify the incremental compilation configuration for this module.
@@ -27,6 +30,7 @@ interface Scenario {
     fun module(
         moduleName: String,
         dependencies: List<ScenarioModule> = emptyList(),
+        snapshotConfig: SnapshotConfig = SnapshotConfig(ClassSnapshotGranularity.CLASS_MEMBER_LEVEL, false),
         additionalCompilationArguments: List<String> = emptyList(),
         compilationOptionsModifier: ((JvmCompilationConfiguration) -> Unit)? = null,
         incrementalCompilationOptionsModifier: ((IncrementalJvmCompilationConfiguration<*>) -> Unit)? = null,
@@ -43,6 +47,7 @@ interface Scenario {
      *
      * @param moduleName The name of the module.
      * @param dependencies (optional) The list of scenario modules that this module depends on. Defaults to an empty list.
+     * @param snapshotInlinedClassesInDependencies (optional) Snapshotter setting to enable snapshotting inlined classes. Defaults to false.
      * @param additionalCompilationArguments (optional) The list of additional compilation arguments for this module. Defaults to an empty list.
      * @param compilationOptionsModifier (optional) A function that can be used to modify the compilation configuration for this module.
      * @param incrementalCompilationOptionsModifier (optional) A function that can be used to modify the incremental compilation configuration for this module.
@@ -51,8 +56,9 @@ interface Scenario {
     fun trackedModule(
         moduleName: String,
         dependencies: List<ScenarioModule> = emptyList(),
+        snapshotConfig: SnapshotConfig = SnapshotConfig(ClassSnapshotGranularity.CLASS_MEMBER_LEVEL, false),
         additionalCompilationArguments: List<String> = emptyList(),
         compilationOptionsModifier: ((JvmCompilationConfiguration) -> Unit)? = null,
         incrementalCompilationOptionsModifier: ((IncrementalJvmCompilationConfiguration<*>) -> Unit)? = null,
     ): ScenarioModule
-}
+}

compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/scenario/dslModuleCache.kt

@@ -10,6 +10,7 @@ import org.jetbrains.kotlin.buildtools.api.jvm.IncrementalJvmCompilationConfigur
 import org.jetbrains.kotlin.buildtools.api.jvm.JvmCompilationConfiguration
 import org.jetbrains.kotlin.buildtools.api.tests.compilation.model.DependencyScenarioDslCacheKey
 import org.jetbrains.kotlin.buildtools.api.tests.compilation.model.Module
+import org.jetbrains.kotlin.buildtools.api.tests.compilation.model.SnapshotConfig
 import java.nio.file.Files
 import java.nio.file.Path
 import java.util.*
@@ -20,6 +21,7 @@ import kotlin.io.path.walk
 
 private data class GlobalCompiledProjectsCacheKey(
     val moduleKey: DependencyScenarioDslCacheKey,
+    val snapshotConfig: SnapshotConfig,
     val compilationOptionsModifier: ((JvmCompilationConfiguration) -> Unit)?,
     val incrementalCompilationOptionsModifier: ((IncrementalJvmCompilationConfiguration<*>) -> Unit)?,
 )
@@ -33,12 +35,14 @@ internal object GlobalCompiledProjectsCache {
     fun getProjectFromCache(
         module: Module,
         strategyConfig: CompilerExecutionStrategyConfiguration,
+        snapshotConfig: SnapshotConfig,
         compilationOptionsModifier: ((JvmCompilationConfiguration) -> Unit)?,
         incrementalCompilationOptionsModifier: ((IncrementalJvmCompilationConfiguration<*>) -> Unit)?,
         icSourceTracking: Boolean,
     ): BaseScenarioModule? {
         val (initialOutputs, cachedBuildDirPath) = compiledProjectsCache[GlobalCompiledProjectsCacheKey(
             module.scenarioDslCacheKey,
+            snapshotConfig,
             compilationOptionsModifier,
             incrementalCompilationOptionsModifier
         )] ?: return null
@@ -53,6 +57,7 @@ internal object GlobalCompiledProjectsCache {
     fun putProjectIntoCache(
         module: Module,
         strategyConfig: CompilerExecutionStrategyConfiguration,
+        snapshotConfig: SnapshotConfig,
         compilationOptionsModifier: ((JvmCompilationConfiguration) -> Unit)?,
         incrementalCompilationOptionsModifier: ((IncrementalJvmCompilationConfiguration<*>) -> Unit)?,
         icSourceTracking: Boolean,
@@ -72,6 +77,7 @@ internal object GlobalCompiledProjectsCache {
         module.buildDirectory.copyToRecursively(moduleCacheDirectory, followLinks = false, overwrite = false)
         compiledProjectsCache[GlobalCompiledProjectsCacheKey(
             module.scenarioDslCacheKey,
+            snapshotConfig,
             compilationOptionsModifier,
             incrementalCompilationOptionsModifier
         )] = Pair(initialOutputs, moduleCacheDirectory)
@@ -81,4 +87,4 @@ internal object GlobalCompiledProjectsCache {
             ExternallyTrackedScenarioModuleImpl(module, initialOutputs, strategyConfig, compilationOptionsModifier, incrementalCompilationOptionsModifier)
         }
     }
-}
+}

compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/scenario/scenarioDsl.kt

@@ -167,29 +167,32 @@ private class ScenarioDsl(
     override fun module(
         moduleName: String,
         dependencies: List<ScenarioModule>,
+        snapshotConfig: SnapshotConfig,
         additionalCompilationArguments: List<String>,
         compilationOptionsModifier: ((JvmCompilationConfiguration) -> Unit)?,
         incrementalCompilationOptionsModifier: ((IncrementalJvmCompilationConfiguration<*>) -> Unit)?,
     ): ScenarioModule {
         val transformedDependencies = dependencies.map { (it as BaseScenarioModule).module }
         val module =
-            project.module(moduleName, transformedDependencies, additionalCompilationArguments)
-        return GlobalCompiledProjectsCache.getProjectFromCache(module, strategyConfig, compilationOptionsModifier, incrementalCompilationOptionsModifier, false)
-            ?: GlobalCompiledProjectsCache.putProjectIntoCache(module, strategyConfig, compilationOptionsModifier, incrementalCompilationOptionsModifier, false)
+            project.module(moduleName, transformedDependencies, snapshotConfig, additionalCompilationArguments)
+        return GlobalCompiledProjectsCache.getProjectFromCache(module, strategyConfig, snapshotConfig, compilationOptionsModifier, incrementalCompilationOptionsModifier, false)
+            ?: GlobalCompiledProjectsCache.putProjectIntoCache(module, strategyConfig, snapshotConfig, compilationOptionsModifier, incrementalCompilationOptionsModifier, false)
     }
 
+    @Synchronized
     override fun trackedModule(
         moduleName: String,
         dependencies: List<ScenarioModule>,
+        snapshotConfig: SnapshotConfig,
         additionalCompilationArguments: List<String>,
         compilationOptionsModifier: ((JvmCompilationConfiguration) -> Unit)?,
         incrementalCompilationOptionsModifier: ((IncrementalJvmCompilationConfiguration<*>) -> Unit)?,
     ): ScenarioModule {
         val transformedDependencies = dependencies.map { (it as BaseScenarioModule).module }
         val module =
-            project.module(moduleName, transformedDependencies, additionalCompilationArguments)
-        return GlobalCompiledProjectsCache.getProjectFromCache(module, strategyConfig, compilationOptionsModifier, incrementalCompilationOptionsModifier, true)
-            ?: GlobalCompiledProjectsCache.putProjectIntoCache(module, strategyConfig, compilationOptionsModifier, incrementalCompilationOptionsModifier, true)
+            project.module(moduleName, transformedDependencies, snapshotConfig, additionalCompilationArguments)
+        return GlobalCompiledProjectsCache.getProjectFromCache(module, strategyConfig, snapshotConfig, compilationOptionsModifier, incrementalCompilationOptionsModifier, true)
+            ?: GlobalCompiledProjectsCache.putProjectIntoCache(module, strategyConfig, snapshotConfig, compilationOptionsModifier, incrementalCompilationOptionsModifier, true)
     }
 }
 

compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/util/scenarioModuleUtil.kt

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2010-2025 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.buildtools.api.tests.compilation.util
+
+import org.jetbrains.kotlin.buildtools.api.tests.compilation.assertions.assertCompiledSources
+import org.jetbrains.kotlin.buildtools.api.tests.compilation.assertions.assertExactOutput
+import org.jetbrains.kotlin.buildtools.api.tests.compilation.scenario.ScenarioModule
+
+/**
+ * Shorthands for commonly used scenario steps & assertions
+ */
+
+fun ScenarioModule.compile(expectedDirtySet: Set<String>) {
+    compile { module, scenarioModule ->
+        assertCompiledSources(module, expectedDirtySet)
+    }
+}
+
+fun ScenarioModule.execute(mainClass: String, exactOutput: String) {
+    executeCompiledCode(mainClass) {
+        assertExactOutput(exactOutput)
+    }
+}

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

@@ -0,0 +1,3 @@
+fun main(args: Array<String>) {
+    println(callable())
+}

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

@@ -0,0 +1,3 @@
+open class SomeClass {
+    fun call(item: BaseType) = 42
+}

compiler/build-tools/kotlin-build-tools-api-tests/src/main/resources/modules/ic-scenarios/inline-local-class/inline-anonymous-object-evil/lib/SomeClass.kt.withOverload

@@ -0,0 +1,4 @@
+open class SomeClass {
+    fun call(item: BaseType) = 42
+    fun call(item: InheritedType) = 42 + 3
+}

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

@@ -0,0 +1,3 @@
+open class BaseType
+
+class InheritedType : BaseType()

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

@@ -0,0 +1,6 @@
+inline fun callable(): Int {
+    val obj = object : SomeClass() {
+        fun compute() = call(InheritedType())
+    }
+    return obj.compute()
+}

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

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

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

@@ -0,0 +1,4 @@
+interface BaseType {
+    fun compute(): Int
+    fun extraCompute(): Int = 2
+}

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

@@ -0,0 +1,4 @@
+interface BaseType {
+    fun compute(): Int
+    fun extraCompute(): Int = 2 + 3
+}

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

@@ -0,0 +1,8 @@
+inline fun callable(): Int {
+    val obj = object : BaseType {
+        override fun compute(): Int {
+            return 40 + extraCompute()
+        }
+    }
+    return obj.compute()
+}

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

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

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

@@ -0,0 +1,3 @@
+inline fun inlinedA(crossinline block: () -> Int): Int {
+    return block()
+}

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

@@ -0,0 +1,6 @@
+inline fun inlinedB(): Int {
+    val lambda = {
+        40 + 2
+    }
+    return lambda()
+}

compiler/build-tools/kotlin-build-tools-api-tests/src/main/resources/modules/ic-scenarios/inline-local-class/inline-crossinline/lib/inlinedB.kt.changeLambdaBody

@@ -0,0 +1,6 @@
+inline fun inlinedB(): Int {
+    val lambda = {
+        40 + 2 + 3
+    }
+    return lambda()
+}

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

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

compiler/build-tools/kotlin-build-tools-api-tests/src/main/resources/modules/ic-scenarios/inline-local-class/inline-property/lib/inlinedProperty.kt

@@ -0,0 +1,7 @@
+val value: Int
+    inline get() {
+        val lambda = {
+            40 + 2
+        }
+        return lambda()
+    }

compiler/build-tools/kotlin-build-tools-api-tests/src/main/resources/modules/ic-scenarios/inline-local-class/inline-property/lib/inlinedProperty.kt.changeLambdaBody

@@ -0,0 +1,7 @@
+val value: Int
+    inline get() {
+        val lambda = {
+            40 + 2 + 3
+        }
+        return lambda()
+    }

compiler/build-tools/kotlin-build-tools-api-tests/src/main/resources/modules/ic-scenarios/inline-local-class/lambda-body-change/app/com/example/ictest/callSite.kt

@@ -0,0 +1,7 @@
+package com.example.ictest
+
+val result = calculate()
+
+fun main(args: Array<String>) {
+    println(result)
+}

compiler/build-tools/kotlin-build-tools-api-tests/src/main/resources/modules/ic-scenarios/inline-local-class/lambda-body-change/lib/com/example/ictest/inlinedLambda.kt

@@ -0,0 +1,8 @@
+package com.example.ictest
+
+inline fun calculate(): Int {
+    val callable = {
+        40 + 2
+    }
+    return callable()
+}

compiler/build-tools/kotlin-build-tools-api-tests/src/main/resources/modules/ic-scenarios/jvm-inline-lib/inlinedLambda.kt.changeFunctionBody renamed to compiler/build-tools/kotlin-build-tools-api-tests/src/main/resources/modules/ic-scenarios/inline-local-class/lambda-body-change/lib/com/example/ictest/inlinedLambda.kt.changeFunctionBody

@@ -1,3 +1,5 @@
+package com.example.ictest
+
 inline fun calculate(): Int {
     val callable = {
         40 + 2 + 3

compiler/build-tools/kotlin-build-tools-api-tests/src/main/resources/modules/ic-scenarios/inline-local-class/lambda-body-change/lib/com/example/ictest/inlinedLambda.kt.changeLambdaBody

@@ -0,0 +1,8 @@
+package com.example.ictest
+
+inline fun calculate(): Int {
+    val callable = {
+        40 + 2 + 3
+    }
+    return callable()
+}

compiler/build-tools/kotlin-build-tools-api-tests/src/main/resources/modules/ic-scenarios/jvm-inline-app/callSite.kt renamed to compiler/build-tools/kotlin-build-tools-api-tests/src/main/resources/modules/ic-scenarios/inline-local-class/local-in-local/app/callSite.kt

@@ -0,0 +1,9 @@
+inline fun calculate(): Int {
+    val outer = {
+        val inner = {
+            40 + 2
+        }
+        inner()
+    }
+    return outer()
+}