[IR/FIR] Use isExpect from IR element instead of descriptor in

ExpectDeclarationRemover.
This commit is contained in:
Mark Punzalan
2020-05-12 22:55:01 -07:00
committed by Alexander Udalov
parent 23c4eac45b
commit 371c4561a0
11 changed files with 6 additions and 12 deletions
@@ -53,8 +53,12 @@ class ExpectDeclarationRemover(val symbolTable: ReferenceSymbolTable, private va
} }
private fun shouldRemoveTopLevelDeclaration(declaration: IrDeclaration): Boolean { private fun shouldRemoveTopLevelDeclaration(declaration: IrDeclaration): Boolean {
val descriptor = declaration.descriptor return doRemove && when (declaration) {
return doRemove && descriptor is MemberDescriptor && descriptor.isExpect is IrClass -> declaration.isExpect
is IrProperty -> declaration.isExpect
is IrFunction -> declaration.isExpect
else -> false
}
} }
private fun tryCopyDefaultArguments(declaration: IrValueParameter) { private fun tryCopyDefaultArguments(declaration: IrValueParameter) {
@@ -1,6 +1,5 @@
// !LANGUAGE: +MultiPlatformProjects // !LANGUAGE: +MultiPlatformProjects
// IGNORE_BACKEND: JS_IR // IGNORE_BACKEND: JS_IR
// IGNORE_BACKEND_FIR: JVM_IR
// MODULE: lib // MODULE: lib
// FILE: common.kt // FILE: common.kt
@@ -1,5 +1,4 @@
// !LANGUAGE: +MultiPlatformProjects // !LANGUAGE: +MultiPlatformProjects
// IGNORE_BACKEND_FIR: JVM_IR
// IGNORE_BACKEND: NATIVE // IGNORE_BACKEND: NATIVE
// FILE: common.kt // FILE: common.kt
@@ -1,5 +1,4 @@
// !LANGUAGE: +MultiPlatformProjects // !LANGUAGE: +MultiPlatformProjects
// IGNORE_BACKEND_FIR: JVM_IR
// IGNORE_BACKEND: NATIVE // IGNORE_BACKEND: NATIVE
// FILE: common.kt // FILE: common.kt
@@ -1,5 +1,4 @@
// !LANGUAGE: +MultiPlatformProjects // !LANGUAGE: +MultiPlatformProjects
// IGNORE_BACKEND_FIR: JVM_IR
// FILE: common.kt // FILE: common.kt
@@ -1,5 +1,4 @@
// !LANGUAGE: +MultiPlatformProjects // !LANGUAGE: +MultiPlatformProjects
// IGNORE_BACKEND_FIR: JVM_IR
// FILE: common.kt // FILE: common.kt
@@ -1,5 +1,4 @@
// !LANGUAGE: +MultiPlatformProjects // !LANGUAGE: +MultiPlatformProjects
// IGNORE_BACKEND_FIR: JVM_IR
// WITH_RUNTIME // WITH_RUNTIME
// FILE: common.kt // FILE: common.kt
@@ -1,6 +1,5 @@
// !LANGUAGE: +MultiPlatformProjects // !LANGUAGE: +MultiPlatformProjects
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
// IGNORE_BACKEND_FIR: JVM_IR
// WITH_RUNTIME // WITH_RUNTIME
// FILE: common.kt // FILE: common.kt
@@ -2,7 +2,6 @@
// KJS_WITH_FULL_RUNTIME // KJS_WITH_FULL_RUNTIME
// EXPECT_ACTUAL_LINKER // EXPECT_ACTUAL_LINKER
// IGNORE_BACKEND: JS // IGNORE_BACKEND: JS
// IGNORE_BACKEND_FIR: JVM_IR
// MODULE: A // MODULE: A
// FILE: a.kt // FILE: a.kt
@@ -2,7 +2,6 @@
// KJS_WITH_FULL_RUNTIME // KJS_WITH_FULL_RUNTIME
// EXPECT_ACTUAL_LINKER // EXPECT_ACTUAL_LINKER
// IGNORE_BACKEND: JS // IGNORE_BACKEND: JS
// IGNORE_BACKEND_FIR: JVM_IR
// MODULE: A // MODULE: A
// FILE: a.kt // FILE: a.kt
@@ -3,7 +3,6 @@
// EXPECT_ACTUAL_LINKER // EXPECT_ACTUAL_LINKER
// IGNORE_BACKEND: JS // IGNORE_BACKEND: JS
// IGNORE_BACKEND: JS_IR // IGNORE_BACKEND: JS_IR
// IGNORE_BACKEND_FIR: JVM_IR
// MODULE: A // MODULE: A
// FILE: a.kt // FILE: a.kt