From 15ac471626f5275772eca84e0ca41190f9931898 Mon Sep 17 00:00:00 2001
From: Dmitry Petrov <dmitry.petrov@jetbrains.com>
Date: Mon, 13 Nov 2017 15:29:14 +0300
Subject: [PATCH] Treat accessors to JvmStatic methods as having no dispatch
 receiver

 #KT-21246 Fixed
---
 .../kotlin/codegen/MemberCodegen.java         |  7 +++++--
 .../codegen/TransformationMethodVisitor.java  |  2 +-
 .../testData/codegen/box/jvmStatic/kt21246.kt | 20 +++++++++++++++++++
 .../codegen/box/jvmStatic/kt21246a.kt         | 15 ++++++++++++++
 .../ir/IrBlackBoxCodegenTestGenerated.java    | 12 +++++++++++
 .../codegen/BlackBoxCodegenTestGenerated.java | 12 +++++++++++
 .../LightAnalysisModeTestGenerated.java       | 12 +++++++++++
 7 files changed, 77 insertions(+), 3 deletions(-)
 create mode 100644 compiler/testData/codegen/box/jvmStatic/kt21246.kt
 create mode 100644 compiler/testData/codegen/box/jvmStatic/kt21246a.kt

diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
index 25b92ce0b9a..3348073079e 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
@@ -812,7 +812,10 @@ public abstract class MemberCodegen<T extends KtPureElement/* TODO: & KtDeclarat
                 ((AccessorForCallableDescriptor) accessorDescriptor).getSuperCallTarget() != null
         );
 
-        boolean hasDispatchReceiver = !isStaticDeclaration(functionDescriptor) && !isNonDefaultInterfaceMember(functionDescriptor, state);
+        boolean isJvmStaticInObjectOrClass = CodegenUtilKt.isJvmStaticInObjectOrClass(functionDescriptor);
+        boolean hasDispatchReceiver = !isStaticDeclaration(functionDescriptor) &&
+                                      !isNonDefaultInterfaceMember(functionDescriptor, state) &&
+                                      !isJvmStaticInObjectOrClass;
         boolean accessorIsConstructor = accessorDescriptor instanceof AccessorForConstructorDescriptor;
 
         int accessorParam = (hasDispatchReceiver && !accessorIsConstructor) ? 1 : 0;
@@ -824,7 +827,7 @@ public abstract class MemberCodegen<T extends KtPureElement/* TODO: & KtDeclarat
             accessorParam = 0;
         }
         else if (KotlinTypeMapper.isAccessor(accessorDescriptor) && (hasDispatchReceiver || accessorIsConstructor)) {
-            if (!CodegenUtilKt.isJvmStaticInObjectOrClass(functionDescriptor)) {
+            if (!isJvmStaticInObjectOrClass) {
                 iv.load(0, OBJECT_TYPE);
             }
         }
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/TransformationMethodVisitor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/TransformationMethodVisitor.java
index d43e840c9a5..e05307aeac0 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/TransformationMethodVisitor.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/TransformationMethodVisitor.java
@@ -85,7 +85,7 @@ public abstract class TransformationMethodVisitor extends MethodVisitor {
             delegate.visitEnd();
         }
         catch (Throwable t) {
-            throw new CompilationException("Couldn't transform method node: " + getNodeText(methodNode), t, null);
+            throw new CompilationException("Couldn't transform method node:\n" + getNodeText(methodNode), t, null);
         }
     }
 
diff --git a/compiler/testData/codegen/box/jvmStatic/kt21246.kt b/compiler/testData/codegen/box/jvmStatic/kt21246.kt
new file mode 100644
index 00000000000..7c8504f9904
--- /dev/null
+++ b/compiler/testData/codegen/box/jvmStatic/kt21246.kt
@@ -0,0 +1,20 @@
+// WITH_RUNTIME
+// TARGET_BACKEND: JVM
+
+object Test {
+
+    @JvmStatic
+    fun test() = action { createWildcard("OK") }.x
+
+    @JvmStatic
+    private fun createWildcard(s: String): Type<*>? {
+        return Type<Any>(s)
+    }
+
+    inline fun action(crossinline f: () -> Type<*>?) = f()!!
+
+    class Type<T>(val x: String)
+
+}
+
+fun box() = Test.test()
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/jvmStatic/kt21246a.kt b/compiler/testData/codegen/box/jvmStatic/kt21246a.kt
new file mode 100644
index 00000000000..2c188e8dfd3
--- /dev/null
+++ b/compiler/testData/codegen/box/jvmStatic/kt21246a.kt
@@ -0,0 +1,15 @@
+// WITH_RUNTIME
+// TARGET_BACKEND: JVM
+
+object Test {
+
+    fun test() = { createWildcard("OK") }()
+
+    @JvmStatic
+    private fun createWildcard(s: String) = Type<Any>(s).x
+
+    class Type<T>(val x: String)
+
+}
+
+fun box() = Test.test()
\ No newline at end of file
diff --git a/compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java b/compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
index c5d8bd20ea2..d8c53845cda 100644
--- a/compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
+++ b/compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
@@ -11081,6 +11081,18 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             doTest(fileName);
         }
 
+        @TestMetadata("kt21246.kt")
+        public void testKt21246() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmStatic/kt21246.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("kt21246a.kt")
+        public void testKt21246a() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmStatic/kt21246a.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("kt9897_static.kt")
         public void testKt9897_static() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmStatic/kt9897_static.kt");
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
index c825a58398f..a512540dc79 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
@@ -11081,6 +11081,18 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             doTest(fileName);
         }
 
+        @TestMetadata("kt21246.kt")
+        public void testKt21246() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmStatic/kt21246.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("kt21246a.kt")
+        public void testKt21246a() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmStatic/kt21246a.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("kt9897_static.kt")
         public void testKt9897_static() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmStatic/kt9897_static.kt");
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
index f7e7a82a392..ac76b04203f 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
@@ -11081,6 +11081,18 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             doTest(fileName);
         }
 
+        @TestMetadata("kt21246.kt")
+        public void testKt21246() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmStatic/kt21246.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("kt21246a.kt")
+        public void testKt21246a() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmStatic/kt21246a.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("kt9897_static.kt")
         public void testKt9897_static() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmStatic/kt9897_static.kt");