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

Tests: tweak light analysis mode test filters

Browse Source 
Do not compare private and synthetic methods between full and light
analysis modes, some private fields, and InnerClasses attributes. This
is needed to prepare these tests for migration to JVM IR.
This commit is contained in:
Alexander Udalov
2023-06-20 12:34:28 +02:00
parent f56bbd68d7
commit 6cce510319
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractLightAnalysisModeTest.kt
+9 -3
View File
@@ -112,10 +112,12 @@ abstract class AbstractLightAnalysisModeTest : CodegenTestCase() {
} }
override fun shouldWriteMethod(access: Int, name: String, desc: String) = when { override fun shouldWriteMethod(access: Int, name: String, desc: String) = when {
access and ACC_SYNTHETIC != 0 -> false
access and ACC_PRIVATE != 0 -> false
name == "<clinit>" -> false name == "<clinit>" -> false
name.contains("\$\$forInline") -> false name.contains("\$\$forInline") -> false
AsmTypes.DEFAULT_CONSTRUCTOR_MARKER.descriptor in desc -> false AsmTypes.DEFAULT_CONSTRUCTOR_MARKER.descriptor in desc -> false
name.startsWith("access$") && (access and ACC_STATIC != 0) && (access and ACC_SYNTHETIC != 0) -> false name.startsWith("access$") && (access and ACC_STATIC != 0) -> false
else -> true else -> true
} }
@@ -123,11 +125,15 @@ abstract class AbstractLightAnalysisModeTest : CodegenTestCase() {
name == "\$assertionsDisabled" -> false name == "\$assertionsDisabled" -> false
name == "\$VALUES" && (access and ACC_PRIVATE != 0) && (access and ACC_FINAL != 0) && (access and ACC_SYNTHETIC != 0) -> false name == "\$VALUES" && (access and ACC_PRIVATE != 0) && (access and ACC_FINAL != 0) && (access and ACC_SYNTHETIC != 0) -> false
name == JvmAbi.DELEGATED_PROPERTIES_ARRAY_NAME && (access and ACC_SYNTHETIC != 0) -> false name == JvmAbi.DELEGATED_PROPERTIES_ARRAY_NAME && (access and ACC_SYNTHETIC != 0) -> false
name.endsWith("\$receiver") -> false
JvmAbi.DELEGATED_PROPERTY_NAME_SUFFIX in name -> false
else -> true else -> true
} }
override fun shouldWriteInnerClass(name: String, outerName: String?, innerName: String?) = // Generated InnerClasses attributes depend on which types are used in method bodies, so they can easily be non-equal
outerName != null && innerName != null // among full and light analysis modes.
override fun shouldWriteInnerClass(name: String, outerName: String?, innerName: String?, access: Int): Boolean =
false
override val shouldTransformAnonymousTypes: Boolean override val shouldTransformAnonymousTypes: Boolean
get() = true get() = true
compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/codegen/BytecodeListingTextCollectingVisitor.kt
+6 -4
View File
@@ -77,14 +77,14 @@ class BytecodeListingTextCollectingVisitor(
fun shouldWriteClass(node: ClassNode): Boolean fun shouldWriteClass(node: ClassNode): Boolean
fun shouldWriteMethod(access: Int, name: String, desc: String): Boolean fun shouldWriteMethod(access: Int, name: String, desc: String): Boolean
fun shouldWriteField(access: Int, name: String, desc: String): Boolean fun shouldWriteField(access: Int, name: String, desc: String): Boolean
fun shouldWriteInnerClass(name: String, outerName: String?, innerName: String?): Boolean fun shouldWriteInnerClass(name: String, outerName: String?, innerName: String?, access: Int): Boolean
val shouldTransformAnonymousTypes: Boolean val shouldTransformAnonymousTypes: Boolean
object EMPTY : Filter { object EMPTY : Filter {
override fun shouldWriteClass(node: ClassNode) = true override fun shouldWriteClass(node: ClassNode) = true
override fun shouldWriteMethod(access: Int, name: String, desc: String) = true override fun shouldWriteMethod(access: Int, name: String, desc: String) = true
override fun shouldWriteField(access: Int, name: String, desc: String) = true override fun shouldWriteField(access: Int, name: String, desc: String) = true
override fun shouldWriteInnerClass(name: String, outerName: String?, innerName: String?) = true override fun shouldWriteInnerClass(name: String, outerName: String?, innerName: String?, access: Int) = true
override val shouldTransformAnonymousTypes: Boolean get() = false override val shouldTransformAnonymousTypes: Boolean get() = false
} }
@@ -92,7 +92,9 @@ class BytecodeListingTextCollectingVisitor(
override fun shouldWriteClass(node: ClassNode): Boolean = !node.name.startsWith("helpers/") override fun shouldWriteClass(node: ClassNode): Boolean = !node.name.startsWith("helpers/")
override fun shouldWriteMethod(access: Int, name: String, desc: String): Boolean = true override fun shouldWriteMethod(access: Int, name: String, desc: String): Boolean = true
override fun shouldWriteField(access: Int, name: String, desc: String): Boolean = true override fun shouldWriteField(access: Int, name: String, desc: String): Boolean = true
override fun shouldWriteInnerClass(name: String, outerName: String?, innerName: String?): Boolean = !name.startsWith("helpers/") override fun shouldWriteInnerClass(name: String, outerName: String?, innerName: String?, access: Int): Boolean =
!name.startsWith("helpers/")
override val shouldTransformAnonymousTypes: Boolean get() = false override val shouldTransformAnonymousTypes: Boolean get() = false
} }
} }
@@ -351,7 +353,7 @@ class BytecodeListingTextCollectingVisitor(
} }
override fun visitInnerClass(name: String, outerName: String?, innerName: String?, access: Int) { override fun visitInnerClass(name: String, outerName: String?, innerName: String?, access: Int) {
if (!filter.shouldWriteInnerClass(name, outerName, innerName)) { if (!filter.shouldWriteInnerClass(name, outerName, innerName, access)) {
return return
} }