diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/propertyMetadataCache.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/propertyMetadataCache.kt index 8017128dfdd..0f3bf488777 100644 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/propertyMetadataCache.kt +++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/propertyMetadataCache.kt @@ -4,8 +4,8 @@ operator fun Any.getValue(x: Any?, y: Any): Any = null!! class C { val x by 1 - val `$delegatedProperties`: Array = null!! + val `$$delegatedProperties`: Array = null!! } val x by 1 -val `$delegatedProperties`: Array = null!! \ No newline at end of file +val `$$delegatedProperties`: Array = null!! \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/propertyMetadataCache.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/propertyMetadataCache.txt index a0ae7c7c4d8..f126aedfa6e 100644 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/propertyMetadataCache.txt +++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/propertyMetadataCache.txt @@ -1,12 +1,12 @@ package -public val `$delegatedProperties`: kotlin.Array +public val `$$delegatedProperties`: kotlin.Array public val x: kotlin.Any public operator fun kotlin.Any.getValue(/*0*/ x: kotlin.Any?, /*1*/ y: kotlin.Any): kotlin.Any public final class C { public constructor C() - public final val `$delegatedProperties`: kotlin.Array + public final val `$$delegatedProperties`: kotlin.Array public final val x: kotlin.Any public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAbi.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAbi.java index 2f9bff4b667..df4248763c3 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAbi.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAbi.java @@ -47,7 +47,7 @@ public final class JvmAbi { private static final String SET_PREFIX = "set"; public static final String DELEGATED_PROPERTY_NAME_SUFFIX = "$delegate"; - public static final String DELEGATED_PROPERTIES_ARRAY_NAME = "$delegatedProperties"; + public static final String DELEGATED_PROPERTIES_ARRAY_NAME = "$$delegatedProperties"; public static final String ANNOTATED_PROPERTY_METHOD_NAME_SUFFIX = "$annotations"; public static final String INSTANCE_FIELD = "INSTANCE";