Prevent extracting hidden functions

smowton · smowton · commit 8c57308661e8 · 2022-06-23T15:34:40.000+01:00
I'm not sure how these looked in 1.6 and below yet, but in 1.7 they appear with visibility = public, but a descriptor field set to indicate they have a name clash with a 'real' function.
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
@@ -86,6 +86,7 @@ open class KotlinFileExtractor(
         }
     }
 
+    @OptIn(ObsoleteDescriptorBasedAPI::class)
     private fun isFake(d: IrDeclarationWithVisibility): Boolean {
         val visibility = d.visibility
         if (visibility is DelegatedDescriptorVisibility && visibility.delegate == Visibilities.InvisibleFake) {
@@ -94,6 +95,9 @@ open class KotlinFileExtractor(
         if (d.isFakeOverride) {
             return true
         }
+        if ((d as? IrFunction)?.descriptor?.isHiddenToOvercomeSignatureClash == true) {
+            return true
+        }
         return false
     }
 

Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,7 @@ open class KotlinFileExtractor(`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`
	`89`	`+ @OptIn(ObsoleteDescriptorBasedAPI::class)`
`89`	`90`	`private fun isFake(d: IrDeclarationWithVisibility): Boolean {`
`90`	`91`	`val visibility = d.visibility`
`91`	`92`	`if (visibility is DelegatedDescriptorVisibility && visibility.delegate == Visibilities.InvisibleFake) {`
`@@ -94,6 +95,9 @@ open class KotlinFileExtractor(`
`94`	`95`	`if (d.isFakeOverride) {`
`95`	`96`	`return true`
`96`	`97`	`}`
	`98`	`+ if ((d as? IrFunction)?.descriptor?.isHiddenToOvercomeSignatureClash == true) {`
	`99`	`+ return true`
	`100`	`+ }`
`97`	`101`	`return false`
`98`	`102`	`}`
`99`	`103`