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

[JVM] Don't rely on presence of signatures in JVM IR serialization tests

Browse Source 
This patch should not change any reasonable testing behavior. The only
case when the behavior could be changed is when two different functions
have the same IdSignature, which is a problem on its own.

Required for KT-64809
This commit is contained in:
Sergej Jaskiewicz
2024-01-16 14:28:32 +01:00
committed by Space Team
parent 7d35c1087e
commit 731eeb020d
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/IrInlineBodiesHandler.kt
+5 -5
View File
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.TestServices
class IrInlineBodiesHandler(testServices: TestServices) : AbstractIrHandler(testServices) { class IrInlineBodiesHandler(testServices: TestServices) : AbstractIrHandler(testServices) {
val declaredInlineFunctionSignatures = mutableSetOf<IdSignature>() val declaredInlineFunctions = hashSetOf<IrSimpleFunction>()
@OptIn(ObsoleteDescriptorBasedAPI::class) @OptIn(ObsoleteDescriptorBasedAPI::class)
override fun processModule(module: TestModule, info: IrBackendInput) { override fun processModule(module: TestModule, info: IrBackendInput) {
@@ -33,7 +33,7 @@ class IrInlineBodiesHandler(testServices: TestServices) : AbstractIrHandler(test
} }
override fun processAfterAllModules(someAssertionWasFailed: Boolean) { override fun processAfterAllModules(someAssertionWasFailed: Boolean) {
assertions.assertTrue(declaredInlineFunctionSignatures.isNotEmpty()) assertions.assertTrue(declaredInlineFunctions.isNotEmpty())
} }
inner class InlineFunctionsCollector : IrElementVisitorVoid { inner class InlineFunctionsCollector : IrElementVisitorVoid {
@@ -42,7 +42,7 @@ class IrInlineBodiesHandler(testServices: TestServices) : AbstractIrHandler(test
} }
override fun visitSimpleFunction(declaration: IrSimpleFunction) { override fun visitSimpleFunction(declaration: IrSimpleFunction) {
if (declaration.isInline) declaration.symbol.signature?.let { declaredInlineFunctionSignatures.add(it) } if (declaration.isInline) declaredInlineFunctions.add(declaration)
super.visitSimpleFunction(declaration) super.visitSimpleFunction(declaration)
} }
} }
@@ -56,8 +56,8 @@ class IrInlineBodiesHandler(testServices: TestServices) : AbstractIrHandler(test
val symbol = expression.symbol val symbol = expression.symbol
assertions.assertTrue(symbol.isBound) assertions.assertTrue(symbol.isBound)
val callee = symbol.owner val callee = symbol.owner
if (callee.symbol.signature in declaredInlineFunctionSignatures) { if (callee is IrSimpleFunction && callee in declaredInlineFunctions) {
val trueCallee = (callee as IrSimpleFunction).resolveFakeOverrideOrFail() val trueCallee = callee.resolveFakeOverrideOrFail()
assertions.assertTrue(trueCallee.hasBody()) { assertions.assertTrue(trueCallee.hasBody()) {
"IrInlineBodiesHandler: function with body expected" "IrInlineBodiesHandler: function with body expected"
} }