[cadegen][debug info]test fix

JetBrains · Jun 30, 2019 · ef8d4d8 · ef8d4d8
1 parent 048813d
commit ef8d4d8
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/...e/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt b/...e/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt
@@ -381,8 +381,10 @@ internal class FunctionGenerationContext(val function: LLVMValueRef,
             }
 
             val position = position()
-            val success = basicBlock("call_success", position?.start.let {position?.end})
+            val endLocation = position?.start.let { position?.end }
+            val success = basicBlock("call_success", endLocation)
             val result = LLVMBuildInvoke(builder, llvmFunction, rargs, args.size, success, unwind, "")!!
+            update(success, endLocation, endLocation)
             positionAtEnd(success)
             return result
         }
@@ -633,12 +635,13 @@ internal class FunctionGenerationContext(val function: LLVMValueRef,
         val resultType = thenValue.type
 
         val position = position()
-        val bbExit = basicBlock(startLocationInfo = position?.end ?: position?.start)
+        val endPosition = position()?.end
+        val bbExit = basicBlock(startLocationInfo = endPosition, endLocationInfo = endPosition)
         val resultPhi = appendingTo(bbExit) {
             phi(resultType)
         }
 
-        val bbElse = basicBlock(startLocationInfo = position?.start)
+        val bbElse = basicBlock(startLocationInfo = position?.start, endLocationInfo = endPosition)
 
         condBr(condition, bbExit, bbElse)
         assignPhis(resultPhi to thenValue)
@@ -654,9 +657,9 @@ internal class FunctionGenerationContext(val function: LLVMValueRef,
     }
 
     inline fun ifThen(condition: LLVMValueRef, thenBlock: () -> Unit) {
-        val position = position()
-        val bbExit = basicBlock(startLocationInfo = position?.end ?: position?.start)
-        val bbThen = basicBlock(startLocationInfo = position?.end)
+        val endPosition = position()?.end
+        val bbExit = basicBlock(startLocationInfo = endPosition, endLocationInfo = endPosition)
+        val bbThen = basicBlock(startLocationInfo = endPosition, endLocationInfo = endPosition)
 
         condBr(condition, bbThen, bbExit)