From d137594c7727b5a11dd3cfee686d1139bb6124cb Mon Sep 17 00:00:00 2001 From: Sergej Jaskiewicz Date: Fri, 2 Feb 2024 21:24:40 +0100 Subject: [PATCH] [JVM IR] Remove `JvmLoweredDeclarationOrigin.SYNTHETIC_MARKER_PARAMETER` There is already a similar origin `IrDeclarationOrigin.DEFAULT_CONSTRUCTOR_MARKER` --- .../jetbrains/kotlin/backend/jvm/codegen/FunctionCodegen.kt | 3 +-- .../kotlin/backend/jvm/CachedSyntheticDeclarations.kt | 2 +- .../kotlin/backend/jvm/JvmLoweredDeclarationOrigin.kt | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/FunctionCodegen.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/FunctionCodegen.kt index ad2e07b586b..6f072165d9e 100644 --- a/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/FunctionCodegen.kt +++ b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/FunctionCodegen.kt @@ -332,8 +332,7 @@ class FunctionCodegen(private val irFunction: IrFunction, private val classCodeg private fun IrValueParameter.isSyntheticMarkerParameter(): Boolean = - origin == IrDeclarationOrigin.DEFAULT_CONSTRUCTOR_MARKER || - origin == JvmLoweredDeclarationOrigin.SYNTHETIC_MARKER_PARAMETER + origin == IrDeclarationOrigin.DEFAULT_CONSTRUCTOR_MARKER private fun generateParameterNames(irFunction: IrFunction, mv: MethodVisitor, config: JvmBackendConfig) { irFunction.extensionReceiverParameter?.let { diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/CachedSyntheticDeclarations.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/CachedSyntheticDeclarations.kt index bb80cc9f163..4b3ea4c2d9d 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/CachedSyntheticDeclarations.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/CachedSyntheticDeclarations.kt @@ -171,7 +171,7 @@ class CachedSyntheticDeclarations(private val context: JvmBackendContext) { accessor.addValueParameter( "constructor_marker".synthesizedString, context.ir.symbols.defaultConstructorMarker.defaultType.makeNullable(), - JvmLoweredDeclarationOrigin.SYNTHETIC_MARKER_PARAMETER + IrDeclarationOrigin.DEFAULT_CONSTRUCTOR_MARKER, ) accessor.body = context.irFactory.createExpressionBody( diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmLoweredDeclarationOrigin.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmLoweredDeclarationOrigin.kt index 0d9d2fbbe82..9cf9f21e28d 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmLoweredDeclarationOrigin.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmLoweredDeclarationOrigin.kt @@ -15,7 +15,6 @@ object JvmLoweredDeclarationOrigin { val LAMBDA_IMPL by IrDeclarationOriginImpl val FUNCTION_REFERENCE_IMPL by IrDeclarationOriginImpl.Synthetic val SYNTHETIC_ACCESSOR_FOR_HIDDEN_CONSTRUCTOR by IrDeclarationOriginImpl.Synthetic - val SYNTHETIC_MARKER_PARAMETER by IrDeclarationOriginImpl.Synthetic val TO_ARRAY by IrDeclarationOriginImpl val JVM_STATIC_WRAPPER by IrDeclarationOriginImpl val JVM_OVERLOADS_WRAPPER by IrDeclarationOriginImpl