JVM_IR: use indy SAM conversions in jvmTarget 1.8+, fix bridges

KT-44278 KT-26060 KT-42621
2021-02-05 15:23:04 +03:00
parent 6c6d43c29a
commit 3ebeca5852
50 changed files with 1293 additions and 287 deletions
@@ -209,11 +209,12 @@ class GenerationState private constructor(

    val samConversionsScheme = run {
        val fromConfig = configuration.get(JVMConfigurationKeys.SAM_CONVERSIONS)
-            ?: JvmClosureGenerationScheme.DEFAULT
-        if (target >= fromConfig.minJvmTarget)
+        if (fromConfig != null && target >= fromConfig.minJvmTarget)
            fromConfig
+        else if (target < JvmTarget.JVM_1_8)
+            JvmClosureGenerationScheme.CLASS
        else
-            JvmClosureGenerationScheme.DEFAULT
+            JvmClosureGenerationScheme.INDY
    }

    val lambdasScheme = run {