IR: never check static members for overridability

#KT-66077 Fixed

analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirBlackBoxCodegenBasedTestGenerated.java

@@ -34077,6 +34077,12 @@ public class LLFirBlackBoxCodegenBasedTestGenerated extends AbstractLLFirBlackBo
         runTest("compiler/testData/codegen/box/javaInterop/statics/inheritTwoStaticMethods.kt");
       }
 
+      @Test
+      @TestMetadata("inheritTwoStaticMethods2.kt")
+      public void testInheritTwoStaticMethods2() {
+        runTest("compiler/testData/codegen/box/javaInterop/statics/inheritTwoStaticMethods2.kt");
+      }
+
       @Test
       @TestMetadata("jkkjk.kt")
       public void testJkkjk() {

analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirReversedBlackBoxCodegenBasedTestGenerated.java

@@ -34077,6 +34077,12 @@ public class LLFirReversedBlackBoxCodegenBasedTestGenerated extends AbstractLLFi
         runTest("compiler/testData/codegen/box/javaInterop/statics/inheritTwoStaticMethods.kt");
       }
 
+      @Test
+      @TestMetadata("inheritTwoStaticMethods2.kt")
+      public void testInheritTwoStaticMethods2() {
+        runTest("compiler/testData/codegen/box/javaInterop/statics/inheritTwoStaticMethods2.kt");
+      }
+
       @Test
       @TestMetadata("jkkjk.kt")
       public void testJkkjk() {

compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java

@@ -33946,6 +33946,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
         runTest("compiler/testData/codegen/box/javaInterop/statics/inheritTwoStaticMethods.kt");
       }
 
+      @Test
+      @TestMetadata("inheritTwoStaticMethods2.kt")
+      public void testInheritTwoStaticMethods2() {
+        runTest("compiler/testData/codegen/box/javaInterop/statics/inheritTwoStaticMethods2.kt");
+      }
+
       @Test
       @TestMetadata("jkkjk.kt")
       public void testJkkjk() {

compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated.java

@@ -33946,6 +33946,12 @@ public class FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated
         runTest("compiler/testData/codegen/box/javaInterop/statics/inheritTwoStaticMethods.kt");
       }
 
+      @Test
+      @TestMetadata("inheritTwoStaticMethods2.kt")
+      public void testInheritTwoStaticMethods2() {
+        runTest("compiler/testData/codegen/box/javaInterop/statics/inheritTwoStaticMethods2.kt");
+      }
+
       @Test
       @TestMetadata("jkkjk.kt")
       public void testJkkjk() {

compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java

@@ -33946,6 +33946,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
         runTest("compiler/testData/codegen/box/javaInterop/statics/inheritTwoStaticMethods.kt");
       }
 
+      @Test
+      @TestMetadata("inheritTwoStaticMethods2.kt")
+      public void testInheritTwoStaticMethods2() {
+        runTest("compiler/testData/codegen/box/javaInterop/statics/inheritTwoStaticMethods2.kt");
+      }
+
       @Test
       @TestMetadata("jkkjk.kt")
       public void testJkkjk() {

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/overrides/IrFakeOverrideBuilder.kt

@@ -67,7 +67,7 @@ class IrFakeOverrideBuilder(
             val (staticMembers, instanceMembers) =
                 clazz.declarations.filterIsInstance<IrOverridableMember>().partition { it.isStaticMember }
 
-            buildFakeOverridesForClassImpl(clazz, instanceMembers, oldSignatures, clazz.superTypes) { !it.isStaticMember }
+            buildFakeOverridesForClassImpl(clazz, instanceMembers, oldSignatures, clazz.superTypes, isStaticMembers = false)
 
             // Static Java members from the superclass need fake overrides in the subclass, to support the case when the static member is
             // declared in an inaccessible grandparent class but is exposed as public in the parent. For example:
@@ -80,7 +80,7 @@ class IrFakeOverrideBuilder(
             // we need to generate a fake override in class B. This is only possible in case of superclasses, as static _interface_ members
             // are not inherited (see JLS 8.4.8 and 9.4.1).
             val superClass = clazz.superTypes.filter { it.classOrFail.owner.isClass }
-            buildFakeOverridesForClassImpl(clazz, staticMembers, oldSignatures, superClass) { it.isStaticMember }
+            buildFakeOverridesForClassImpl(clazz, staticMembers, oldSignatures, superClass, isStaticMembers = true)
         }
     }
 
@@ -89,11 +89,11 @@ class IrFakeOverrideBuilder(
         allFromCurrent: List<IrOverridableMember>,
         oldSignatures: Boolean,
         supertypes: List<IrType>,
-        declarationFilter: (IrOverridableMember) -> Boolean,
+        isStaticMembers: Boolean,
     ) {
         val allFromSuper = supertypes.flatMap { superType ->
             superType.classOrFail.owner.declarations
-                .filterIsInstanceAnd<IrOverridableMember>(declarationFilter)
+                .filterIsInstanceAnd<IrOverridableMember> { it.isStaticMember == isStaticMembers }
                 .mapNotNull {
                     val fakeOverride = strategy.fakeOverrideMember(superType, it, clazz) ?: return@mapNotNull null
                     FakeOverride(fakeOverride, it)
@@ -105,10 +105,7 @@ class IrFakeOverrideBuilder(
 
         allFromSuperByName.forEach { (name, superMembers) ->
             generateOverridesInFunctionGroup(
-                superMembers,
+                superMembers, allFromCurrentByName[name] ?: emptyList(), clazz, oldSignatures, isStaticMembers
-                allFromCurrentByName[name] ?: emptyList(),
-                clazz,
-                oldSignatures
             )
         }
 
@@ -164,7 +161,8 @@ class IrFakeOverrideBuilder(
         membersFromSupertypes: List<FakeOverride>,
         membersFromCurrent: List<IrOverridableMember>,
         current: IrClass,
-        compatibilityMode: Boolean
+        compatibilityMode: Boolean,
+        isStaticMembers: Boolean,
     ) {
         val notOverridden = membersFromSupertypes.toMutableSet()
 
@@ -174,7 +172,11 @@ class IrFakeOverrideBuilder(
         }
 
         val addedFakeOverrides = mutableListOf<IrOverridableMember>()
-        createAndBindFakeOverrides(current, notOverridden, addedFakeOverrides, compatibilityMode)
+        if (isStaticMembers) {
+            createAndBindFakeOverride(notOverridden.toList(), current, addedFakeOverrides, compatibilityMode)
+        } else {
+            createAndBindFakeOverrides(current, notOverridden, addedFakeOverrides, compatibilityMode)
+        }
         current.declarations.addAll(addedFakeOverrides)
     }
 

compiler/testData/codegen/box/javaInterop/statics/inheritTwoStaticMethods2.kt

@@ -0,0 +1,18 @@
+// TARGET_BACKEND: JVM
+// FILE: A.java
+public class A {
+    public static String f(Long x) {
+        return "Fail";
+    }
+
+    public static String f(long x) {
+        return "OK";
+    }
+}
+
+// FILE: 1.kt
+class B : A() {
+    fun g(): String = f(0L)
+}
+
+fun box(): String = B().g()

compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestBoxGenerated.java

@@ -33946,6 +33946,12 @@ public class JvmAbiConsistencyTestBoxGenerated extends AbstractJvmAbiConsistency
         runTest("compiler/testData/codegen/box/javaInterop/statics/inheritTwoStaticMethods.kt");
       }
 
+      @Test
+      @TestMetadata("inheritTwoStaticMethods2.kt")
+      public void testInheritTwoStaticMethods2() {
+        runTest("compiler/testData/codegen/box/javaInterop/statics/inheritTwoStaticMethods2.kt");
+      }
+
       @Test
       @TestMetadata("jkkjk.kt")
       public void testJkkjk() {

compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java

@@ -32086,6 +32086,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         runTest("compiler/testData/codegen/box/javaInterop/statics/inheritTwoStaticMethods.kt");
       }
 
+      @Test
+      @TestMetadata("inheritTwoStaticMethods2.kt")
+      public void testInheritTwoStaticMethods2() {
+        runTest("compiler/testData/codegen/box/javaInterop/statics/inheritTwoStaticMethods2.kt");
+      }
+
       @Test
       @TestMetadata("jkkjk.kt")
       public void testJkkjk() {

compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java

@@ -33946,6 +33946,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
         runTest("compiler/testData/codegen/box/javaInterop/statics/inheritTwoStaticMethods.kt");
       }
 
+      @Test
+      @TestMetadata("inheritTwoStaticMethods2.kt")
+      public void testInheritTwoStaticMethods2() {
+        runTest("compiler/testData/codegen/box/javaInterop/statics/inheritTwoStaticMethods2.kt");
+      }
+
       @Test
       @TestMetadata("jkkjk.kt")
       public void testJkkjk() {

compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java

@@ -33946,6 +33946,12 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
         runTest("compiler/testData/codegen/box/javaInterop/statics/inheritTwoStaticMethods.kt");
       }
 
+      @Test
+      @TestMetadata("inheritTwoStaticMethods2.kt")
+      public void testInheritTwoStaticMethods2() {
+        runTest("compiler/testData/codegen/box/javaInterop/statics/inheritTwoStaticMethods2.kt");
+      }
+
       @Test
       @TestMetadata("jkkjk.kt")
       public void testJkkjk() {

compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/inlineScopes/FirBlackBoxCodegenTestWithInlineScopesGenerated.java

@@ -33946,6 +33946,12 @@ public class FirBlackBoxCodegenTestWithInlineScopesGenerated extends AbstractFir
         runTest("compiler/testData/codegen/box/javaInterop/statics/inheritTwoStaticMethods.kt");
       }
 
+      @Test
+      @TestMetadata("inheritTwoStaticMethods2.kt")
+      public void testInheritTwoStaticMethods2() {
+        runTest("compiler/testData/codegen/box/javaInterop/statics/inheritTwoStaticMethods2.kt");
+      }
+
       @Test
       @TestMetadata("jkkjk.kt")
       public void testJkkjk() {

compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java

@@ -28808,6 +28808,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
         runTest("compiler/testData/codegen/box/javaInterop/statics/inheritTwoStaticMethods.kt");
       }
 
+      @TestMetadata("inheritTwoStaticMethods2.kt")
+      public void testInheritTwoStaticMethods2() {
+        runTest("compiler/testData/codegen/box/javaInterop/statics/inheritTwoStaticMethods2.kt");
+      }
+
       @TestMetadata("jkkjk.kt")
       public void testJkkjk() {
         runTest("compiler/testData/codegen/box/javaInterop/statics/jkkjk.kt");