Do not insert Nothing handling in JvmStatic wrapper.

Fixes KT-46568. (cherry picked from commit 3db5ba9)
JetBrains · May 18, 2021 · 40ced5a · 40ced5a
1 parent e6966d2
commit 40ced5a
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 0 deletions.
diff --git a/.../tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java b/.../tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/CoroutineCodegen.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/CoroutineCodegen.kt
@@ -144,6 +144,7 @@ private fun IrFunction.isStaticInlineClassReplacementDelegatingCall(): Boolean =
 
 private val BRIDGE_ORIGINS = setOf(
     IrDeclarationOrigin.FUNCTION_FOR_DEFAULT_PARAMETER,
+    JvmLoweredDeclarationOrigin.JVM_STATIC_WRAPPER,
     JvmLoweredDeclarationOrigin.JVM_OVERLOADS_WRAPPER,
     JvmLoweredDeclarationOrigin.SYNTHETIC_ACCESSOR,
     JvmLoweredDeclarationOrigin.SYNTHETIC_ACCESSOR_FOR_HIDDEN_CONSTRUCTOR,

diff --git a/compiler/testData/codegen/box/jvmStatic/kt46568.kt b/compiler/testData/codegen/box/jvmStatic/kt46568.kt
@@ -0,0 +1,18 @@
+// TARGET_BACKEND: JVM
+// WITH_RUNTIME
+
+abstract class Foo {
+    companion object {
+        @JvmStatic
+        fun bar(): Nothing = TODO()
+    }
+}
+
+fun box(): String {
+    try {
+        Foo.bar()
+    } catch (e: Throwable) {
+        return "OK"
+    }
+    return "FAIL"
+}
diff --git a/...new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java b/...new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
diff --git a/...w/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java b/...w/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java