KAPT+IR: Support -Xjvm-default modes

compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/BodyGenerator.kt

@@ -53,9 +53,22 @@ class BodyGenerator(
     private val loopTable = HashMap<KtLoopExpression, IrLoop>()
 
     fun generateFunctionBody(ktBody: KtExpression): IrBody {
+        val irBlockBody = context.irFactory.createBlockBody(ktBody.startOffsetSkippingComments, ktBody.endOffset)
+
+        if (context.configuration.skipBodies) {
+            val irBody =
+                IrErrorExpressionImpl(
+                    ktBody.startOffsetSkippingComments,
+                    ktBody.endOffset,
+                    context.irBuiltIns.nothingType,
+                    ktBody::class.java.simpleName
+                )
+            irBlockBody.statements.add(generateReturnExpression(irBody.endOffset, irBody.endOffset, irBody))
+            return irBlockBody
+        }
+
         val statementGenerator = createStatementGenerator()
 
-        val irBlockBody = context.irFactory.createBlockBody(ktBody.startOffsetSkippingComments, ktBody.endOffset)
         if (ktBody is KtBlockExpression) {
             statementGenerator.generateStatements(ktBody.statements, irBlockBody)
         } else {

compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/FunctionGenerator.kt

@@ -49,8 +49,7 @@ class FunctionGenerator(declarationGenerator: DeclarationGenerator) : Declaratio
             origin,
             getOrFail(BindingContext.FUNCTION, ktFunction)
         ) {
-            if (context.configuration.skipBodies) null
+            ktFunction.bodyExpression?.let { generateFunctionBody(it) }
-            else ktFunction.bodyExpression?.let { generateFunctionBody(it) }
         }
 
     fun generateLambdaFunctionDeclaration(ktFunction: KtFunctionLiteral): IrSimpleFunction {

plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultAll.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // !JVM_DEFAULT_MODE: all
 
 interface Foo {

plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultAllCompatibility.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // !JVM_DEFAULT_MODE: all-compatibility
 
 interface Foo {

plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultDisable.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // !JVM_DEFAULT_MODE: disable
 
 interface Foo {

plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultEnable.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // !JVM_DEFAULT_MODE: enable
 
 interface Foo {