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

[K/JS] Exclude Enum.entries property from export to JS

Browse Source
This commit is contained in:
Artem Kobzar
2022-10-21 10:31:06 +00:00
committed by Space Team
parent 6c0b4bcfd4
commit ea6b784e41
10 changed files with 90 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsCommonBackendContext.kt
+2 -5
View File
@@ -20,10 +20,7 @@ import org.jetbrains.kotlin.ir.declarations.*
import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
import org.jetbrains.kotlin.ir.types.IrType
import org.jetbrains.kotlin.ir.util.SymbolTable
import org.jetbrains.kotlin.ir.util.getPropertyGetter
import org.jetbrains.kotlin.ir.util.getPropertySetter
import org.jetbrains.kotlin.ir.util.isOverridableOrOverrides
import org.jetbrains.kotlin.ir.util.*
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.resolve.scopes.MemberScope
@@ -157,4 +154,4 @@ interface JsCommonInlineClassesUtils : InlineClassesUtils {
* An intrinsic for obtaining the underlying value from an instance of an inline class.
*/
val unboxIntrinsic: IrSimpleFunctionSymbol
}
}
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsIntrinsics.kt
+12
View File
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.ir.backend.js
import org.jetbrains.kotlin.builtins.PrimitiveType
import org.jetbrains.kotlin.ir.IrBuiltIns
import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
import org.jetbrains.kotlin.ir.declarations.IrClass
import org.jetbrains.kotlin.ir.declarations.IrFunction
import org.jetbrains.kotlin.ir.declarations.IrProperty
import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
@@ -16,6 +17,7 @@ import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
import org.jetbrains.kotlin.ir.types.isLong
import org.jetbrains.kotlin.ir.util.constructors
import org.jetbrains.kotlin.ir.util.findDeclaration
import org.jetbrains.kotlin.ir.util.fqNameWhenAvailable
import org.jetbrains.kotlin.ir.util.kotlinPackageFqn
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.Name
@@ -321,6 +323,16 @@ class JsIntrinsics(private val irBuiltIns: IrBuiltIns, val context: JsIrBackendC
val jsFunAnnotationSymbol = context.symbolTable.referenceClass(context.getJsInternalClass("JsFun"))
val jsNameAnnotationSymbol = context.symbolTable.referenceClass(context.getJsInternalClass("JsName"))
val jsExportAnnotationSymbol by lazy {
context.symbolTable.referenceClass(context.getJsInternalClass("JsExport"))
}
val jsExportIgnoreAnnotationSymbol by lazy {
jsExportAnnotationSymbol.owner
.findDeclaration<IrClass> { it.fqNameWhenAvailable == FqName("kotlin.js.JsExport.Ignore") }
?.symbol ?: error("can't find kotlin.js.JsExport.Ignore annotation")
}
val jsImplicitExportAnnotationSymbol = context.symbolTable.referenceClass(context.getJsInternalClass("JsImplicitExport"))
// TODO move CharSequence-related stiff to IntrinsifyCallsLowering
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsLoweringPhases.kt
+9 -1
View File
@@ -338,6 +338,12 @@ private val enumEntryCreateGetInstancesFunsLoweringPhase = makeDeclarationTransf
prerequisite = setOf(enumClassConstructorLoweringPhase)
)
private val enumClassPreventExportOfNonExportedMembersLowering = makeDeclarationTransformerPhase(
::EnumClassPreventExportOfNonExportedMembersLowering,
name = "EnumClassPreventExportOfNonExportedMembersLowering",
description = "Exclude non-exportable enum members such as `Enum.entries`",
)
private val enumSyntheticFunsLoweringPhase = makeDeclarationTransformerPhase(
{ EnumSyntheticFunctionsAndPropertiesLowering(it, supportRawFunctionReference = true) },
name = "EnumSyntheticFunctionsAndPropertiesLowering",
@@ -345,7 +351,8 @@ private val enumSyntheticFunsLoweringPhase = makeDeclarationTransformerPhase(
prerequisite = setOf(
enumClassConstructorLoweringPhase,
enumClassCreateInitializerLoweringPhase,
enumEntryCreateGetInstancesFunsLoweringPhase
enumEntryCreateGetInstancesFunsLoweringPhase,
enumClassPreventExportOfNonExportedMembersLowering
)
)
@@ -865,6 +872,7 @@ val loweringList = listOf<Lowering>(
enumEntryInstancesBodyLoweringPhase,
enumClassCreateInitializerLoweringPhase,
enumEntryCreateGetInstancesFunsLoweringPhase,
enumClassPreventExportOfNonExportedMembersLowering,
enumSyntheticFunsLoweringPhase,
enumUsageLoweringPhase,
externalEnumUsageLoweringPhase,
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/export/ExportModelGenerator.kt
+2 -1
View File
@@ -153,7 +153,8 @@ class ExportModelGenerator(val context: JsIrBackendContext, val generateNamespac
isField = parentClass?.isInterface == true,
irGetter = property.getter,
irSetter = property.setter,
isOptional = isOptional
isOptional = isOptional,
isStatic = (property.getter ?: property.setter)?.isStaticMethodOfClass == true,
)
}
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/ir/IrBuilder.kt
+31
View File
@@ -15,6 +15,7 @@ import org.jetbrains.kotlin.ir.expressions.*
import org.jetbrains.kotlin.ir.expressions.impl.*
import org.jetbrains.kotlin.ir.symbols.*
import org.jetbrains.kotlin.ir.types.IrType
import org.jetbrains.kotlin.ir.util.parentAsClass
import org.jetbrains.kotlin.name.Name
object JsIrBuilder {
@@ -45,6 +46,36 @@ object JsIrBuilder {
}
}
fun buildConstructorCall(
target: IrConstructorSymbol,
type: IrType? = null,
typeArguments: List<IrType>? = null,
constructorTypeArguments: List<IrType>? = null,
origin: IrStatementOrigin = JsStatementOrigins.SYNTHESIZED_STATEMENT
): IrConstructorCall {
val owner = target.owner
val parent = owner.parentAsClass
return IrConstructorCallImpl(
UNDEFINED_OFFSET,
UNDEFINED_OFFSET,
type ?: owner.returnType,
target,
typeArgumentsCount = parent.typeParameters.size,
valueArgumentsCount = owner.valueParameters.size,
constructorTypeArgumentsCount = owner.typeParameters.size,
origin = origin
).apply {
typeArguments?.let {
assert(typeArguments.size == typeArgumentsCount)
it.withIndex().forEach { (i, t) -> putTypeArgument(i, t) }
}
constructorTypeArguments?.let {
assert(constructorTypeArguments.size == constructorTypeArgumentsCount)
it.withIndex().forEach { (i, t) -> putTypeArgument(i, t) }
}
}
}
fun buildReturn(targetSymbol: IrFunctionSymbol, value: IrExpression, type: IrType) =
IrReturnImpl(UNDEFINED_OFFSET, UNDEFINED_OFFSET, type, targetSymbol, value)
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/EnumClassLowering.kt
+22 -1
View File
@@ -17,7 +17,9 @@ import org.jetbrains.kotlin.descriptors.ClassKind
import org.jetbrains.kotlin.descriptors.DescriptorVisibilities.PRIVATE
import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
import org.jetbrains.kotlin.ir.backend.js.JsCommonBackendContext
import org.jetbrains.kotlin.ir.backend.js.JsIrBackendContext
import org.jetbrains.kotlin.ir.backend.js.JsLoweredDeclarationOrigin
import org.jetbrains.kotlin.ir.backend.js.export.isExported
import org.jetbrains.kotlin.ir.backend.js.ir.JsIrBuilder
import org.jetbrains.kotlin.ir.builders.*
import org.jetbrains.kotlin.ir.builders.declarations.addField
@@ -57,6 +59,26 @@ private fun createEntryAccessorName(enumName: String, enumEntry: IrEnumEntry) =
private fun IrEnumEntry.getType(irClass: IrClass) = (correspondingClass ?: irClass).defaultType
class EnumClassPreventExportOfNonExportedMembersLowering(val context: JsIrBackendContext) : DeclarationTransformer {
override fun transformFlat(declaration: IrDeclaration): List<IrDeclaration>? {
if (declaration !is IrSimpleFunction || declaration.parentEnumClassOrNull?.isExported(context) != true) return null
val syntheticGetterBody = declaration.body as? IrSyntheticBody ?: return null
if (syntheticGetterBody.kind == IrSyntheticBodyKind.ENUM_ENTRIES) {
declaration.correspondingPropertySymbol?.owner?.let {
it.annotations += generateJsExportIgnoreCall()
}
}
return null
}
private fun generateJsExportIgnoreCall(): IrConstructorCall {
return JsIrBuilder.buildConstructorCall(context.intrinsics.jsExportIgnoreAnnotationSymbol.owner.primaryConstructor!!.symbol)
}
}
// Should be applied recursively
class EnumClassConstructorLowering(val context: JsCommonBackendContext) : DeclarationTransformer {
@@ -470,7 +492,6 @@ class EnumSyntheticFunctionsAndPropertiesLowering(
) : DeclarationTransformer {
private val IrEnumEntry.getInstanceFun by context.mapping.enumEntryToGetInstanceFun
private val IrClass.initEntryInstancesFun: IrSimpleFunction? by context.mapping.enumClassToInitEntryInstancesFun
private val IrClass.enumArrayType get() = context.irBuiltIns.arrayClass.typeWith(defaultType)
override fun transformFlat(declaration: IrDeclaration): List<IrDeclaration>? {
if (declaration is IrConstructor && declaration.isPrimary && declaration.parentEnumClassOrNull != null &&
js/js.translator/testData/box/esModules/export/exportEnumClass.kt
Vendored
+3
View File
@@ -1,3 +1,4 @@
// !LANGUAGE: +EnumEntries
// DONT_TARGET_EXACT_BACKEND: JS
// ES_MODULES
@@ -99,5 +100,7 @@ export function box() {
if (OuterClass.NestedEnum.A.ordinal !== 0) return "fail29"
if (OuterClass.NestedEnum.B.ordinal !== 1) return "fail30"
if (Foo.entries !== undefined) return "fail31"
return "OK"
}
js/js.translator/testData/box/esModules/export/exportFileWithEnumClass.kt
Vendored
+3
View File
@@ -1,3 +1,4 @@
// !LANGUAGE: +EnumEntries
// DONT_TARGET_EXACT_BACKEND: JS
// ES_MODULES
@@ -96,5 +97,7 @@ export function box() {
if (OuterClass.NestedEnum.A.ordinal !== 0) return "fail29"
if (OuterClass.NestedEnum.B.ordinal !== 1) return "fail30"
if (Foo.entries !== undefined) return "fail31"
return "OK"
}
js/js.translator/testData/box/export/exportEnumClass.kt
Vendored
+3
View File
@@ -1,3 +1,4 @@
// !LANGUAGE: +EnumEntries
// IGNORE_BACKEND: JS
// RUN_PLAIN_BOX_FUNCTION
// INFER_MAIN_MODULE
@@ -96,5 +97,7 @@ function box() {
if (this["export_enum_class"].OuterClass.NestedEnum.A.ordinal !== 0) return "fail29"
if (this["export_enum_class"].OuterClass.NestedEnum.B.ordinal !== 1) return "fail30"
if (this["export_enum_class"].Foo.entries !== undefined) return "fail31"
return "OK"
}
js/js.translator/testData/box/export/exportFileWithEnumClass.kt
Vendored
+3
View File
@@ -1,3 +1,4 @@
// !LANGUAGE: +EnumEntries
// IGNORE_BACKEND: JS
// RUN_PLAIN_BOX_FUNCTION
// INFER_MAIN_MODULE
@@ -94,5 +95,7 @@ function box() {
if (this["export_enum_class"].OuterClass.NestedEnum.A.ordinal !== 0) return "fail29"
if (this["export_enum_class"].OuterClass.NestedEnum.B.ordinal !== 1) return "fail30"
if (this["export_enum_class"].Foo.entries !== undefined) return "fail31"
return "OK"
}