From 6a3be0d8ac2fbd7efe84445cc55a9cfe6385ec71 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Fri, 17 Jun 2022 12:26:40 +0200
Subject: [PATCH] Add test for KT-52338 (fixed together with KT-49507)

---
 .../FirBlackBoxCodegenTestGenerated.java       |  6 ++++++
 .../javaFieldAndCompanionProperty.kt           | 18 ++++++++++++++++++
 .../IrBlackBoxCodegenTestGenerated.java        |  6 ++++++
 3 files changed, 30 insertions(+)
 create mode 100644 compiler/testData/codegen/box/fieldRename/javaFieldAndCompanionProperty.kt

diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java
index ec007e0570a..1fd3765ad72 100644
--- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java
+++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java
@@ -17347,6 +17347,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
             runTest("compiler/testData/codegen/box/fieldRename/genericPropertyWithItself.kt");
         }
 
+        @Test
+        @TestMetadata("javaFieldAndCompanionProperty.kt")
+        public void testJavaFieldAndCompanionProperty() throws Exception {
+            runTest("compiler/testData/codegen/box/fieldRename/javaFieldAndCompanionProperty.kt");
+        }
+
         @Test
         @TestMetadata("javaFieldAndKotlinProperty.kt")
         public void testJavaFieldAndKotlinProperty() throws Exception {
diff --git a/compiler/testData/codegen/box/fieldRename/javaFieldAndCompanionProperty.kt b/compiler/testData/codegen/box/fieldRename/javaFieldAndCompanionProperty.kt
new file mode 100644
index 00000000000..92e95b0bb62
--- /dev/null
+++ b/compiler/testData/codegen/box/fieldRename/javaFieldAndCompanionProperty.kt
@@ -0,0 +1,18 @@
+// TARGET_BACKEND: JVM_IR
+
+// FILE: Base.java
+public class Base {
+    protected String TAG = "OK";
+}
+
+// FILE: Sub.kt
+
+class Sub : Base() {
+    companion object {
+        val TAG = "FAIL"
+    }
+
+    fun log() = TAG
+}
+
+fun box() = Sub().log()
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
index fe3995a7c1b..e5d6fba6450 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
@@ -17347,6 +17347,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/fieldRename/genericPropertyWithItself.kt");
         }
 
+        @Test
+        @TestMetadata("javaFieldAndCompanionProperty.kt")
+        public void testJavaFieldAndCompanionProperty() throws Exception {
+            runTest("compiler/testData/codegen/box/fieldRename/javaFieldAndCompanionProperty.kt");
+        }
+
         @Test
         @TestMetadata("javaFieldAndKotlinProperty.kt")
         public void testJavaFieldAndKotlinProperty() throws Exception {