[K/N] Hide throwable constructor frames from stack traces.

Merge-request: KT-MR-8242
Merged-by: Alexey Glushko <aleksei.glushko@jetbrains.com>
This commit is contained in:
Aleksei.Glushko
2023-01-13 14:14:40 +00:00
committed by Space Team
parent f20e5daa92
commit 20e80401b2
16 changed files with 217 additions and 87 deletions
@@ -29,9 +29,16 @@ fun functionB() {
functionA()
}
const val depth = 5
var depth = 3
fun main(args : Array<String>) {
val sourceInfoType = args.first()
val exceptionalFrames = when (sourceInfoType) {
"libbacktrace" -> 0
"coresymbolication" -> 2
else -> throw AssertionError("Unknown source info type " + sourceInfoType)
}
depth += exceptionalFrames
try {
functionB()
} catch (e: Throwable) {
@@ -0,0 +1,38 @@
import kotlin.text.Regex
import kotlin.test.*
class CustomException(msg: String = "Exceptional message") : Exception(msg) {
}
fun exception() {
throw CustomException()
}
fun main() {
try {
exception()
}
catch (e:Exception) {
val stackTrace = e.getStackTrace().filter { "kfun:" in it }
println("Kotlin part of call stack is:")
for (entry in stackTrace)
println(entry)
println("Verifying...")
val goldValues = arrayOf(
"kfun:#exception(){}",
"kfun:#main(){}",
)
assertEquals(goldValues.size, stackTrace.size)
goldValues.zip(stackTrace).forEach { checkFrame(it.first, it.second) }
println("Passed")
}
}
internal val regex = Regex("(kfun.+) \\+ (\\d+)")
internal fun checkFrame(goldFunName: String, actualLine: String) {
val findResult = regex.find(actualLine)
val (funName, offset) = findResult?.destructured ?: throw Error("Cannot find '$goldFunName + <int>' in $actualLine")
assertEquals(goldFunName, funName)
assertTrue(offset.toInt() > 0)
}
@@ -1,17 +1,28 @@
import kotlin.text.Regex
import kotlin.test.*
var inlinesCount = 0
var expectedInlinesCount = 0
var expectedExceptionContrFrames = 0
fun main() {
fun main(args: Array<String>) {
val sourceInfoType = args.first()
val (e, i) = when (sourceInfoType) {
"libbacktrace" -> Pair(0, 2)
"coresymbolication" -> Pair(2, 0)
else -> throw AssertionError("Unknown source info type " + sourceInfoType)
}
expectedExceptionContrFrames = e
expectedInlinesCount = i
var actualInlinesCount = 0
try {
foo()
} catch (tw:Throwable) {
val stackTrace = tw.getStackTrace();
inlinesCount = stackTrace.count { it.contains("[inlined]")}
stackTrace.take(6).forEach(::checkFrame)
actualInlinesCount = stackTrace.count { it.contains("[inlined]")}
stackTrace.take(expectedExceptionContrFrames + 4).forEach(::checkFrame)
}
println(inlinesCount)
assertEquals(expectedInlinesCount, actualInlinesCount)
}
fun foo() {
@@ -32,16 +43,15 @@ internal val regex = Regex("^(\\d+)\\ +.*/(.*):(\\d+):.*$")
internal fun checkFrame(value:String) {
val goldValues = arrayOf<Pair<String, Int>?>(
null,
null,
"kt-37572.kt" to 29,
"kt-37572.kt" to 20,
*(if (inlinesCount != 0) arrayOf(
"kt-37572.kt" to 25,
"kt-37572.kt" to 18,
*arrayOfNulls(expectedExceptionContrFrames),
"kt-37572.kt" to 40,
"kt-37572.kt" to 31,
*(if (expectedInlinesCount != 0) arrayOf(
"kt-37572.kt" to 36,
"kt-37572.kt" to 29,
) else emptyArray()),
"kt-37572.kt" to 8,
"kt-37572.kt" to 6)
"kt-37572.kt" to 19,
"kt-37572.kt" to 7)
val (pos, file, line) = regex.find(value)!!.destructured
goldValues[pos.toInt()]?.let {
@@ -1,33 +1,41 @@
import kotlin.text.Regex
import kotlin.test.*
var inlinesCount = 0
var expectedInlinesCount = 0
var expectedExceptionContrFrames = 0
fun exception() {
error("FAIL!")
}
fun main() {
fun main(args: Array<String>) {
val sourceInfoType = args.first()
val (e, i) = when (sourceInfoType) {
"libbacktrace" -> Pair(0, 1)
"coresymbolication" -> Pair(4, 0)
else -> throw AssertionError("Unknown source info type " + sourceInfoType)
}
expectedExceptionContrFrames = e
expectedInlinesCount = i
var actualInlinesCount = 0
try {
exception()
}
catch (e:Exception) {
val stackTrace = e.getStackTrace()
inlinesCount = stackTrace.count { it.contains("[inlined]")}
stackTrace.take(6).forEach(::checkFrame)
actualInlinesCount = stackTrace.count { it.contains("[inlined]")}
stackTrace.take(expectedExceptionContrFrames + 2).forEach(::checkFrame)
}
println(inlinesCount)
assertEquals(expectedInlinesCount, actualInlinesCount)
}
internal val regex = Regex("^(\\d+)\\ +.*/(.*):(\\d+):.*$")
internal fun checkFrame(value:String) {
val goldValues = arrayOf<Pair<String, Int>?>(
null,
null,
null,
null,
*(if (inlinesCount != 0) arrayOf(null) else emptyArray()),
"stack_trace_inline.kt" to 7,
"stack_trace_inline.kt" to 12)
*arrayOfNulls(expectedExceptionContrFrames),
*arrayOfNulls(expectedInlinesCount),
"stack_trace_inline.kt" to 8,
"stack_trace_inline.kt" to 23)
val (pos, file, line) = regex.find(value)!!.destructured
goldValues[pos.toInt()]?.let {
assertEquals(it.first, file)
@@ -0,0 +1,46 @@
import kotlin.text.Regex
import kotlin.test.*
class CustomException(msg: String) : Exception(msg) {
init {
constrException()
}
fun constrException() {
throw Exception("Exception during exception's construction")
}
}
fun exception() {
throw CustomException("Exceptional message")
}
fun main() {
try {
exception()
}
catch (e:Exception) {
val stackTrace = e.getStackTrace().filter { "kfun:" in it }
println("Kotlin part of call stack is:")
for (entry in stackTrace)
println(entry)
println("Verifying...")
val goldValues = arrayOf(
"kfun:CustomException#constrException(){}",
"kfun:#exception(){}",
"kfun:#main(){}",
)
assertEquals(goldValues.size, stackTrace.size)
goldValues.zip(stackTrace).forEach { checkFrame(it.first, it.second) }
println("Passed")
}
}
internal val regex = Regex("(kfun.+) \\+ (\\d+)")
internal fun checkFrame(goldFunName: String, actualLine: String) {
val findResult = regex.find(actualLine)
val (funName, offset) = findResult?.destructured ?: throw Error("Cannot find '$goldFunName + <int>' in $actualLine")
assertEquals(goldFunName, funName)
assertTrue(offset.toInt() > 0)
}