Merge

backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanLower.kt

@@ -23,11 +23,9 @@ internal class KonanLower(val context: Context) {
         phaser.phase(KonanPhase.LOWER_ENUMS) {
             EnumClassLowering(context).run(irFile)
         }
-
         phaser.phase(KonanPhase.LOWER_INNER_CLASSES) {
             InnerClassLowering(context).runOnFilePostfix(irFile)
         }
-
         phaser.phase(KonanPhase.LOWER_VARARG) {
             VarargInjectionLowering(context).runOnFilePostfix(irFile)
         }

backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FunctionInlining.kt

@@ -74,7 +74,6 @@ internal class FunctionInlining(val context: Context): IrElementTransformerVoid(
         return parametersNew
     }
 
-
     //-------------------------------------------------------------------------//
 
     fun inlineFunction(irCall: IrCall): IrBlock {

backend.native/tests/build.gradle

@@ -964,11 +964,6 @@ task memory_throw_cleanup(type: RunKonanTest) {
     source = "runtime/memory/throw_cleanup.kt"
 }
 
-task memory_collect_cycles(type: RunKonanTest) {
-    goldValue = "42\n"
-    source = "runtime/memory/cycles0.kt"
-}
-
 task unit1(type: RunKonanTest) {
     goldValue = "First\nkotlin.Unit\n"
     source = "codegen/basics/unit1.kt"
@@ -1012,3 +1007,18 @@ task inline3(type: RunKonanTest) {
 task vararg0(type: RunKonanTest) {
     source = "lower/vararg.kt"
 }
+
+task inline4(type: RunKonanTest) {
+    goldValue = "3\n"
+    source = "codegen/inline/inline4.kt"
+}
+
+task inline5(type: RunKonanTest) {
+    goldValue = "33\n"
+    source = "codegen/inline/inline5.kt"
+}
+
+task inline9(type: RunKonanTest) {
+    goldValue = "hello\n6\n"
+    source = "codegen/inline/inline9.kt"
+}