From cc346aef64945012ab584e794e42454da03afe43 Mon Sep 17 00:00:00 2001
From: Mikhael Bogdanov <mikhael.bogdanov@jetbrains.com>
Date: Tue, 23 Jan 2018 14:03:51 +0100
Subject: [PATCH] Support @JvmStatic for interface companion objects in backend

---
 .../AccessorForFunctionDescriptor.java        |  2 +-
 .../AccessorForPropertyDescriptor.java        |  2 +-
 .../org/jetbrains/kotlin/codegen/AsmUtil.java |  3 +--
 .../kotlin/codegen/CallReceiver.java          |  2 +-
 .../kotlin/codegen/ExpressionCodegen.java     |  2 +-
 .../kotlin/codegen/MemberCodegen.java         |  2 +-
 .../jetbrains/kotlin/codegen/StackValue.java  |  2 +-
 .../jetbrains/kotlin/codegen/codegenUtil.kt   |  4 +--
 .../codegen/state/KotlinTypeMapper.java       |  2 +-
 .../testData/codegen/box/jvmStatic/kt6301.kt  | 27 +++++++++++++++++++
 .../codegen/box/jvmStatic/kt6301_2.kt         | 27 +++++++++++++++++++
 .../ir/IrBlackBoxCodegenTestGenerated.java    | 12 +++++++++
 .../codegen/BlackBoxCodegenTestGenerated.java | 12 +++++++++
 .../LightAnalysisModeTestGenerated.java       | 12 +++++++++
 14 files changed, 100 insertions(+), 11 deletions(-)
 create mode 100644 compiler/testData/codegen/box/jvmStatic/kt6301.kt
 create mode 100644 compiler/testData/codegen/box/jvmStatic/kt6301_2.kt

diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForFunctionDescriptor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForFunctionDescriptor.java
index d10ac35b5e2..cfb88c1e7f5 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForFunctionDescriptor.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForFunctionDescriptor.java
@@ -45,7 +45,7 @@ public class AccessorForFunctionDescriptor extends AbstractAccessorForFunctionDe
         this.nameSuffix = nameSuffix;
 
         initialize(DescriptorUtils.getReceiverParameterType(descriptor.getExtensionReceiverParameter()),
-                   descriptor instanceof ConstructorDescriptor || CodegenUtilKt.isJvmStaticInObjectOrClass(descriptor)
+                   descriptor instanceof ConstructorDescriptor || CodegenUtilKt.isJvmStaticInObjectOrClassOrInterface(descriptor)
                         ? null
                         : descriptor.getDispatchReceiverParameter(),
                    copyTypeParameters(descriptor),
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForPropertyDescriptor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForPropertyDescriptor.java
index 1911ee71391..154f76e6b7a 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForPropertyDescriptor.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForPropertyDescriptor.java
@@ -47,7 +47,7 @@ public class AccessorForPropertyDescriptor extends PropertyDescriptorImpl implem
     ) {
         this(property, property.getType(), DescriptorUtils.getReceiverParameterType(property.getExtensionReceiverParameter()),
              /* dispatchReceiverParameter = */
-             CodegenUtilKt.isJvmStaticInObjectOrClass(property) ? null : property.getDispatchReceiverParameter(),
+             CodegenUtilKt.isJvmStaticInObjectOrClassOrInterface(property) ? null : property.getDispatchReceiverParameter(),
              containingDeclaration, superCallTarget, nameSuffix,
              getterAccessorRequired, setterAccessorRequired);
     }
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java
index f09e9ae8af2..7d9fd09d72f 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java
@@ -33,7 +33,6 @@ import org.jetbrains.kotlin.codegen.serialization.JvmStringTable;
 import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper;
 import org.jetbrains.kotlin.config.JvmTarget;
-import org.jetbrains.kotlin.config.LanguageVersionSettingsImpl;
 import org.jetbrains.kotlin.descriptors.*;
 import org.jetbrains.kotlin.lexer.KtTokens;
 import org.jetbrains.kotlin.load.java.JavaVisibilities;
@@ -194,7 +193,7 @@ public class AsmUtil {
     public static boolean isStaticMethod(OwnerKind kind, CallableMemberDescriptor functionDescriptor) {
         return isStaticKind(kind) ||
                KotlinTypeMapper.isStaticAccessor(functionDescriptor) ||
-               CodegenUtilKt.isJvmStaticInObjectOrClass(functionDescriptor);
+               CodegenUtilKt.isJvmStaticInObjectOrClassOrInterface(functionDescriptor);
     }
 
     public static boolean isStaticKind(OwnerKind kind) {
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/CallReceiver.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallReceiver.java
index ec46d15e72a..63efb709bae 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/CallReceiver.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallReceiver.java
@@ -92,7 +92,7 @@ public class CallReceiver extends StackValue {
 
         CallableDescriptor descriptor = resolvedCall.getResultingDescriptor();
 
-        if (CodegenUtilKt.isJvmStaticInObjectOrClass(descriptor)) {
+        if (CodegenUtilKt.isJvmStaticInObjectOrClassOrInterface(descriptor)) {
             return Type.VOID_TYPE;
         }
 
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
index 5e5e6b8d83d..80396eed99e 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
@@ -2631,7 +2631,7 @@ public class ExpressionCodegen extends KtVisitor<StackValue, StackValue> impleme
         }
 
         if (thisOrOuterClass.equals(context.getThisDescriptor()) &&
-            !CodegenUtilKt.isJvmStaticInObjectOrClass(context.getFunctionDescriptor())) {
+            !CodegenUtilKt.isJvmStaticInObjectOrClassOrInterface(context.getFunctionDescriptor())) {
             return StackValue.local(0, typeMapper.mapType(thisOrOuterClass));
         }
         else if (shouldGenerateSingletonAsThisOrOuterFromContext(thisOrOuterClass)) {
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
index 6f57bf7ab66..ec3e4e701f2 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
@@ -822,7 +822,7 @@ public abstract class MemberCodegen<T extends KtPureElement/* TODO: & KtDeclarat
                 ((AccessorForCallableDescriptor) accessorDescriptor).getSuperCallTarget() != null
         );
 
-        boolean isJvmStaticInObjectOrClass = CodegenUtilKt.isJvmStaticInObjectOrClass(functionDescriptor);
+        boolean isJvmStaticInObjectOrClass = CodegenUtilKt.isJvmStaticInObjectOrClassOrInterface(functionDescriptor);
         boolean hasDispatchReceiver = !isStaticDeclaration(functionDescriptor) &&
                                       !isNonDefaultInterfaceMember(functionDescriptor, state) &&
                                       !isJvmStaticInObjectOrClass;
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java
index 2d04a1d72a5..3235f1d8056 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java
@@ -593,7 +593,7 @@ public abstract class StackValue {
     }
 
     private static StackValue platformStaticCallIfPresent(@NotNull StackValue resultReceiver, @NotNull CallableDescriptor descriptor) {
-        if (CodegenUtilKt.isJvmStaticInObjectOrClass(descriptor)) {
+        if (CodegenUtilKt.isJvmStaticInObjectOrClassOrInterface(descriptor)) {
             if (resultReceiver.canHaveSideEffects()) {
                 return coercion(resultReceiver, Type.VOID_TYPE);
             }
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/codegenUtil.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/codegenUtil.kt
index 48448394eb0..e252bd13b5b 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/codegenUtil.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/codegenUtil.kt
@@ -253,12 +253,12 @@ fun reportTarget6InheritanceErrorIfNeeded(
     }
 }
 
-fun CallableDescriptor.isJvmStaticInObjectOrClass(): Boolean =
+fun CallableDescriptor.isJvmStaticInObjectOrClassOrInterface(): Boolean =
         isJvmStaticIn {
             DescriptorUtils.isNonCompanionObject(it) ||
             // This is necessary because for generation of @JvmStatic methods from companion of class A
             // we create a synthesized descriptor containing in class A
-            DescriptorUtils.isClassOrEnumClass(it)
+            DescriptorUtils.isClassOrEnumClass(it) || DescriptorUtils.isInterface(it)
         }
 
 fun CallableDescriptor.isJvmStaticInCompanionObject(): Boolean =
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.java
index 3eb497366f9..145f21e9bd2 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.java
@@ -742,7 +742,7 @@ public class KotlinTypeMapper {
                 boolean isStaticInvocation = (isStaticDeclaration(functionDescriptor) &&
                                               !(functionDescriptor instanceof ImportedFromObjectCallableDescriptor)) ||
                                              isStaticAccessor(functionDescriptor) ||
-                                             CodegenUtilKt.isJvmStaticInObjectOrClass(functionDescriptor);
+                                             CodegenUtilKt.isJvmStaticInObjectOrClassOrInterface(functionDescriptor);
                 if (isStaticInvocation) {
                     invokeOpcode = INVOKESTATIC;
                     isInterfaceMember = currentIsInterface && currentOwner instanceof JavaClassDescriptor;
diff --git a/compiler/testData/codegen/box/jvmStatic/kt6301.kt b/compiler/testData/codegen/box/jvmStatic/kt6301.kt
new file mode 100644
index 00000000000..369a40900fb
--- /dev/null
+++ b/compiler/testData/codegen/box/jvmStatic/kt6301.kt
@@ -0,0 +1,27 @@
+// !LANGUAGE: +JvmStaticInInterface
+// WITH_RUNTIME
+// TARGET_BACKEND: JVM
+// JVM_TARGET: 1.8
+// FILE: test.kt
+fun box(): String {
+    return Java.test()
+}
+
+interface Foo {
+
+    companion object {
+        @JvmStatic
+        fun foo() = "O"
+
+        @JvmStatic
+        var fooProp = ""
+    }
+}
+
+// FILE: Java.java
+public class Java {
+    public static String test() {
+        Foo.setFooProp("K");
+        return Foo.foo() + Foo.getFooProp();
+    }
+}
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/jvmStatic/kt6301_2.kt b/compiler/testData/codegen/box/jvmStatic/kt6301_2.kt
new file mode 100644
index 00000000000..935d16b2a26
--- /dev/null
+++ b/compiler/testData/codegen/box/jvmStatic/kt6301_2.kt
@@ -0,0 +1,27 @@
+// !LANGUAGE: +JvmStaticInInterface
+// WITH_RUNTIME
+// TARGET_BACKEND: JVM
+// JVM_TARGET: 1.8
+// FILE: test.kt
+fun box(): String {
+    return Java.test()
+}
+
+interface Foo {
+
+    companion object {
+        @JvmStatic
+        fun foo() = "O"
+
+
+        val fooProp = "K"
+            @JvmStatic get
+    }
+}
+
+// FILE: Java.java
+public class Java {
+    public static String test() {
+        return Foo.foo() + Foo.getFooProp();
+    }
+}
\ 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 d93ce6989c1..9cdcc3e4345 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
@@ -11415,6 +11415,18 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             doTest(fileName);
         }
 
+        @TestMetadata("kt6301.kt")
+        public void testKt6301() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmStatic/kt6301.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("kt6301_2.kt")
+        public void testKt6301_2() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmStatic/kt6301_2.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 86122fd113c..965b1ab88cd 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
@@ -11415,6 +11415,18 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             doTest(fileName);
         }
 
+        @TestMetadata("kt6301.kt")
+        public void testKt6301() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmStatic/kt6301.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("kt6301_2.kt")
+        public void testKt6301_2() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmStatic/kt6301_2.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 9dc1999de51..f42f817da2b 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
@@ -11415,6 +11415,18 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             doTest(fileName);
         }
 
+        @TestMetadata("kt6301.kt")
+        public void testKt6301() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmStatic/kt6301.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("kt6301_2.kt")
+        public void testKt6301_2() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmStatic/kt6301_2.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");