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

[Wasm] Rename WasmImportPair -> WasmImportDescriptor

Browse Source
This commit is contained in:
Svyatoslav Kuzmich
2022-12-28 10:11:11 +01:00
parent dd53998c2d
commit 62217b39ec
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/DeclarationGenerator.kt
+1 -1
View File
@@ -84,7 +84,7 @@ class DeclarationGenerator(
// check(declaration.isExternal) { "Non-external fun with @JsFun ${declaration.fqNameWhenAvailable}"}
val jsCodeName = jsCodeName(declaration)
context.addJsFun(jsCodeName, jsCode)
WasmImportPair("js_code", jsCodeName(declaration))
WasmImportDescriptor("js_code", jsCodeName(declaration))
}
else -> {
null
compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/utils/Annotations.kt
+3 -3
View File
@@ -16,17 +16,17 @@ import org.jetbrains.kotlin.ir.util.defaultType
import org.jetbrains.kotlin.ir.util.getAnnotation
import org.jetbrains.kotlin.ir.util.hasAnnotation
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.wasm.ir.WasmImportPair
import org.jetbrains.kotlin.wasm.ir.WasmImportDescriptor
fun IrAnnotationContainer.hasExcludedFromCodegenAnnotation(): Boolean =
hasAnnotation(FqName("kotlin.wasm.internal.ExcludedFromCodegen"))
fun IrFunction.getWasmImportDescriptor(): WasmImportPair? {
fun IrFunction.getWasmImportDescriptor(): WasmImportDescriptor? {
val annotation = getAnnotation(FqName("kotlin.wasm.WasmImport"))
?: return null
@Suppress("UNCHECKED_CAST")
return WasmImportPair(
return WasmImportDescriptor(
(annotation.getValueArgument(0) as IrConst<String>).value,
(annotation.getValueArgument(1) as? IrConst<String>)?.value ?: this.name.asString()
)