FIR2IR: generate both dispatch & extension receiver without 'else if'

compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt

@@ -847,7 +847,8 @@ class Fir2IrVisitor(
                 val ownerFunction = symbol.owner
                 if (ownerFunction.dispatchReceiverParameter != null) {
                     dispatchReceiver = qualifiedAccess.findIrDispatchReceiver()
-                } else if (ownerFunction.extensionReceiverParameter != null) {
+                }
+                if (ownerFunction.extensionReceiverParameter != null) {
                     extensionReceiver = qualifiedAccess.findIrExtensionReceiver()
                 }
                 this

compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmIrCodegenFactory.kt

@@ -50,8 +50,7 @@ class JvmIrCodegenFactory(private val phaseConfig: PhaseConfig) : CodegenFactory
 
         val stubGenerator = irProviders.filterIsInstance<DeclarationStubGenerator>().first()
         for (descriptor in symbolTable.wrappedTopLevelCallableDescriptors()) {
-            descriptor as WrappedDeclarationDescriptor<*>
+            val parentClass = stubGenerator.generateOrGetFacadeClass(descriptor as WrappedDeclarationDescriptor<*>)
-            val parentClass = stubGenerator.generateOrGetFacadeClass(descriptor)
             descriptor.owner.parent = parentClass ?: throw AssertionError("Facade class for ${descriptor.name} not found")
         }
 

compiler/testData/codegen/box/controlStructures/forLoopMemberExtensionAll.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class It {
 }
 

compiler/testData/codegen/box/controlStructures/forLoopMemberExtensionHasNext.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class It {
     operator fun next() = 5
 }

compiler/testData/codegen/box/controlStructures/forLoopMemberExtensionNext.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JS_IR
 // TODO: muted automatically, investigate should it be ran for JS or not
 // IGNORE_BACKEND: JS

compiler/testData/codegen/box/defaultArguments/function/extentionFunctionInObject.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 object A {
   fun Int.foo(a: Int = 1): Int {
       return a

compiler/testData/codegen/box/defaultArguments/function/innerExtentionFunction.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class A {
   fun Int.foo(a: Int = 1): Int {
       return a

compiler/testData/codegen/box/defaultArguments/function/innerExtentionFunctionDouble.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class A {
   fun Double.foo(a: Double = 1.0): Double {
       return a

compiler/testData/codegen/box/defaultArguments/function/innerExtentionFunctionDoubleTwoArgs.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class A {
     fun Double.foo(a: Double = 1.0, b: Double = 1.0): Double {
         return a + b

compiler/testData/codegen/box/extensionFunctions/kt1953_class.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 class A {
     private val sb: StringBuilder = StringBuilder()

compiler/testData/codegen/box/extensionFunctions/virtual.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Request(val path: String) {
 
 }

compiler/testData/codegen/box/functions/defaultargs3.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 
 class C() {
     fun Any.toMyPrefixedString(prefix: String = "", suffix: String="") : String = prefix + " " + suffix

compiler/testData/codegen/box/functions/invoke/extensionInvokeOnExpr.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class A
 
 class B {

compiler/testData/codegen/box/innerNested/kt5363.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Outer {
     class Nested{
         fun foo(s: String) = s.extension()

compiler/testData/codegen/box/properties/kt613.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 package name
 
 class Test() {

compiler/testData/codegen/box/regressions/kt6153.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // KT-6153 java.lang.IllegalStateException while building
 object Bug {

compiler/testData/codegen/box/smartCasts/implicitMemberReceiver.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 open class A {
     open val a = "OK"
 }

compiler/testData/codegen/box/smartCasts/kt17725.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Bob {
     fun Bob.bar() = "OK"
 }

compiler/testData/codegen/box/traits/traitWithPrivateExtension.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 open class B {
     val p = "OK"
 }

compiler/testData/ir/irText/expressions/destructuring1.fir.txt

@@ -57,6 +57,8 @@ FILE fqName:<root> fileName:/destructuring1.kt
       VAR name:x type:kotlin.Int [val]
         CALL 'public final fun component1 (): kotlin.Int [operator] declared in <root>.B' type=kotlin.Int origin=null
           $this: GET_VAR 'val tmp_0: <root>.A [val] declared in <root>.test' type=<root>.A origin=null
+          $receiver: GET_VAR 'val tmp_0: <root>.A [val] declared in <root>.test' type=<root>.A origin=null
       VAR name:y type:kotlin.Int [val]
         CALL 'public final fun component2 (): kotlin.Int [operator] declared in <root>.B' type=kotlin.Int origin=null
           $this: GET_VAR 'val tmp_0: <root>.A [val] declared in <root>.test' type=<root>.A origin=null
+          $receiver: GET_VAR 'val tmp_0: <root>.A [val] declared in <root>.test' type=<root>.A origin=null

compiler/testData/ir/irText/types/nullChecks/nullabilityAssertionOnExtensionReceiver.fir.txt

@@ -34,3 +34,4 @@ FILE fqName:<root> fileName:/nullabilityAssertionOnExtensionReceiver.kt
     BLOCK_BODY
       CALL 'public final fun memberExtension (): kotlin.Unit declared in <root>.C' type=kotlin.Unit origin=null
         $this: GET_VAR '<this>: <root>.C declared in <root>.testMemberExt' type=<root>.C origin=null
+        $receiver: CALL 'public open fun s (): kotlin.String? declared in <root>.J' type=kotlin.String? origin=null