From 5f38c1d5717fa584576cad1e3e2687e1fade2a5a Mon Sep 17 00:00:00 2001
From: Michael Bogdanov <mikhael.bogdanov@jetbrains.com>
Date: Mon, 1 Feb 2016 14:04:24 +0300
Subject: [PATCH] Fix for KT-10729: Accessing private const field in companion
 object from a function in the same companion generates run-time error

---
 .../kotlin/codegen/ExpressionCodegen.java     |  2 +-
 .../kotlin/codegen/MemberCodegen.java         |  7 ++++---
 .../box/properties/companionPrivateField.kt   | 10 ++++++++++
 .../companionPrivateFieldInsideLambda.kt      | 10 ++++++++++
 .../codegen/box/properties/kt10729.kt         | 20 +++++++++++++++++++
 .../boxInline/private/accessorForConst.1.kt   |  5 +++++
 .../boxInline/private/accessorForConst.2.kt   | 14 +++++++++++++
 .../BlackBoxCodegenTestGenerated.java         | 18 +++++++++++++++++
 .../BlackBoxInlineCodegenTestGenerated.java   |  6 ++++++
 ...otlinAgainstInlineKotlinTestGenerated.java |  6 ++++++
 10 files changed, 94 insertions(+), 4 deletions(-)
 create mode 100644 compiler/testData/codegen/box/properties/companionPrivateField.kt
 create mode 100644 compiler/testData/codegen/box/properties/companionPrivateFieldInsideLambda.kt
 create mode 100644 compiler/testData/codegen/box/properties/kt10729.kt
 create mode 100644 compiler/testData/codegen/boxInline/private/accessorForConst.1.kt
 create mode 100644 compiler/testData/codegen/boxInline/private/accessorForConst.2.kt

diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
index cddaf7f20bc..b780585cc26 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
@@ -2119,7 +2119,7 @@ public class ExpressionCodegen extends KtVisitor<StackValue, StackValue> impleme
 
         FieldAccessorKind fieldAccessorKind = FieldAccessorKind.NORMAL;
         boolean isBackingFieldInClassCompanion = JvmAbi.isPropertyWithBackingFieldInOuterClass(propertyDescriptor);
-        if (isBackingFieldInClassCompanion && forceField) {
+        if (isBackingFieldInClassCompanion && (forceField || propertyDescriptor.isConst() && Visibilities.isPrivate(propertyDescriptor.getVisibility()))) {
             fieldAccessorKind = FieldAccessorKind.IN_CLASS_COMPANION;
         }
         else if (syntheticBackingField && context.getFirstCrossInlineOrNonInlineContext().getParentContext().getContextDescriptor() != containingDeclaration) {
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
index aff0d7f4ca3..6ff9d9758f1 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
@@ -601,12 +601,13 @@ public abstract class MemberCodegen<T extends KtElement/* TODO: & JetDeclaration
                 @Override
                 public void doGenerateBody(@NotNull ExpressionCodegen codegen, @NotNull JvmMethodSignature signature) {
                     boolean syntheticBackingField = accessor instanceof AccessorForPropertyBackingFieldFromLocal;
-                    boolean forceField = (JvmAbi.isPropertyWithBackingFieldInOuterClass(original) &&
-                                          !isCompanionObject(accessor.getContainingDeclaration())) ||
+                    boolean forceFieldForCompanionProperty = JvmAbi.isPropertyWithBackingFieldInOuterClass(original) &&
+                                                             !isCompanionObject(accessor.getContainingDeclaration());
+                    boolean forceField = forceFieldForCompanionProperty ||
                                          syntheticBackingField ||
                                          original.getVisibility() == JavaVisibilities.PROTECTED_STATIC_VISIBILITY;
                     StackValue property = codegen.intermediateValueForProperty(
-                            original, forceField, syntheticBackingField, accessor.getSuperCallTarget(), true, StackValue.none()
+                            original, forceField, syntheticBackingField, accessor.getSuperCallTarget(), forceFieldForCompanionProperty, StackValue.none()
                     );
 
                     InstructionAdapter iv = codegen.v;
diff --git a/compiler/testData/codegen/box/properties/companionPrivateField.kt b/compiler/testData/codegen/box/properties/companionPrivateField.kt
new file mode 100644
index 00000000000..7a4b94e7aaa
--- /dev/null
+++ b/compiler/testData/codegen/box/properties/companionPrivateField.kt
@@ -0,0 +1,10 @@
+class My {
+    companion object {
+        private val my: String = "O"
+            get() = field + "K"
+
+        fun getValue() = my
+    }
+}
+
+fun box() = My.getValue()
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/properties/companionPrivateFieldInsideLambda.kt b/compiler/testData/codegen/box/properties/companionPrivateFieldInsideLambda.kt
new file mode 100644
index 00000000000..7219fcd4d3d
--- /dev/null
+++ b/compiler/testData/codegen/box/properties/companionPrivateFieldInsideLambda.kt
@@ -0,0 +1,10 @@
+class My {
+    companion object {
+        private val my: String = "O"
+            get() = { field }() + "K"
+
+        fun getValue() = my
+    }
+}
+
+fun box() = My.getValue()
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/properties/kt10729.kt b/compiler/testData/codegen/box/properties/kt10729.kt
new file mode 100644
index 00000000000..9b0db522f25
--- /dev/null
+++ b/compiler/testData/codegen/box/properties/kt10729.kt
@@ -0,0 +1,20 @@
+class IntentionsBundle {
+    companion object {
+        fun message(key: String): String {
+            return key + BUNDLE
+        }
+
+        fun message2(key: String): String {
+            return { key + BUNDLE }()
+        }
+
+        private const val BUNDLE = "K"
+    }
+}
+
+
+fun box(): String {
+    if (IntentionsBundle.message("O") != "OK") return "fail 1: ${IntentionsBundle.message("O")}"
+
+    return IntentionsBundle.message2("O")
+}
\ No newline at end of file
diff --git a/compiler/testData/codegen/boxInline/private/accessorForConst.1.kt b/compiler/testData/codegen/boxInline/private/accessorForConst.1.kt
new file mode 100644
index 00000000000..685111591d3
--- /dev/null
+++ b/compiler/testData/codegen/boxInline/private/accessorForConst.1.kt
@@ -0,0 +1,5 @@
+import test.*
+
+fun box(): String {
+    return IntentionsBundle.message()
+}
\ No newline at end of file
diff --git a/compiler/testData/codegen/boxInline/private/accessorForConst.2.kt b/compiler/testData/codegen/boxInline/private/accessorForConst.2.kt
new file mode 100644
index 00000000000..2664b118f7e
--- /dev/null
+++ b/compiler/testData/codegen/boxInline/private/accessorForConst.2.kt
@@ -0,0 +1,14 @@
+package test
+
+class IntentionsBundle {
+    companion object {
+        internal inline fun message(): String {
+            return KEY + BUNDLE
+        }
+
+        private const val BUNDLE = "K"
+        protected const val KEY = "O"
+    }
+}
+
+
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java
index e01b2e5bc67..feff112f481 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java
@@ -6607,6 +6607,18 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             doTest(fileName);
         }
 
+        @TestMetadata("companionPrivateField.kt")
+        public void testCompanionPrivateField() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/companionPrivateField.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("companionPrivateFieldInsideLambda.kt")
+        public void testCompanionPrivateFieldInsideLambda() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/companionPrivateFieldInsideLambda.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("field.kt")
         public void testField() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/field.kt");
@@ -6655,6 +6667,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             doTest(fileName);
         }
 
+        @TestMetadata("kt10729.kt")
+        public void testKt10729() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt10729.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("kt1159.kt")
         public void testKt1159() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt1159.kt");
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxInlineCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxInlineCodegenTestGenerated.java
index 242e2061f2a..f16bce70cae 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxInlineCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxInlineCodegenTestGenerated.java
@@ -1308,6 +1308,12 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Private extends AbstractBlackBoxInlineCodegenTest {
+        @TestMetadata("accessorForConst.1.kt")
+        public void testAccessorForConst() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/private/accessorForConst.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
+        }
+
         @TestMetadata("accessorStability.1.kt")
         public void testAccessorStability() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/private/accessorStability.1.kt");
diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstInlineKotlinTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstInlineKotlinTestGenerated.java
index 504ebdeb56e..c649bb49619 100644
--- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstInlineKotlinTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstInlineKotlinTestGenerated.java
@@ -1308,6 +1308,12 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Private extends AbstractCompileKotlinAgainstInlineKotlinTest {
+        @TestMetadata("accessorForConst.1.kt")
+        public void testAccessorForConst() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/private/accessorForConst.1.kt");
+            doBoxTestWithInlineCheck(fileName);
+        }
+
         @TestMetadata("accessorStability.1.kt")
         public void testAccessorStability() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/private/accessorStability.1.kt");