Merge pull request #9766 from igfoo/igfoo/extension

igfoo · web-flow · commit 144c0d63b1f3 · 2022-06-30T21:16:26.000+01:00
Kotlin: Fix a label
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt
@@ -1514,7 +1514,7 @@ open class KotlinUsesExtractor(
         // otherwise two extension properties declared in the same enclosing context will get
         // clashing trap labels. These are always private, so we can just make up a label without
         // worrying about their names as seen from Java.
-        val extensionPropertyDiscriminator = getExtensionReceiverType(f)?.let { "extension;${useType(it)}" } ?: ""
+        val extensionPropertyDiscriminator = getExtensionReceiverType(f)?.let { "extension;${useType(it).javaResult.id}" } ?: ""
         return "@\"field;{$parentId};${extensionPropertyDiscriminator}${f.name.asString()}\""
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1514,7 +1514,7 @@ open class KotlinUsesExtractor(`
`1514`	`1514`	`// otherwise two extension properties declared in the same enclosing context will get`
`1515`	`1515`	`// clashing trap labels. These are always private, so we can just make up a label without`
`1516`	`1516`	`// worrying about their names as seen from Java.`
`1517`		`- val extensionPropertyDiscriminator = getExtensionReceiverType(f)?.let { "extension;${useType(it)}" } ?: ""`
	`1517`	`+ val extensionPropertyDiscriminator = getExtensionReceiverType(f)?.let { "extension;${useType(it).javaResult.id}" } ?: ""`
`1518`	`1518`	`return "@\"field;{$parentId};${extensionPropertyDiscriminator}${f.name.asString()}\""`
`1519`	`1519`	`}`
`1520`	`1520`