IR: fix offsets in irTemporary
The variable generated by IrStatementBuilder.irTemporary doesn't inherit startOffset and endOffset from the builder. In particular, as a result, temporary variables generated for elvis operator left operand have UNDEFINED_OFFSET. Additionally, ProvisionalFunctionExpressionLowering copies the offsets of a variable to lowered lambda in the variable initializer. With the problem described above, this causes invalid debug information in Kotlin/Native, see KT-49360. Fix irTemporary by using builder's offsets for the variable. ^KT-49360 Fixed
This commit is contained in:
committed by
Space
parent
fb859c0270
commit
2f5706597a
@@ -0,0 +1,110 @@
|
||||
package codegen.lambda.lambda_kt49360
|
||||
|
||||
import kotlin.test.*
|
||||
import kotlin.coroutines.*
|
||||
|
||||
// To be tested with -g.
|
||||
|
||||
// https://youtrack.jetbrains.com/issue/KT-49360
|
||||
|
||||
fun testTrivialCreateBlock(result: Int): () -> Int {
|
||||
return (if (result == 0) { { 0 } } else null) ?: { result }
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testTrivial() {
|
||||
assertEquals(0, testTrivialCreateBlock(0)())
|
||||
assertEquals(1, testTrivialCreateBlock(1)())
|
||||
}
|
||||
|
||||
class Block(val block: () -> Int)
|
||||
|
||||
fun testWrapBlockCreate(flag: Boolean): Block {
|
||||
return (if (flag) Block { 11 } else null) ?: Block { 22 }
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testWrapBlock() {
|
||||
assertEquals(11, testWrapBlockCreate(true).block())
|
||||
assertEquals(22, testWrapBlockCreate(false).block())
|
||||
}
|
||||
|
||||
// The Flow code below is taken from kotlinx.coroutines (some unrelated details removed).
|
||||
|
||||
interface FlowCollector<in T> {
|
||||
suspend fun emit(value: T)
|
||||
}
|
||||
|
||||
interface Flow<out T> {
|
||||
suspend fun collect(collector: FlowCollector<T>)
|
||||
}
|
||||
|
||||
suspend inline fun <T> Flow<T>.collect(crossinline action: suspend (value: T) -> Unit): Unit =
|
||||
collect(object : FlowCollector<T> {
|
||||
override suspend fun emit(value: T) = action(value)
|
||||
})
|
||||
|
||||
inline fun <T> unsafeFlow(crossinline block: suspend FlowCollector<T>.() -> Unit): Flow<T> {
|
||||
return object : Flow<T> {
|
||||
override suspend fun collect(collector: FlowCollector<T>) {
|
||||
collector.block()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
inline fun <T, R> Flow<T>.unsafeTransform(
|
||||
crossinline transform: suspend FlowCollector<R>.(value: T) -> Unit
|
||||
): Flow<R> = unsafeFlow {
|
||||
collect { value ->
|
||||
return@collect transform(value)
|
||||
}
|
||||
}
|
||||
|
||||
inline fun <T, R: Any> Flow<T>.mapNotNull(crossinline transform: suspend (value: T) -> R?): Flow<R> = unsafeTransform { value ->
|
||||
val transformed = transform(value) ?: return@unsafeTransform
|
||||
return@unsafeTransform emit(transformed)
|
||||
}
|
||||
|
||||
fun <T> flowOf(value: T): Flow<T> = unsafeFlow {
|
||||
emit(value)
|
||||
}
|
||||
|
||||
suspend fun <T> Flow<T>.toList(): List<T> {
|
||||
val result = mutableListOf<T>()
|
||||
collect {
|
||||
result.add(it)
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
// Close to https://youtrack.jetbrains.com/issue/KT-49360:
|
||||
fun testWithFlowMapNotNull(flow: Flow<Boolean>): Flow<Block> {
|
||||
return flow.mapNotNull {
|
||||
if (it) Block({ 333 }) else null
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testWithFlow() {
|
||||
lateinit var list1: List<Block>
|
||||
lateinit var list2: List<Block>
|
||||
|
||||
builder {
|
||||
list1 = testWithFlowMapNotNull(flowOf(true)).toList()
|
||||
list2 = testWithFlowMapNotNull(flowOf(false)).toList()
|
||||
}
|
||||
|
||||
assertEquals(1, list1.size)
|
||||
assertEquals(333, list1.single().block())
|
||||
|
||||
assertEquals(0, list2.size)
|
||||
}
|
||||
|
||||
open class EmptyContinuation(override val context: CoroutineContext = EmptyCoroutineContext) : Continuation<Any?> {
|
||||
companion object : EmptyContinuation()
|
||||
override fun resumeWith(result: Result<Any?>) { result.getOrThrow() }
|
||||
}
|
||||
|
||||
fun builder(c: suspend () -> Unit) {
|
||||
c.startCoroutine(EmptyContinuation)
|
||||
}
|
||||
Reference in New Issue
Block a user