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

Write a copy of SMAP to a new annotation

Browse Source 
To make it available for dynamically attached JVMTI agents.

`@SourceDebugExtension` annotation value is equal to the
SourceDebugExtension attribute value, which is checked now for all box
tests. The difference is that the annotation stored in the constant
pool, which is available for dynamically attached JVMTI agents.

 #KT-53438 Fixed
This commit is contained in:
Alexander Udalov
2022-07-13 14:10:08 +02:00
parent 1e6f7f6d58
commit 87d3ce6ded
7 changed files with 109 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/codegen/BytecodeListingTextCollectingVisitor.kt
+20 -5
View File
@@ -250,7 +250,9 @@ class BytecodeListingTextCollectingVisitor(
override fun visitAnnotation(desc: String, visible: Boolean): AnnotationVisitor? =
visitAnnotationImpl { args ->
classAnnotations.add("@" + renderAnnotation(desc, args))
renderClassAnnotation(desc, args)?.let {
classAnnotations.add("@$it")
}
}
private fun visitAnnotationImpl(end: (List<String>) -> Unit): AnnotationVisitor? =
@@ -300,12 +302,25 @@ class BytecodeListingTextCollectingVisitor(
private fun renderAnnotation(desc: String, args: List<String>): String {
val name = Type.getType(desc).className
return if (args.isEmpty() || desc == "Lkotlin/Metadata;" || desc == "Lkotlin/coroutines/jvm/internal/DebugMetadata;")
name
else
"$name(${args.joinToString(", ")})"
return renderAnnotationArguments(args, name)
}
private fun renderClassAnnotation(desc: String, args: List<String>): String? {
// Don't render @SourceDebugExtension to avoid difference in text dumps of full and light analysis, because the compiler never
// generates it in the light analysis mode (since method bodies are not analyzed and we don't know if there's an inline call there).
if (desc == "Lkotlin/jvm/internal/SourceDebugExtension;") return null
val name = Type.getType(desc).className
// Don't render contents of @Metadata/@DebugMetadata because they're binary.
if (desc == "Lkotlin/Metadata;" || desc == "Lkotlin/coroutines/jvm/internal/DebugMetadata;") return name
return renderAnnotationArguments(args, name)
}
private fun renderAnnotationArguments(args: List<String>, name: String): String =
if (args.isEmpty()) name else "$name(${args.joinToString(", ")})"
override fun visit(version: Int, access: Int, name: String, signature: String?, superName: String?, interfaces: Array<out String>?) {
className = name
classAccess = access