diff --git a/compiler/testData/codegen/bytecodeText/constValsGetterDeprecated.kt b/compiler/testData/codegen/bytecodeText/constValsGetterDeprecated.kt index 6cec9c25f90..7a0d0c64a4c 100644 --- a/compiler/testData/codegen/bytecodeText/constValsGetterDeprecated.kt +++ b/compiler/testData/codegen/bytecodeText/constValsGetterDeprecated.kt @@ -14,6 +14,7 @@ class B { One DEPRECATED is for _DefaultPackage One is for _DefaultPackage.getCONST_VAL 3 others are for getCONST_VAL + One more for INSTANCE$ temporarily */ // 6 DEPRECATED \ No newline at end of file diff --git a/compiler/testData/codegen/bytecodeText/staticFields/object.kt b/compiler/testData/codegen/bytecodeText/staticFields/object.kt index 5c538220d21..0571aba0ada 100644 --- a/compiler/testData/codegen/bytecodeText/staticFields/object.kt +++ b/compiler/testData/codegen/bytecodeText/staticFields/object.kt @@ -2,5 +2,6 @@ object A { val r: Int = 1 } // Field initialized in constant pool -// A super constructor call, INSTANCE and INSTANCE$ put +// A super constructor call and INSTANCE put +// One more for INSTANCE$ put (temporarily) // 3 ALOAD 0 \ No newline at end of file diff --git a/compiler/testData/compileJavaAgainstKotlin/class/ClassObject.java b/compiler/testData/compileJavaAgainstKotlin/class/ClassObject.java index 7e6cac467b8..5273329bed8 100644 --- a/compiler/testData/compileJavaAgainstKotlin/class/ClassObject.java +++ b/compiler/testData/compileJavaAgainstKotlin/class/ClassObject.java @@ -12,8 +12,8 @@ class ClassObject { } void accessToPackageObject() { - PackageInner.INSTANCE$.foo(); - PackageInner.INSTANCE$.getValue(); + PackageInner.INSTANCE.foo(); + PackageInner.INSTANCE.getValue(); } void accessToInnerClass() { diff --git a/compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleObjectProperty.java b/compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleObjectProperty.java index ff4db0c85f2..5e416bba594 100644 --- a/compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleObjectProperty.java +++ b/compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleObjectProperty.java @@ -4,7 +4,7 @@ class Test { public static void main(String[] args) { A.getB(); - A.getC(A.INSTANCE$); + A.getC(A.INSTANCE); } } diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.kt index 01d7a092bca..fe4571bf8d3 100644 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.kt +++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.kt @@ -1,3 +1,3 @@ object O { - val `INSTANCE$`: O = null!! + val `INSTANCE`: O = null!! } \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.txt index 796f8600ccc..b65a258f35a 100644 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.txt +++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.txt @@ -2,7 +2,7 @@ package public object O { private constructor O() - public final val `INSTANCE$`: O + public final val INSTANCE: O 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 toString(): kotlin.String