From f95fdb3cf14b4dd17e76379ed8b860f95fcc65e0 Mon Sep 17 00:00:00 2001 From: Mikhail Zarechenskiy Date: Tue, 12 Mar 2019 11:20:39 +0300 Subject: [PATCH] Advance bootstrap to include fix in NI about `Nothing`-expressions See 1594c1fc for details. Also, remove fix from f07fed9a. --- build.gradle.kts | 2 +- .../codegen/coroutines/CoroutineTransformerMethodVisitor.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index ed53f541370..43743c7a317 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,7 +10,7 @@ import org.gradle.kotlin.dsl.* buildscript { extra["defaultSnapshotVersion"] = "1.3-SNAPSHOT" - kotlinBootstrapFrom(BootstrapOption.TeamCity("1.3.40-dev-310", onlySuccessBootstrap = false)) + kotlinBootstrapFrom(BootstrapOption.TeamCity("1.3.40-dev-431", onlySuccessBootstrap = false)) repositories.withRedirector(project) { bootstrapKotlinRepo?.let(::maven) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/CoroutineTransformerMethodVisitor.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/CoroutineTransformerMethodVisitor.kt index 9fff96532b4..6f9c3087590 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/CoroutineTransformerMethodVisitor.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/CoroutineTransformerMethodVisitor.kt @@ -982,7 +982,7 @@ private fun findSafelyReachableReturns(methodNode: MethodNode, sourceFrames: Arr if (!insn.isMeaningful || insn.opcode in SAFE_OPCODES || insn.isInvisibleInDebugVarInsn(methodNode) || isInlineMarker(insn)) { setOf() - } else null as Set? + } else null } var changed: Boolean