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

Rename field for property metadata cache to prevent problems in inline

Browse Source
This commit is contained in:
Alexander Udalov
2015-10-28 18:24:19 +03:00
parent 6e3eef2d6f
commit 894a97a549
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/propertyMetadataCache.kt
Vendored
+2 -2
View File
@@ -4,8 +4,8 @@ operator fun Any.getValue(x: Any?, y: Any): Any = null!!
class <!CONFLICTING_JVM_DECLARATIONS!>C<!> { class <!CONFLICTING_JVM_DECLARATIONS!>C<!> {
val x by 1 val x by 1
<!CONFLICTING_JVM_DECLARATIONS!>val `$delegatedProperties`: Array<PropertyMetadata><!> = null!! <!CONFLICTING_JVM_DECLARATIONS!>val `$$delegatedProperties`: Array<PropertyMetadata><!> = null!!
} }
val x by 1 val x by 1
<!CONFLICTING_JVM_DECLARATIONS!>val `$delegatedProperties`: Array<PropertyMetadata><!> = null!! <!CONFLICTING_JVM_DECLARATIONS!>val `$$delegatedProperties`: Array<PropertyMetadata><!> = null!!
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/propertyMetadataCache.txt
Vendored
+2 -2
View File
@@ -1,12 +1,12 @@
package package
public val `$delegatedProperties`: kotlin.Array<kotlin.PropertyMetadata> public val `$$delegatedProperties`: kotlin.Array<kotlin.PropertyMetadata>
public val x: kotlin.Any public val x: kotlin.Any
public operator fun kotlin.Any.getValue(/*0*/ x: kotlin.Any?, /*1*/ y: kotlin.Any): kotlin.Any public operator fun kotlin.Any.getValue(/*0*/ x: kotlin.Any?, /*1*/ y: kotlin.Any): kotlin.Any
public final class C { public final class C {
public constructor 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 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 equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAbi.java
+1 -1
View File
@@ -47,7 +47,7 @@ public final class JvmAbi {
private static final String SET_PREFIX = "set"; private static final String SET_PREFIX = "set";
public static final String DELEGATED_PROPERTY_NAME_SUFFIX = "$delegate"; 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 ANNOTATED_PROPERTY_METHOD_NAME_SUFFIX = "$annotations";
public static final String INSTANCE_FIELD = "INSTANCE"; public static final String INSTANCE_FIELD = "INSTANCE";