azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Advance bootstrap to include fix in NI about Nothing-expressions

Browse Source 
See 1594c1fc for details. Also, remove fix from f07fed9a.
This commit is contained in:
Mikhail Zarechenskiy
2019-03-12 11:20:39 +03:00
parent efe93176ab
commit f95fdb3cf1
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle.kts
+1 -1
View File
@@ -10,7 +10,7 @@ import org.gradle.kotlin.dsl.*
buildscript { buildscript {
extra["defaultSnapshotVersion"] = "1.3-SNAPSHOT" 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) { repositories.withRedirector(project) {
bootstrapKotlinRepo?.let(::maven) bootstrapKotlinRepo?.let(::maven)
compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/CoroutineTransformerMethodVisitor.kt
+1 -1
View File
@@ -982,7 +982,7 @@ private fun findSafelyReachableReturns(methodNode: MethodNode, sourceFrames: Arr
if (!insn.isMeaningful || insn.opcode in SAFE_OPCODES || insn.isInvisibleInDebugVarInsn(methodNode) || if (!insn.isMeaningful || insn.opcode in SAFE_OPCODES || insn.isInvisibleInDebugVarInsn(methodNode) ||
isInlineMarker(insn)) { isInlineMarker(insn)) {
setOf() setOf()
} else null as Set<Int>? } else null
} }
var changed: Boolean var changed: Boolean