Add IrFunctionExpression.irReturn and IrFunction.irReturn functions

Author: JavierSegoviaCordoba

CHANGELOG.md

@@ -4,8 +4,13 @@
 
 ### Added
 
+- `IrFunctionExpression.irReturn: IrReturn?`
+- `IrFunction.irReturn: IrReturn?`
+
 ### Changed
 
+- `IrFunction.buildIrReturn` to `IrFunction.copyIrReturn`
+
 ### Deprecated
 
 ### Removed

kotlin-compiler-extensions/api/kotlin-compiler-extensions.api

@@ -59,7 +59,9 @@ public final class com/javiersc/kotlin/compiler/extensions/ir/IrGetEnumValueKt {
 }
 
 public final class com/javiersc/kotlin/compiler/extensions/ir/IrReturnKt {
-	public static final fun buildIrReturn (Lorg/jetbrains/kotlin/ir/declarations/IrFunction;Lorg/jetbrains/kotlin/ir/expressions/IrExpression;)Lorg/jetbrains/kotlin/ir/expressions/IrReturn;
+	public static final fun copyIrReturn (Lorg/jetbrains/kotlin/ir/declarations/IrFunction;Lorg/jetbrains/kotlin/ir/expressions/IrExpression;)Lorg/jetbrains/kotlin/ir/expressions/IrReturn;
+	public static final fun getIrReturn (Lorg/jetbrains/kotlin/ir/declarations/IrFunction;)Lorg/jetbrains/kotlin/ir/expressions/IrReturn;
+	public static final fun getIrReturn (Lorg/jetbrains/kotlin/ir/expressions/IrFunctionExpression;)Lorg/jetbrains/kotlin/ir/expressions/IrReturn;
 }
 
 public final class com/javiersc/kotlin/compiler/extensions/ir/IrTreeNodeKt {

kotlin-compiler-extensions/main/kotlin/com/javiersc/kotlin/compiler/extensions/ir/irReturn.kt

@@ -2,9 +2,18 @@ package com.javiersc.kotlin.compiler.extensions.ir
 
 import org.jetbrains.kotlin.ir.declarations.IrFunction
 import org.jetbrains.kotlin.ir.expressions.IrExpression
+import org.jetbrains.kotlin.ir.expressions.IrFunctionExpression
 import org.jetbrains.kotlin.ir.expressions.IrReturn
 import org.jetbrains.kotlin.ir.expressions.impl.IrReturnImpl
 import org.jetbrains.kotlin.ir.util.SYNTHETIC_OFFSET
+import org.jetbrains.kotlin.ir.util.statements
+import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
 
-public fun IrFunction.buildIrReturn(value: IrExpression): IrReturn =
+public val IrFunctionExpression.irReturn: IrReturn?
+    get() = function.irReturn
+
+public val IrFunction.irReturn: IrReturn?
+    get() = body?.statements?.firstIsInstanceOrNull()
+
+public fun IrFunction.copyIrReturn(value: IrExpression): IrReturn =
     IrReturnImpl(SYNTHETIC_OFFSET, SYNTHETIC_OFFSET, this.returnType, this.symbol, value)

kotlin-compiler-extensions/test/kotlin/com/javiersc/kotlin/compiler/extensions/FakeIrExtension.kt

@@ -1,10 +1,10 @@
 package com.javiersc.kotlin.compiler.extensions
 
 import com.javiersc.kotlin.compiler.extensions.ir.IrTreeNode
-import com.javiersc.kotlin.compiler.extensions.ir.buildIrReturn
 import com.javiersc.kotlin.compiler.extensions.ir.name
 import com.javiersc.kotlin.compiler.extensions.ir.treeNode
 import com.javiersc.kotlin.compiler.extensions.ir.asIr
+import com.javiersc.kotlin.compiler.extensions.ir.copyIrReturn
 import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
 import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
@@ -27,7 +27,7 @@ class FakeIrExtension : IrGenerationExtension {
                 .asIr<IrCall>()
         val greetingsIrSimpleFunction: IrSimpleFunction = greetingsIrCall?.symbol?.owner ?: return
         val hiIrExpression: IrConst<*> = "hi".toIrConst(builtIns.stringType)
-        val hiIrReturn: IrReturn = greetingsIrSimpleFunction.buildIrReturn(hiIrExpression)
+        val hiIrReturn: IrReturn = greetingsIrSimpleFunction.copyIrReturn(hiIrExpression)
         greetingsIrSimpleFunction.body.asIr<IrBlockBody>()?.statements?.apply {
             clear()
             add(hiIrReturn)