Calls to non-@JvmStatic protected members of companion objects from subclasses are now errors (unsupported yet)

2015-11-25 20:21:31 +03:00
parent e39ca63bcc
commit ea4f167091
11 changed files with 269 additions and 2 deletions
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.resolve.jvm.checkers
+
+import org.jetbrains.kotlin.descriptors.CallableDescriptor
+import org.jetbrains.kotlin.descriptors.ClassDescriptor
+import org.jetbrains.kotlin.descriptors.Visibilities
+import org.jetbrains.kotlin.resolve.DescriptorUtils
+import org.jetbrains.kotlin.resolve.annotations.hasJvmStaticAnnotation
+import org.jetbrains.kotlin.resolve.calls.checkers.CallChecker
+import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext
+import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
+import org.jetbrains.kotlin.resolve.descriptorUtil.parentsWithSelf
+import org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm
+
+class ProtectedInSuperClassCompanionCallChecker : CallChecker {
+
+    override fun <F : CallableDescriptor> check(resolvedCall: ResolvedCall<F>, context: BasicCallResolutionContext) {
+        val targetDescriptor = resolvedCall.resultingDescriptor.original
+        // Protected non-JVM static
+        if (targetDescriptor.visibility != Visibilities.PROTECTED) return
+        if (targetDescriptor.hasJvmStaticAnnotation()) return
+        val containerDescriptor = targetDescriptor.containingDeclaration
+        // Declared in companion object
+        if (containerDescriptor is ClassDescriptor && containerDescriptor.isCompanionObject) {
+            val companionDescriptor = containerDescriptor
+            val companionOwnerDescriptor = companionDescriptor.containingDeclaration as? ClassDescriptor ?: return
+            val parentClassDescriptors = context.scope.ownerDescriptor.parentsWithSelf.filterIsInstance<ClassDescriptor>()
+            // Called from within a derived class
+            if (!parentClassDescriptors.any { DescriptorUtils.isSubclass(it, companionOwnerDescriptor) }) return
+            // Called not within the same companion object or its owner class
+            if (companionDescriptor !in parentClassDescriptors && companionOwnerDescriptor !in parentClassDescriptors) {
+                context.trace.report(ErrorsJvm.SUBCLASS_CANT_CALL_COMPANION_PROTECTED_NON_STATIC.on(resolvedCall.call.callElement));
+            }
+        }
+    }
+}
@@ -81,6 +81,7 @@ public class DefaultErrorMessagesJvm implements DefaultErrorMessages.Extension {
                "Expected type does not accept nulls in {0}, but the value may be null in {1}", Renderers.TO_STRING, Renderers.TO_STRING);

        MAP.put(ErrorsJvm.INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER, "Interfaces can't call Java default methods via super");
+        MAP.put(ErrorsJvm.SUBCLASS_CANT_CALL_COMPANION_PROTECTED_NON_STATIC, "Using non-JVM static members protected in the superclass companion is unsupported yet");

        MAP.put(ErrorsJvm.WHEN_ENUM_CAN_BE_NULL_IN_JAVA, "Enum argument can be null in Java, but exhaustive when contains no null branch");

@@ -68,6 +68,7 @@ public interface ErrorsJvm {
    DiagnosticFactory1<KtAnnotationEntry, FqName> ANNOTATION_IS_NOT_APPLICABLE_TO_MULTIFILE_CLASSES = DiagnosticFactory1.create(ERROR);

    DiagnosticFactory0<KtElement> INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER = DiagnosticFactory0.create(ERROR);
+    DiagnosticFactory0<KtElement> SUBCLASS_CANT_CALL_COMPANION_PROTECTED_NON_STATIC = DiagnosticFactory0.create(ERROR);

    DiagnosticFactory0<KtElement> NO_REFLECTION_IN_CLASS_PATH = DiagnosticFactory0.create(WARNING);

@@ -46,7 +46,8 @@ public object JvmPlatformConfigurator : PlatformConfigurator(
                NeedSyntheticChecker(),
                JavaAnnotationCallChecker(),
                TraitDefaultMethodCallChecker(),
-                JavaClassOnCompanionChecker()
+                JavaClassOnCompanionChecker(),
+                ProtectedInSuperClassCompanionCallChecker()
        ),

        additionalTypeCheckers = listOf(
@@ -0,0 +1,11 @@
+open class A {
+    protected fun foo() = "OK"
+}
+
+class B {
+    companion object : A()
+
+    fun bar() = foo()
+}
+
+fun box() = B().bar()
@@ -0,0 +1,10 @@
+open class A {
+    companion object {
+        protected fun foo() = "OK"
+    }
+    class B : A() {
+        fun bar() = foo()
+    }
+}
+
+fun box() = A.B().bar()
@@ -28,6 +28,6 @@ class B: A() {
        devNull(A.internal_val)
        devNull(A.public_val)
        devNull(A.<!INVISIBLE_MEMBER!>private_val<!>)
-        devNull(A.protected_val)
+        devNull(A.<!SUBCLASS_CANT_CALL_COMPANION_PROTECTED_NON_STATIC!>protected_val<!>)
    }
 }
@@ -0,0 +1,87 @@
+open class VeryBase {
+    protected fun baz() {}
+}
+
+open class Base {
+    protected fun foo() { 
+        bar() // Ok
+        baz() // Ok
+    }
+
+    inner class Inner {
+        fun fromInner() {
+            foo() // Ok
+            bar() // Ok
+            gav() // Ok
+            baz() // Ok
+        }
+    }
+
+    class NestedDerived : Base() {
+        fun fromNestedDerived() {
+            foo() // Ok
+            bar() // Ok
+            gav() // Ok
+            baz() // Ok
+        }
+    }
+    
+    companion object : VeryBase() {
+        protected fun bar() {}
+
+        @JvmStatic protected fun gav() {}       
+
+        class Nested {
+            fun fromNested() {
+                bar() // Ok
+                gav() // Ok
+            }
+        }
+    }
+}
+
+class Derived : Base() {
+    fun test() {
+        foo() // Ok
+        gav() // Ok
+        <!SUBCLASS_CANT_CALL_COMPANION_PROTECTED_NON_STATIC!>bar()<!>
+        <!SUBCLASS_CANT_CALL_COMPANION_PROTECTED_NON_STATIC!>baz()<!>
+    }
+
+    inner class DerivedInner {
+        fun fromDerivedInner() {
+            foo() // Ok
+            gav() // Ok
+            <!SUBCLASS_CANT_CALL_COMPANION_PROTECTED_NON_STATIC!>bar()<!>
+            <!SUBCLASS_CANT_CALL_COMPANION_PROTECTED_NON_STATIC!>baz()<!>
+        }
+    }
+
+    companion object {
+        fun test2() {
+            gav() // Ok
+            <!SUBCLASS_CANT_CALL_COMPANION_PROTECTED_NON_STATIC!>bar()<!>
+            <!SUBCLASS_CANT_CALL_COMPANION_PROTECTED_NON_STATIC!>baz()<!>
+        }
+    }
+}
+
+class Other {
+    fun test(base: Base, derived: Derived) {
+        base.<!INVISIBLE_MEMBER!>foo<!>()
+        base.<!UNRESOLVED_REFERENCE!>gav<!>()
+        base.<!UNRESOLVED_REFERENCE!>bar<!>()
+        derived.<!INVISIBLE_MEMBER!>foo<!>()
+        derived.<!UNRESOLVED_REFERENCE!>gav<!>()
+        derived.<!UNRESOLVED_REFERENCE!>bar<!>()
+    }
+}
+
+fun top(base: Base, derived: Derived) {
+    base.<!INVISIBLE_MEMBER!>foo<!>()
+    base.<!UNRESOLVED_REFERENCE!>bar<!>()
+    base.<!UNRESOLVED_REFERENCE!>gav<!>()
+    derived.<!INVISIBLE_MEMBER!>foo<!>()
+    derived.<!UNRESOLVED_REFERENCE!>bar<!>()
+    derived.<!UNRESOLVED_REFERENCE!>gav<!>()
+}
@@ -0,0 +1,87 @@
+package
+
+public fun top(/*0*/ base: Base, /*1*/ derived: Derived): kotlin.Unit
+
+public open class Base {
+    public constructor Base()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    protected final fun foo(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    public companion object Companion : VeryBase {
+        private constructor Companion()
+        protected final fun bar(): kotlin.Unit
+        protected final override /*1*/ /*fake_override*/ fun baz(): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        @kotlin.jvm.JvmStatic() protected final fun gav(): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+        public final class Nested {
+            public constructor Nested()
+            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public final fun fromNested(): kotlin.Unit
+            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+    }
+
+    public final inner class Inner {
+        public constructor Inner()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public final fun fromInner(): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+
+    public final class NestedDerived : Base {
+        public constructor NestedDerived()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        protected final override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit
+        public final fun fromNestedDerived(): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+}
+
+public final class Derived : Base {
+    public constructor Derived()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    protected final override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public final fun test(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    public companion object Companion {
+        private constructor Companion()
+        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 final fun test2(): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+
+    public final inner class DerivedInner {
+        public constructor DerivedInner()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public final fun fromDerivedInner(): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+}
+
+public final class Other {
+    public constructor Other()
+    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 final fun test(/*0*/ base: Base, /*1*/ derived: Derived): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public open class VeryBase {
+    public constructor VeryBase()
+    protected final fun baz(): kotlin.Unit
+    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
+}
@@ -35,6 +35,12 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW
        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib"), Pattern.compile("^(.+)\\.kt$"), true);
    }

+    @TestMetadata("CallCompanionProtectedNonStatic.kt")
+    public void testCallCompanionProtectedNonStatic() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/CallCompanionProtectedNonStatic.kt");
+        doTest(fileName);
+    }
+
    @TestMetadata("CallToMainRedeclaredInMultiFile.kt")
    public void testCallToMainRedeclaredInMultiFile() throws Exception {
        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/CallToMainRedeclaredInMultiFile.kt");
@@ -5545,6 +5545,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
            doTest(fileName);
        }

+        @TestMetadata("classCallsProtectedInheritedByCompanion.kt")
+        public void testClassCallsProtectedInheritedByCompanion() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/classCallsProtectedInheritedByCompanion.kt");
+            doTest(fileName);
+        }
+
        @TestMetadata("flist.kt")
        public void testFlist() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/flist.kt");
@@ -5671,6 +5677,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
            doTest(fileName);
        }

+        @TestMetadata("nestedDerivedClassCallsProtectedFromCompanion.kt")
+        public void testNestedDerivedClassCallsProtectedFromCompanion() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/nestedDerivedClassCallsProtectedFromCompanion.kt");
+            doTest(fileName);
+        }
+
        @TestMetadata("nestedObjectWithSuperclass.kt")
        public void testNestedObjectWithSuperclass() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/nestedObjectWithSuperclass.kt");