Added static methods, nested classes and companion object from superclasses.

compiler/testData/diagnostics/tests/scopes/inheritance/statics/localVsStatic.kt

@@ -0,0 +1,26 @@
+// !DIAGNOSTICS: -UNUSED_VARIABLE
+// FILE: A.java
+public class A {
+    public static int foo() {return 1;}
+}
+
+// FILE: 1.kt
+
+fun foo() = ""
+
+class B: A() {
+    init {
+        val a: Int = foo()
+    }
+}
+
+// FILE: 2.kt
+fun test() {
+    fun foo() = ""
+
+    class B: A() {
+        init {
+            val a: Int = <!TYPE_MISMATCH!>foo()<!> // todo
+        }
+    }
+}

compiler/testData/diagnostics/tests/scopes/inheritance/statics/localVsStatic.txt

@@ -0,0 +1,21 @@
+package
+
+public fun foo(): kotlin.String
+public fun test(): kotlin.Unit
+
+public open class A {
+    public constructor A()
+    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
+
+    // Static members
+    public open fun foo(): kotlin.Int
+}
+
+public final class B : A {
+    public constructor B()
+    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
+}

compiler/testData/diagnostics/tests/scopes/inheritance/statics/overloadStatic.kt

@@ -0,0 +1,20 @@
+// !DIAGNOSTICS: -UNUSED_VARIABLE
+// FILE: A.java
+public class A {
+    static void foo() {}
+    static int bar() { return 1; }
+}
+
+// FILE: B.java
+public class B extends A {
+    static void foo() {}
+    static long bar() { return 1; }
+}
+
+// FILE: 1.kt
+class E: B() {
+    init {
+        foo()
+        val a: Long = bar()
+    }
+}

compiler/testData/diagnostics/tests/scopes/inheritance/statics/overloadStatic.txt

@@ -0,0 +1,30 @@
+package
+
+public open class A {
+    public constructor A()
+    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
+
+    // Static members
+    public/*package*/ open fun bar(): kotlin.Int
+    public/*package*/ open fun foo(): kotlin.Unit
+}
+
+public open class B : A {
+    public constructor B()
+    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
+
+    // Static members
+    public/*package*/ open override /*1*/ fun bar(): kotlin.Long
+    public/*package*/ open override /*1*/ fun foo(): kotlin.Unit
+}
+
+public final class E : B {
+    public constructor E()
+    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
+}

compiler/testData/diagnostics/tests/scopes/inheritance/statics/staticFunVsImport.kt

@@ -0,0 +1,50 @@
+// !DIAGNOSTICS: -UNUSED_VARIABLE
+// FILE: A.java
+public class A {
+    static void foo() {}
+    static int bar() {return 1;}
+}
+
+// FILE: B.java
+public class B extends A {}
+
+// FILE: C.java
+public class C {
+    static void bar() {}
+}
+
+// FILE: 1.kt
+import A.foo
+import B.bar
+
+class E: A() {
+    init {
+        foo()
+        bar()
+    }
+}
+
+class F: B() {
+    init {
+        foo()
+        bar()
+    }
+}
+
+// FILE: 2.kt
+import C.bar
+
+class Z: A() {
+    init {
+        val a: Int = bar()
+    }
+}
+
+// FILE: 3.kt
+import C.*
+
+class Q: A() {
+    init {
+        val a: Int = bar()
+    }
+}

compiler/testData/diagnostics/tests/scopes/inheritance/statics/staticFunVsImport.txt

@@ -0,0 +1,61 @@
+package
+
+public open class A {
+    public constructor A()
+    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
+
+    // Static members
+    public/*package*/ open fun bar(): kotlin.Int
+    public/*package*/ open fun foo(): kotlin.Unit
+}
+
+public open class B : A {
+    public constructor B()
+    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
+
+    // Static members
+    public/*package*/ open override /*1*/ /*fake_override*/ fun bar(): kotlin.Int
+    public/*package*/ open override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit
+}
+
+public open class C {
+    public constructor C()
+    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
+
+    // Static members
+    public/*package*/ open fun bar(): kotlin.Unit
+}
+
+public final class E : A {
+    public constructor E()
+    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
+}
+
+public final class F : B {
+    public constructor F()
+    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
+}
+
+public final class Q : A {
+    public constructor Q()
+    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
+}
+
+public final class Z : A {
+    public constructor Z()
+    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
+}

compiler/testData/diagnostics/tests/scopes/inheritance/statics/staticPropertyVsImport.kt

@@ -0,0 +1,59 @@
+// !DIAGNOSTICS: -UNUSED_VARIABLE
+// FILE: A.java
+public class A {
+    static byte foo = 1;
+    static int bar = 2;
+}
+
+// FILE: B.java
+public class B extends A {}
+
+// FILE: C.java
+public class C {
+    static long bar = 3;
+}
+
+// FILE: 1.kt
+import A.foo
+import B.bar
+
+class E: A() {
+    init {
+        foo
+        bar
+    }
+}
+
+class F: B() {
+    init {
+        foo
+        bar
+    }
+}
+
+// FILE: 2.kt
+import C.bar
+
+class Z: A() {
+    init {
+        val a: Int = bar
+    }
+}
+
+// FILE: 3.kt
+import C.*
+
+class Q: A() {
+    init {
+        val a: Int = bar
+    }
+}
+
+// FILE: 4.kt
+val bar = ""
+
+class W: A() {
+    init {
+        val a: Int = bar
+    }
+}

compiler/testData/diagnostics/tests/scopes/inheritance/statics/staticPropertyVsImport.txt

@@ -0,0 +1,70 @@
+package
+
+public val bar: kotlin.String = ""
+
+public open class A {
+    public constructor A()
+    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
+
+    // Static members
+    public/*package*/ final var bar: kotlin.Int
+    public/*package*/ final var foo: kotlin.Byte
+}
+
+public open class B : A {
+    public constructor B()
+    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
+
+    // Static members
+    public/*package*/ final override /*1*/ /*fake_override*/ var bar: kotlin.Int
+    public/*package*/ final override /*1*/ /*fake_override*/ var foo: kotlin.Byte
+}
+
+public open class C {
+    public constructor C()
+    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
+
+    // Static members
+    public/*package*/ final var bar: kotlin.Long
+}
+
+public final class E : A {
+    public constructor E()
+    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
+}
+
+public final class F : B {
+    public constructor F()
+    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
+}
+
+public final class Q : A {
+    public constructor Q()
+    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
+}
+
+public final class W : A {
+    public constructor W()
+    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
+}
+
+public final class Z : A {
+    public constructor Z()
+    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
+}

compiler/testData/diagnostics/tests/scopes/inheritance/statics/staticVsCompanion.kt

@@ -0,0 +1,36 @@
+// !DIAGNOSTICS: -UNUSED_VARIABLE
+// FILE: A.java
+public class A {
+    static void foo() {}
+}
+
+// FILE: 1.kt
+open class B : A() {
+    companion object {
+        fun foo() = 1
+    }
+
+    init {
+        val a: Int = foo()
+    }
+}
+
+class C: B() {
+    init {
+        val a: Int = foo()
+    }
+}
+
+// FILE: X.java
+public class X extends B {
+    static double foo() {
+        return 1.0
+    }
+}
+
+// FILE: 2.kt
+class Y: X() {
+    init {
+        val a: Double = <!TYPE_MISMATCH!>foo()<!> // todo
+    }
+}

compiler/testData/diagnostics/tests/scopes/inheritance/statics/staticVsCompanion.txt

@@ -0,0 +1,50 @@
+package
+
+public open class A {
+    public constructor A()
+    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
+
+    // Static members
+    public/*package*/ open fun foo(): kotlin.Unit
+}
+
+public open class B : A {
+    public constructor B()
+    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
+
+    public companion object Companion {
+        private constructor Companion()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public final fun foo(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+}
+
+public final class C : B {
+    public constructor C()
+    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
+}
+
+public open class X : B {
+    public constructor X()
+    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
+
+    // Static members
+    public/*package*/ open override /*1*/ fun foo(): kotlin.Double
+}
+
+public final class Y : X {
+    public constructor Y()
+    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
+}

compiler/testData/diagnostics/tests/scopes/inheritance/statics/staticVsMember.kt

@@ -0,0 +1,69 @@
+// !DIAGNOSTICS: -UNUSED_VARIABLE
+// FILE: A.java
+public class A {
+    public static int foo() { return 1; }
+    public static int bar = 1;
+}
+
+// FILE: 1.kt
+
+class B: A() {
+    companion object {
+        init {
+            val a: Int = foo()
+            val b: Int = bar
+        }
+    }
+
+    init {
+        val a: Int = foo()
+        val b: Int = bar
+    }
+}
+
+open class C: A() {
+    val bar = ""
+    fun foo() = ""
+
+    init {
+        val a: String = foo()
+        val b: String = bar
+    }
+}
+
+class E: C() {
+    init {
+        val a: String = foo()
+        val b: String = bar
+    }
+}
+
+open class F: A() {
+    companion object {
+        val bar = ""
+        fun foo() = ""
+
+        init {
+            val a: String = foo()
+            val b: String = bar
+        }
+    }
+    init {
+        val a: String = foo()
+        val b: String = bar
+    }
+}
+
+class G: F() {
+    companion object {
+        init {
+            val a: String = foo()
+            val b: String = bar
+        }
+    }
+
+    init {
+        val a: String = foo()
+        val b: String = bar
+    }
+}

compiler/testData/diagnostics/tests/scopes/inheritance/statics/staticVsMember.txt

@@ -0,0 +1,74 @@
+package
+
+public open class A {
+    public constructor A()
+    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
+
+    // Static members
+    public final var bar: kotlin.Int
+    public open fun foo(): kotlin.Int
+}
+
+public final class B : A {
+    public constructor B()
+    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
+
+    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 open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+}
+
+public open class C : A {
+    public constructor C()
+    public final val bar: kotlin.String = ""
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public final fun foo(): kotlin.String
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public final class E : C {
+    public constructor E()
+    public final override /*1*/ /*fake_override*/ val bar: kotlin.String
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public final override /*1*/ /*fake_override*/ fun foo(): kotlin.String
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public open class F : A {
+    public constructor F()
+    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
+
+    public companion object Companion {
+        private constructor Companion()
+        public final val bar: kotlin.String = ""
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public final fun foo(): kotlin.String
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+}
+
+public final class G : F {
+    public constructor G()
+    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
+
+    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 open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+}

compiler/testData/diagnostics/tests/scopes/inheritance/statics/staticVsOuter.kt

@@ -0,0 +1,19 @@
+// FILE: A.java
+public class A {
+    public static int foo() {return 1;}
+}
+
+// FILE: B.java
+public class B extends A {
+    public static int foo() {return 1;}
+}
+
+// FILE: 1.kt
+
+fun foo() = ""
+
+class C: B() {
+    init {
+        val <!UNUSED_VARIABLE!>a<!>: Int = foo()
+    }
+}

compiler/testData/diagnostics/tests/scopes/inheritance/statics/staticVsOuter.txt

@@ -0,0 +1,30 @@
+package
+
+public fun foo(): kotlin.String
+
+public open class A {
+    public constructor A()
+    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
+
+    // Static members
+    public open fun foo(): kotlin.Int
+}
+
+public open class B : A {
+    public constructor B()
+    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
+
+    // Static members
+    public open override /*1*/ fun foo(): kotlin.Int
+}
+
+public final class C : B {
+    public constructor C()
+    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
+}

compiler/testData/diagnostics/tests/scopes/inheritance/statics/staticsFromjava.kt

@@ -0,0 +1,51 @@
+// FILE: A.java
+public class A {
+    public static void foo() {}
+}
+
+// FILE: B.java
+public class B extends A {
+    public static vod bar() {}
+}
+
+// FILE: 1.kt
+open class X: A() {
+    init {
+        foo()
+        A.foo()
+    }
+}
+
+open class Y: B() {
+    init {
+        foo()
+        A.foo()
+        B.foo()
+
+        bar()
+        B.bar()
+    }
+}
+
+class XN: X() {
+    init {
+        foo()
+        A.foo()
+        X.<!UNRESOLVED_REFERENCE!>foo<!>()
+        XN.<!UNRESOLVED_REFERENCE!>foo<!>()
+    }
+}
+
+class YN: Y() {
+    init {
+        foo()
+        A.foo()
+        Y.<!UNRESOLVED_REFERENCE!>foo<!>()
+        YN.<!UNRESOLVED_REFERENCE!>foo<!>()
+
+        bar()
+        B.bar()
+        Y.<!UNRESOLVED_REFERENCE!>bar<!>()
+        YN.<!UNRESOLVED_REFERENCE!>bar<!>()
+    }
+}

compiler/testData/diagnostics/tests/scopes/inheritance/statics/staticsFromjava.txt

@@ -0,0 +1,50 @@
+package
+
+public open class A {
+    public constructor A()
+    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
+
+    // Static members
+    public open fun foo(): kotlin.Unit
+}
+
+public open class B : A {
+    public constructor B()
+    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
+
+    // Static members
+    public open fun bar(): [ERROR : Unresolved java classifier: vod]!
+    public open override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit
+}
+
+public open class X : A {
+    public constructor X()
+    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
+}
+
+public final class XN : X {
+    public constructor XN()
+    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
+}
+
+public open class Y : B {
+    public constructor Y()
+    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
+}
+
+public final class YN : Y {
+    public constructor YN()
+    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
+}

compiler/testData/diagnostics/tests/scopes/inheritance/statics/staticsFromjavaAfterKotlin.kt

@@ -0,0 +1,27 @@
+// FILE: A.java
+public class A {
+    public static void foo() {}
+}
+
+// FILE: 1.kt
+open class B: A()
+
+// FILE: C.java
+public class C extends B {
+    public static vod bar() {}
+}
+
+// FILE: 2.kt
+class D: C() {
+    init {
+        foo()
+        A.foo()
+        B.<!UNRESOLVED_REFERENCE!>foo<!>()
+        C.foo()
+        D.<!UNRESOLVED_REFERENCE!>foo<!>()
+
+        bar()
+        C.bar()
+        D.<!UNRESOLVED_REFERENCE!>bar<!>()
+    }
+}

compiler/testData/diagnostics/tests/scopes/inheritance/statics/staticsFromjavaAfterKotlin.txt

@@ -0,0 +1,36 @@
+package
+
+public open class A {
+    public constructor A()
+    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
+
+    // Static members
+    public open fun foo(): kotlin.Unit
+}
+
+public open class B : A {
+    public constructor B()
+    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
+}
+
+public open class C : B {
+    public constructor C()
+    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
+
+    // Static members
+    public open fun bar(): [ERROR : Unresolved java classifier: vod]!
+    public open override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit
+}
+
+public final class D : C {
+    public constructor D()
+    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
+}