[IR/FIR] Use isExpect from IR element instead of descriptor in
ExpectDeclarationRemover.
This commit is contained in:
committed by
Alexander Udalov
parent
23c4eac45b
commit
371c4561a0
@@ -53,8 +53,12 @@ class ExpectDeclarationRemover(val symbolTable: ReferenceSymbolTable, private va
|
||||
}
|
||||
|
||||
private fun shouldRemoveTopLevelDeclaration(declaration: IrDeclaration): Boolean {
|
||||
val descriptor = declaration.descriptor
|
||||
return doRemove && descriptor is MemberDescriptor && descriptor.isExpect
|
||||
return doRemove && when (declaration) {
|
||||
is IrClass -> declaration.isExpect
|
||||
is IrProperty -> declaration.isExpect
|
||||
is IrFunction -> declaration.isExpect
|
||||
else -> false
|
||||
}
|
||||
}
|
||||
|
||||
private fun tryCopyDefaultArguments(declaration: IrValueParameter) {
|
||||
|
||||
-1
@@ -1,6 +1,5 @@
|
||||
// !LANGUAGE: +MultiPlatformProjects
|
||||
// IGNORE_BACKEND: JS_IR
|
||||
// IGNORE_BACKEND_FIR: JVM_IR
|
||||
// MODULE: lib
|
||||
// FILE: common.kt
|
||||
|
||||
|
||||
-1
@@ -1,5 +1,4 @@
|
||||
// !LANGUAGE: +MultiPlatformProjects
|
||||
// IGNORE_BACKEND_FIR: JVM_IR
|
||||
// IGNORE_BACKEND: NATIVE
|
||||
// FILE: common.kt
|
||||
|
||||
|
||||
-1
@@ -1,5 +1,4 @@
|
||||
// !LANGUAGE: +MultiPlatformProjects
|
||||
// IGNORE_BACKEND_FIR: JVM_IR
|
||||
// IGNORE_BACKEND: NATIVE
|
||||
// FILE: common.kt
|
||||
|
||||
|
||||
-1
@@ -1,5 +1,4 @@
|
||||
// !LANGUAGE: +MultiPlatformProjects
|
||||
// IGNORE_BACKEND_FIR: JVM_IR
|
||||
|
||||
// FILE: common.kt
|
||||
|
||||
|
||||
-1
@@ -1,5 +1,4 @@
|
||||
// !LANGUAGE: +MultiPlatformProjects
|
||||
// IGNORE_BACKEND_FIR: JVM_IR
|
||||
|
||||
// FILE: common.kt
|
||||
|
||||
|
||||
-1
@@ -1,5 +1,4 @@
|
||||
// !LANGUAGE: +MultiPlatformProjects
|
||||
// IGNORE_BACKEND_FIR: JVM_IR
|
||||
// WITH_RUNTIME
|
||||
// FILE: common.kt
|
||||
|
||||
|
||||
-1
@@ -1,6 +1,5 @@
|
||||
// !LANGUAGE: +MultiPlatformProjects
|
||||
// TARGET_BACKEND: JVM
|
||||
// IGNORE_BACKEND_FIR: JVM_IR
|
||||
// WITH_RUNTIME
|
||||
// FILE: common.kt
|
||||
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
// KJS_WITH_FULL_RUNTIME
|
||||
// EXPECT_ACTUAL_LINKER
|
||||
// IGNORE_BACKEND: JS
|
||||
// IGNORE_BACKEND_FIR: JVM_IR
|
||||
|
||||
// MODULE: A
|
||||
// FILE: a.kt
|
||||
|
||||
-1
@@ -2,7 +2,6 @@
|
||||
// KJS_WITH_FULL_RUNTIME
|
||||
// EXPECT_ACTUAL_LINKER
|
||||
// IGNORE_BACKEND: JS
|
||||
// IGNORE_BACKEND_FIR: JVM_IR
|
||||
|
||||
// MODULE: A
|
||||
// FILE: a.kt
|
||||
|
||||
-1
@@ -3,7 +3,6 @@
|
||||
// EXPECT_ACTUAL_LINKER
|
||||
// IGNORE_BACKEND: JS
|
||||
// IGNORE_BACKEND: JS_IR
|
||||
// IGNORE_BACKEND_FIR: JVM_IR
|
||||
|
||||
// MODULE: A
|
||||
// FILE: a.kt
|
||||
|
||||
Reference in New Issue
Block a user