Merge pull request #9218 from igfoo/igfoo/geninst

Kotlin: Avoid "generic specialisation" label collisions

Author: igfoo

java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt

@@ -160,7 +160,6 @@ class KotlinExtractorExtension(
 }
 
 class KotlinExtractorGlobalState {
-    val genericSpecialisationsExtracted = HashSet<String>()
     // These three record mappings of classes, functions and fields that should be replaced wherever they are found.
     // As of now these are only used to fix IR generated by the Gradle Android Extensions plugin, hence e.g. IrProperty
     // doesn't have a map as that plugin doesn't generate them. If and when these are used more widely additional maps

java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt

@@ -420,7 +420,7 @@ open class KotlinUsesExtractor(
                 extractorWithCSource.extractClassInstance(c, argsIncludingOuterClasses)
             }
 
-            if (inReceiverContext && globalExtensionState.genericSpecialisationsExtracted.add(classLabelResult.classLabel)) {
+            if (inReceiverContext && tw.lm.genericSpecialisationsExtracted.add(classLabelResult.classLabel)) {
                 val supertypeMode = if (argsIncludingOuterClasses == null) ExtractSupertypesMode.Raw else ExtractSupertypesMode.Specialised(argsIncludingOuterClasses)
                 extractorWithCSource.extractClassSupertypes(c, classLabel, supertypeMode, true)
                 extractorWithCSource.extractNonPrivateMemberPrototypes(c, argsIncludingOuterClasses, classLabel)

java/kotlin-extractor/src/main/kotlin/TrapWriter.kt

@@ -40,6 +40,15 @@ class TrapLabelManager {
     val anonymousTypeMapping: MutableMap<IrClass, TypeResults> = mutableMapOf()
 
     val locallyVisibleFunctionLabelMapping: MutableMap<IrFunction, LocallyVisibleFunctionLabels> = mutableMapOf()
+
+    /**
+     * The set of labels of generic specialisations that we have extracted
+     * in this TRAP file.
+     * We can't easily avoid duplication between TRAP files, as the labels
+     * contain references to other labels, so we just accept this
+     * duplication.
+     */
+    val genericSpecialisationsExtracted = HashSet<String>()
 }
 
 /**