From 766377a041ecea17ce8b5ed243df3614a2811ec3 Mon Sep 17 00:00:00 2001 From: Svyatoslav Kuzmich Date: Mon, 25 Oct 2021 13:34:46 +0300 Subject: [PATCH] [Wasm] Remove WasmForeign annotation No longer needed since external interfaces are supported --- .../jetbrains/kotlin/backend/wasm/ir2wasm/TypeTransformer.kt | 3 +-- .../org/jetbrains/kotlin/backend/wasm/utils/Annotations.kt | 3 --- .../wasm/internal/kotlin/wasm/internal/WasmAnnotations.kt | 4 ---- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/TypeTransformer.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/TypeTransformer.kt index e09ea0b8800..fb242be2d45 100644 --- a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/TypeTransformer.kt +++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/TypeTransformer.kt @@ -5,7 +5,6 @@ package org.jetbrains.kotlin.backend.wasm.ir2wasm -import org.jetbrains.kotlin.backend.wasm.utils.hasWasmForeignAnnotation import org.jetbrains.kotlin.ir.IrBuiltIns import org.jetbrains.kotlin.ir.declarations.IrClass import org.jetbrains.kotlin.ir.declarations.IrTypeParameter @@ -100,7 +99,7 @@ class WasmTypeTransformer( val klass = this.getClass() val ic = context.backendContext.inlineClassesUtils.getInlinedClass(this) - if (klass != null && (klass.hasWasmForeignAnnotation() || klass.isExternal)) { + if (klass != null && klass.isExternal) { WasmAnyRef } else if (klass != null && isBuiltInWasmRefType(this)) { when (val name = klass.name.identifier) { diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/utils/Annotations.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/utils/Annotations.kt index ea0a3947a53..ff6503ea12d 100644 --- a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/utils/Annotations.kt +++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/utils/Annotations.kt @@ -26,9 +26,6 @@ fun IrAnnotationContainer.getWasmOpAnnotation(): String? = fun IrAnnotationContainer.hasWasmNoOpCastAnnotation(): Boolean = hasAnnotation(FqName("kotlin.wasm.internal.WasmNoOpCast")) -fun IrAnnotationContainer.hasWasmForeignAnnotation(): Boolean = - hasAnnotation(FqName("kotlin.wasm.internal.WasmForeign")) - fun IrAnnotationContainer.hasWasmAutoboxedAnnotation(): Boolean = hasAnnotation(FqName("kotlin.wasm.internal.WasmAutoboxed")) diff --git a/libraries/stdlib/wasm/internal/kotlin/wasm/internal/WasmAnnotations.kt b/libraries/stdlib/wasm/internal/kotlin/wasm/internal/WasmAnnotations.kt index ff37c298534..a64d94619b0 100644 --- a/libraries/stdlib/wasm/internal/kotlin/wasm/internal/WasmAnnotations.kt +++ b/libraries/stdlib/wasm/internal/kotlin/wasm/internal/WasmAnnotations.kt @@ -17,10 +17,6 @@ internal annotation class ExcludedFromCodegen @Retention(AnnotationRetention.BINARY) internal annotation class WasmImport(val module: String, val name: String) -@Target(CLASS) -@Retention(AnnotationRetention.BINARY) -internal annotation class WasmForeign - @Target(CLASS) @Retention(AnnotationRetention.BINARY) internal annotation class WasmArrayOf(