From 2b97610301b7e64d59222fdf4e6e43f2cf18e1e1 Mon Sep 17 00:00:00 2001
From: Vasily Levchenko <vasily.v.levchenko@gmail.com>
Date: Wed, 16 May 2018 12:23:36 +0300
Subject: [PATCH] [kotlin compiler][update] 1.2.60-dev-89

---
 .../kotlin/backend/konan/lower/FunctionInlining.kt   | 12 +-----------
 gradle.properties                                    |  4 ++--
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FunctionInlining.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FunctionInlining.kt
index ff4670e2420..c20ce131513 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FunctionInlining.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FunctionInlining.kt
@@ -31,18 +31,16 @@ import org.jetbrains.kotlin.backend.konan.ir.DeserializerDriver
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.IrStatement
-import org.jetbrains.kotlin.ir.builders.IrBuilderWithScope
 import org.jetbrains.kotlin.ir.builders.irCall
 import org.jetbrains.kotlin.ir.builders.irGet
+import org.jetbrains.kotlin.ir.builders.irReturn
 import org.jetbrains.kotlin.ir.declarations.IrFunction
 import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
 import org.jetbrains.kotlin.ir.declarations.getDefault
 import org.jetbrains.kotlin.ir.expressions.*
 import org.jetbrains.kotlin.ir.expressions.impl.IrGetValueImpl
-import org.jetbrains.kotlin.ir.expressions.impl.IrReturnImpl
 import org.jetbrains.kotlin.ir.expressions.impl.IrReturnableBlockImpl
 import org.jetbrains.kotlin.ir.expressions.impl.IrVarargImpl
-import org.jetbrains.kotlin.ir.symbols.IrReturnTargetSymbol
 import org.jetbrains.kotlin.ir.symbols.impl.IrReturnableBlockSymbolImpl
 import org.jetbrains.kotlin.ir.symbols.impl.createValueSymbol
 import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid
@@ -187,14 +185,6 @@ private class Inliner(val globalSubstituteMap: MutableMap<DeclarationDescriptor,
         return inlineFunctionBody                                                           // Replace call site with InlineFunctionBody.
     }
 
-    // TODO: this function from ExpressionsHelper.kt with fixed type cast, this method will be fixed soon on Kotlin master.
-    // TODO: this function should be removed.
-    fun IrBuilderWithScope.irReturn(value: IrExpression) =
-            IrReturnImpl(
-                    startOffset, endOffset, context.builtIns.nothingType,
-                    scope.scopeOwnerSymbol as? IrReturnTargetSymbol ?: error("Function scope expected: ${scope.scopeOwner}"),
-                    value
-            )
     //---------------------------------------------------------------------//
 
     private inner class ParameterSubstitutor: IrElementTransformerVoid() {
diff --git a/gradle.properties b/gradle.properties
index 61cd64d87ce..2c2a5e6c899 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,8 +20,8 @@ remoteRoot=konan_tests
 #kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-SNAPSHOT
 # Download artifacts of https://teamcity.jetbrains.com/viewType.html?buildTypeId=Kotlin_120_Compiler
 testDataVersion=1226829:id
-kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_CompilerAllPlugins),number:1.2.60-dev-4,tag:kotlin-native,pinned:true/artifacts/content/maven
-kotlinVersion=1.2.60-dev-4
+kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_CompilerAllPlugins),number:1.2.60-dev-89,tag:kotlin-native,pinned:true/artifacts/content/maven
+kotlinVersion=1.2.60-dev-89
 konanVersion=0.8
 org.gradle.jvmargs='-Dfile.encoding=UTF-8'