From 894a97a5490af06d41cabba3a355a996d844d4b3 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Wed, 28 Oct 2015 18:24:19 +0300
Subject: [PATCH] Rename field for property metadata cache to prevent problems
 in inline

---
 .../specialNames/propertyMetadataCache.kt                     | 4 ++--
 .../specialNames/propertyMetadataCache.txt                    | 4 ++--
 .../src/org/jetbrains/kotlin/load/java/JvmAbi.java            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

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 <!CONFLICTING_JVM_DECLARATIONS!>C<!> {
     val x by 1
-    <!CONFLICTING_JVM_DECLARATIONS!>val `$delegatedProperties`: Array<PropertyMetadata><!> = null!!
+    <!CONFLICTING_JVM_DECLARATIONS!>val `$$delegatedProperties`: Array<PropertyMetadata><!> = null!!
 }
 
 val x by 1
-<!CONFLICTING_JVM_DECLARATIONS!>val `$delegatedProperties`: Array<PropertyMetadata><!> = null!!
\ No newline at end of file
+<!CONFLICTING_JVM_DECLARATIONS!>val `$$delegatedProperties`: Array<PropertyMetadata><!> = 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<kotlin.PropertyMetadata>
+public val `$$delegatedProperties`: kotlin.Array<kotlin.PropertyMetadata>
 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<kotlin.PropertyMetadata>
+    public final val `$$delegatedProperties`: kotlin.Array<kotlin.PropertyMetadata>
     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";