azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[JS IR] Use recursive isExported for stable name detection

Browse Source 
^KT-44469 fixed
This commit is contained in:
Ilya Goncharov
2021-01-21 13:58:31 +03:00
parent 977781fa49
commit 6e98b81f3a
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/export/ExportModelGenerator.kt
+4 -4
View File
@@ -391,11 +391,11 @@ private fun getExportCandidate(declaration: IrDeclaration): IrDeclarationWithNam
return declaration return declaration
} }
private fun shouldDeclarationBeExported(declaration: IrDeclarationWithName, context: JsIrBackendContext): Boolean { private fun shouldDeclarationBeExported(declaration: IrDeclarationWithName, context: JsIrBackendContext?): Boolean {
if (declaration.fqNameWhenAvailable in context.additionalExportedDeclarationNames) if (context?.additionalExportedDeclarationNames?.contains(declaration.fqNameWhenAvailable) == true)
return true return true
if (declaration in context.additionalExportedDeclarations) if (context?.additionalExportedDeclarations?.contains(declaration) == true)
return true return true
if (declaration.isJsExport()) if (declaration.isJsExport())
@@ -408,7 +408,7 @@ private fun shouldDeclarationBeExported(declaration: IrDeclarationWithName, cont
} }
} }
fun IrDeclaration.isExported(context: JsIrBackendContext): Boolean { fun IrDeclaration.isExported(context: JsIrBackendContext?): Boolean {
val candidate = getExportCandidate(this) ?: return false val candidate = getExportCandidate(this) ?: return false
return shouldDeclarationBeExported(candidate, context) return shouldDeclarationBeExported(candidate, context)
} }
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/misc.kt
+2 -1
View File
@@ -10,6 +10,7 @@ import org.jetbrains.kotlin.ir.IrElement
import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
import org.jetbrains.kotlin.ir.backend.js.JsIrBackendContext import org.jetbrains.kotlin.ir.backend.js.JsIrBackendContext
import org.jetbrains.kotlin.ir.backend.js.JsLoweredDeclarationOrigin import org.jetbrains.kotlin.ir.backend.js.JsLoweredDeclarationOrigin
import org.jetbrains.kotlin.ir.backend.js.export.isExported
import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.declarations.*
import org.jetbrains.kotlin.ir.expressions.IrExpression import org.jetbrains.kotlin.ir.expressions.IrExpression
import org.jetbrains.kotlin.ir.expressions.impl.IrCallImpl import org.jetbrains.kotlin.ir.expressions.impl.IrCallImpl
@@ -51,7 +52,7 @@ fun IrFunction.hasStableJsName(): Boolean {
else -> true else -> true
} }
return (isEffectivelyExternal() || getJsName() != null || isJsExport() || parentClassOrNull?.isJsExport() == true) && namedOrMissingGetter return (isEffectivelyExternal() || getJsName() != null || isExported(null)) && namedOrMissingGetter
} }
fun IrFunction.isEqualsInheritedFromAny() = fun IrFunction.isEqualsInheritedFromAny() =