[IR] Move defaultConstructorMarker to backend.common.ir.Symbols

^KT-80226

Author: francescoo22

compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/PreSerializationSymbols.kt

@@ -27,7 +27,6 @@ import org.jetbrains.kotlin.ir.types.impl.IrDynamicTypeImpl
 import org.jetbrains.kotlin.ir.util.*
 import org.jetbrains.kotlin.name.*
 import org.jetbrains.kotlin.types.Variance
-import org.jetbrains.kotlin.util.capitalizeDecapitalize.capitalizeAsciiOnly
 
 abstract class BaseSymbolsImpl(protected val irBuiltIns: IrBuiltIns) {
     protected val symbolFinder = irBuiltIns.symbolFinder
@@ -108,7 +107,6 @@ interface PreSerializationSymbols {
     val throwUninitializedPropertyAccessException: IrSimpleFunctionSymbol
     val throwUnsupportedOperationException: IrSimpleFunctionSymbol
 
-    val defaultConstructorMarker: IrClassSymbol
     val syntheticConstructorMarker: IrClassSymbol
     val coroutineContextGetter: IrSimpleFunctionSymbol
     val suspendCoroutineUninterceptedOrReturn: IrSimpleFunctionSymbol
@@ -160,7 +158,6 @@ interface PreSerializationKlibSymbols : PreSerializationSymbols {
         const val THROW_UNSUPPORTED_OPERATION_NAME = "throwUnsupportedOperationException"
         const val GET_COROUTINE_CONTEXT_NAME = "getCoroutineContext"
         const val COROUTINE_CONTEXT_NAME = "coroutineContext"
-        const val DEFAULT_CONSTRUCTOR_MARKET_NAME = "DefaultConstructorMarker"
 
         private val kotlinInternalPackageFqn = FqName.fromSegments(listOf("kotlin", "internal"))
         private val String.internalCallableId: CallableId
@@ -189,8 +186,6 @@ interface PreSerializationJsSymbols : PreSerializationWebSymbols {
     val jsOutlinedFunctionAnnotationSymbol: IrClassSymbol
 
     open class Impl(irBuiltIns: IrBuiltIns) : PreSerializationJsSymbols, PreSerializationWebSymbols.Impl(irBuiltIns) {
-        override val defaultConstructorMarker: IrClassSymbol = ClassIds.defaultConstructorMarker.classSymbol()
-
         override val suspendCoroutineUninterceptedOrReturn: IrSimpleFunctionSymbol =
             CallableIds.suspendCoroutineUninterceptedOrReturn.functionSymbol()
         override val coroutineGetContext: IrSimpleFunctionSymbol = CallableIds.coroutineGetContext.functionSymbol()
@@ -212,7 +207,6 @@ interface PreSerializationJsSymbols : PreSerializationWebSymbols {
             private object ClassIds {
                 private val String.baseJsClassId: ClassId
                     get() = ClassId(StandardClassIds.BASE_JS_PACKAGE, Name.identifier(this))
-                val defaultConstructorMarker: ClassId = PreSerializationKlibSymbols.DEFAULT_CONSTRUCTOR_MARKET_NAME.baseJsClassId
                 val JsOutlinedFunction: ClassId = "JsOutlinedFunction".baseJsClassId
             }
         }
@@ -221,8 +215,6 @@ interface PreSerializationJsSymbols : PreSerializationWebSymbols {
 
 interface PreSerializationWasmSymbols : PreSerializationWebSymbols {
     open class Impl(irBuiltIns: IrBuiltIns) : PreSerializationWasmSymbols, PreSerializationWebSymbols.Impl(irBuiltIns) {
-        override val defaultConstructorMarker: IrClassSymbol = ClassIds.defaultConstructorMarker.classSymbol()
-
         override val suspendCoroutineUninterceptedOrReturn: IrSimpleFunctionSymbol =
             CallableIds.suspendCoroutineUninterceptedOrReturn.functionSymbol()
         override val coroutineGetContext: IrSimpleFunctionSymbol = CallableIds.coroutineGetContext.functionSymbol()
@@ -238,12 +230,6 @@ interface PreSerializationWasmSymbols : PreSerializationWebSymbols {
                 val suspendCoroutineUninterceptedOrReturn: CallableId = COROUTINE_SUSPEND_OR_RETURN_NAME.internalCallableId
                 val coroutineGetContext: CallableId = PreSerializationKlibSymbols.GET_COROUTINE_CONTEXT_NAME.internalCallableId
             }
-
-            private object ClassIds {
-                private val String.internalClassId: ClassId
-                    get() = ClassId(wasmInternalFqName, Name.identifier(this))
-                val defaultConstructorMarker: ClassId = PreSerializationKlibSymbols.DEFAULT_CONSTRUCTOR_MARKET_NAME.internalClassId
-            }
         }
     }
 }
@@ -255,7 +241,6 @@ interface PreSerializationNativeSymbols : PreSerializationKlibSymbols {
     open class Impl(irBuiltIns: IrBuiltIns) : PreSerializationNativeSymbols, PreSerializationKlibSymbols.Impl(irBuiltIns) {
         override val asserts: Iterable<IrSimpleFunctionSymbol> = CallableIds.asserts.functionSymbols()
 
-        override val defaultConstructorMarker: IrClassSymbol = ClassIds.defaultConstructorMarker.classSymbol()
         override val isAssertionArgumentEvaluationEnabled: IrSimpleFunctionSymbol =
             CallableIds.isAssertionArgumentEvaluationEnabled.functionSymbol()
 
@@ -285,14 +270,6 @@ interface PreSerializationNativeSymbols : PreSerializationKlibSymbols {
                 val asserts: CallableId = "assert".builtInsCallableId
                 val isAssertionArgumentEvaluationEnabled: CallableId = "isAssertionArgumentEvaluationEnabled".builtInsCallableId
             }
-
-            private object ClassIds {
-                // Internal classes
-                private val String.internalClassId: ClassId
-                    get() = ClassId(kotlinNativeInternalPackageName, Name.identifier(this))
-                val defaultConstructorMarker: ClassId =
-                    PreSerializationKlibSymbols.DEFAULT_CONSTRUCTOR_MARKET_NAME.internalClassId
-            }
         }
     }
 }

compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/Symbols.kt

@@ -202,6 +202,8 @@ abstract class Symbols(irBuiltIns: IrBuiltIns) : PreSerializationSymbols.Impl(ir
 
     abstract val functionAdapter: IrClassSymbol
 
+    abstract val defaultConstructorMarker: IrClassSymbol
+
     open val unsafeCoerceIntrinsic: IrSimpleFunctionSymbol?
         get() = null
 

compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/inline/KlibSyntheticAccessorGenerator.kt

@@ -14,7 +14,9 @@ import org.jetbrains.kotlin.ir.builders.declarations.addValueParameter
 import org.jetbrains.kotlin.ir.builders.declarations.buildConstructor
 import org.jetbrains.kotlin.ir.builders.declarations.buildFun
 import org.jetbrains.kotlin.ir.declarations.*
+import org.jetbrains.kotlin.ir.expressions.IrConst
 import org.jetbrains.kotlin.ir.expressions.IrGetValue
+import org.jetbrains.kotlin.ir.expressions.impl.IrConstImpl
 import org.jetbrains.kotlin.ir.expressions.impl.IrReturnImpl
 import org.jetbrains.kotlin.ir.irAttribute
 import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
@@ -94,6 +96,9 @@ class KlibSyntheticAccessorGenerator(
         contributeTopLevelDeclarationSuffix(field)
     }
 
+    override fun createAccessorMarkerArgument(): IrConst =
+        IrConstImpl.constNull(UNDEFINED_OFFSET, UNDEFINED_OFFSET, context.symbols.syntheticConstructorMarker.defaultType.makeNullable())
+
     private fun AccessorNameBuilder.contributeTopLevelDeclarationSuffix(declaration: IrDeclaration) {
         val parent = declaration.parent
         if (parent !is IrPackageFragment) return

compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/inline/SyntheticAccessorGenerator.kt

@@ -436,7 +436,7 @@ abstract class SyntheticAccessorGenerator<Context : LoweringContext, ScopeInfo>(
         }
         newExpression.copyTypeArgumentsFrom(oldExpression)
         val newExpressionArguments = if (accessorSymbol is IrConstructorSymbol) {
-            oldExpression.arguments + createAccessorMarkerArgument(accessorSymbol.owner.parameters.last().origin)
+            oldExpression.arguments + createAccessorMarkerArgument()
         } else {
             oldExpression.arguments
         }
@@ -475,14 +475,7 @@ abstract class SyntheticAccessorGenerator<Context : LoweringContext, ScopeInfo>(
         )
     }
 
-    fun createAccessorMarkerArgument(origin: IrDeclarationOrigin = IrDeclarationOrigin.DEFAULT_CONSTRUCTOR_MARKER): IrConst {
-        val symbol = when (origin) {
-            IrDeclarationOrigin.DEFAULT_CONSTRUCTOR_MARKER -> context.symbols.defaultConstructorMarker
-            IrDeclarationOrigin.SYNTHETIC_CONSTRUCTOR_MARKER -> context.symbols.syntheticConstructorMarker
-            else -> error("Unexpected origin '$origin' when creating accessor marker argument.")
-        }
-        return IrConstImpl.constNull(UNDEFINED_OFFSET, UNDEFINED_OFFSET, symbol.defaultType.makeNullable())
-    }
+    abstract fun createAccessorMarkerArgument(): IrConst
 
     /**
      * Produces a call to the synthetic accessor [accessorSymbol] to replace the field _read_ expression [oldExpression].

compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsSymbols.kt

@@ -80,6 +80,8 @@ class JsSymbols(
 
     override val functionAdapter = symbolFinder.topLevelClass(BASE_JS_PACKAGE, "FunctionAdapter")
 
+    override val defaultConstructorMarker = symbolFinder.topLevelClass(BASE_JS_PACKAGE, "DefaultConstructorMarker")
+
     override fun functionN(n: Int): IrClassSymbol {
         return stageController.withInitialIr { super.functionN(n) }
     }

compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmSyntheticAccessorGenerator.kt

@@ -17,6 +17,8 @@ import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
 import org.jetbrains.kotlin.ir.builders.declarations.addValueParameter
 import org.jetbrains.kotlin.ir.builders.declarations.buildConstructor
 import org.jetbrains.kotlin.ir.declarations.*
+import org.jetbrains.kotlin.ir.expressions.IrConst
+import org.jetbrains.kotlin.ir.expressions.impl.IrConstImpl
 import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
 import org.jetbrains.kotlin.ir.types.defaultType
 import org.jetbrains.kotlin.ir.types.makeNullable
@@ -138,6 +140,9 @@ class JvmSyntheticAccessorGenerator(context: JvmBackendContext) :
         contributeFieldAccessorSuffix(field, superQualifierSymbol)
     }
 
+    override fun createAccessorMarkerArgument(): IrConst =
+        IrConstImpl.constNull(UNDEFINED_OFFSET, UNDEFINED_OFFSET, context.symbols.defaultConstructorMarker.defaultType.makeNullable())
+
     /**
      * For both _reading_ and _writing_ field accessors, the suffix that includes some of [field]'s important properties.
      */

compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/Ir.kt

@@ -69,6 +69,7 @@ private object ClassIds {
     val kTypeProjectionList = "KTypeProjectionList".internalClassId
     val nativePtr = "NativePtr".internalClassId
     val functionAdapter = "FunctionAdapter".internalClassId
+    val defaultConstructorMarker = "DefaultConstructorMarker".internalClassId
 
     // Interop classes
     private val String.interopClassId get() = ClassId(InteropFqNames.packageName, Name.identifier(this))
@@ -620,6 +621,8 @@ class KonanSymbols(
 
     override val functionAdapter = ClassIds.functionAdapter.classSymbol()
 
+    override val defaultConstructorMarker = ClassIds.defaultConstructorMarker.classSymbol()
+
     val kFunctionImpl = ClassIds.kFunctionImpl.classSymbol()
     val kFunctionDescription = ClassIds.kFunctionDescription.classSymbol()
     val kFunctionDescriptionCorrect = ClassIds.kFunctionDescriptionCorrect.classSymbol()

compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/WasmSymbols.kt

@@ -131,6 +131,8 @@ class WasmSymbols(
 
     override val functionAdapter = getInternalWasmClass("FunctionAdapter")
 
+    override val defaultConstructorMarker: IrClassSymbol = getInternalWasmClass("DefaultConstructorMarker")
+
     val wasmUnreachable = getInternalWasmFunction("wasm_unreachable")
 
     val voidClass = getIrClass(FqName("kotlin.wasm.internal.Void"))

compiler/tests-common-new/testFixtures/org/jetbrains/kotlin/test/backend/ir/IrPreSerializationSymbolValidationHandler.kt

@@ -28,9 +28,6 @@ import kotlin.reflect.KVisibility
 abstract class IrPreSerializationSymbolValidationHandler(testServices: TestServices) : AbstractIrHandler(testServices) {
     companion object {
         private val preSerializationAnnotation = FqName.fromSegments(listOf("kotlin", "internal", "UsedFromCompilerGeneratedCode"))
-        // TODO drop after KT-80226 is fixed. We should use a new marker here.
-        //  Also `DefaultConstructorMarker` should be moved to the backend symbols.
-        private val excludeList = listOf("DefaultConstructorMarker")
     }
 
     abstract fun getSymbols(irBuiltIns: IrBuiltIns): PreSerializationSymbols
@@ -71,7 +68,6 @@ abstract class IrPreSerializationSymbolValidationHandler(testServices: TestServi
     }
 
     private fun validateVisibility(declaration: IrDeclarationWithVisibility, symbolsClass: KClass<out PreSerializationSymbols>) {
-        if (declaration is IrDeclarationWithName && declaration.name.asString() in excludeList) return
         if (declaration.visibility == DescriptorVisibilities.INTERNAL) {
             require(declaration.isPublishedApi()) {
                 "Internal API loaded from ${symbolsClass.qualifiedName} must have '@PublishedApi' annotation: ${declaration.render()}"