KT-47939 fixes after review

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

@@ -172,19 +172,25 @@ class ReflectionReferencesGenerator(statementGenerator: StatementGenerator) : St
             isExpect = false, isFakeOverride = false
         ).also { irAdapterFun ->
             context.symbolTable.withScope(irAdapterFun) {
-                // TODO irAdapterFun.metadata = ...?
+                irAdapterFun.metadata = null
                 irAdapterFun.dispatchReceiverParameter = null
                 irAdapterFun.extensionReceiverParameter = null
 
                 val irFnParameter = createAdapterParameter(startOffset, endOffset, functionParameter.name, 0, functionParameter.type)
                 irAdapterFun.valueParameters = listOf(irFnParameter)
                 irAdapterFun.body =
-                    context.irFactory.createExpressionBody(
+                    context.irFactory.createBlockBody(
                         startOffset, endOffset,
-                        IrTypeOperatorCallImpl(
-                            startOffset, endOffset,
-                            irSamType, IrTypeOperator.SAM_CONVERSION, irSamType,
-                            IrGetValueImpl(startOffset, endOffset, irFnParameter.symbol)
+                        listOf(
+                            IrReturnImpl(
+                                startOffset, endOffset, context.irBuiltIns.nothingType,
+                                irAdapterFun.symbol,
+                                IrTypeOperatorCallImpl(
+                                    startOffset, endOffset,
+                                    irSamType, IrTypeOperator.SAM_CONVERSION, irSamType,
+                                    IrGetValueImpl(startOffset, endOffset, irFnParameter.symbol)
+                                )
+                            )
                         )
                     )
             }

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrDeclarationOrigin.kt

@@ -16,8 +16,6 @@
 
 package org.jetbrains.kotlin.ir.declarations
 
-import org.jetbrains.kotlin.ir.expressions.IrStatementOriginImpl
-
 interface IrDeclarationOrigin {
     object DEFINED : IrDeclarationOriginImpl("DEFINED")
     object FAKE_OVERRIDE : IrDeclarationOriginImpl("FAKE_OVERRIDE")