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

Fix RetainForTarget annotation usage (#2868)

Browse Source
This commit is contained in:
Sergey Bogolepov
2019-04-15 12:32:39 +07:00
committed by Nikolay Igotti
parent d5096cbb1e
commit 41cae8bb0b
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Interop/JsRuntime/src/main/kotlin/jsinterop.kt
+11 -11
View File
@@ -27,15 +27,15 @@ typealias Pointer = Int
/** /**
* @Retain annotation is required to preserve functions from internalization and DCE. * @Retain annotation is required to preserve functions from internalization and DCE.
*/ */
@RetainForTarget("wasm") @RetainForTarget("wasm32")
@SymbolName("Konan_js_allocateArena") @SymbolName("Konan_js_allocateArena")
external public fun allocateArena(): Arena external public fun allocateArena(): Arena
@RetainForTarget("wasm") @RetainForTarget("wasm32")
@SymbolName("Konan_js_freeArena") @SymbolName("Konan_js_freeArena")
external public fun freeArena(arena: Arena) external public fun freeArena(arena: Arena)
@RetainForTarget("wasm") @RetainForTarget("wasm32")
@SymbolName("Konan_js_pushIntToArena") @SymbolName("Konan_js_pushIntToArena")
external public fun pushIntToArena(arena: Arena, value: Int) external public fun pushIntToArena(arena: Arena, value: Int)
@@ -49,15 +49,15 @@ fun doubleUpper(value: Double): Int =
fun doubleLower(value: Double): Int = fun doubleLower(value: Double): Int =
(value.toBits() and 0x00000000ffffffff) .toInt() (value.toBits() and 0x00000000ffffffff) .toInt()
@RetainForTarget("wasm") @RetainForTarget("wasm32")
@SymbolName("ReturnSlot_getDouble") @SymbolName("ReturnSlot_getDouble")
external public fun ReturnSlot_getDouble(): Double external public fun ReturnSlot_getDouble(): Double
@RetainForTarget("wasm") @RetainForTarget("wasm32")
@SymbolName("Kotlin_String_utf16pointer") @SymbolName("Kotlin_String_utf16pointer")
external public fun stringPointer(message: String): Pointer external public fun stringPointer(message: String): Pointer
@RetainForTarget("wasm") @RetainForTarget("wasm32")
@SymbolName("Kotlin_String_utf16length") @SymbolName("Kotlin_String_utf16length")
external public fun stringLengthBytes(message: String): Int external public fun stringLengthBytes(message: String): Int
@@ -68,7 +68,7 @@ fun <R> wrapFunction(func: KtFunction<R>): Int {
return ptr.toInt() // TODO: LP64 unsafe. return ptr.toInt() // TODO: LP64 unsafe.
} }
@RetainForTarget("wasm") @RetainForTarget("wasm32")
@ExportForCppRuntime("Konan_js_runLambda") @ExportForCppRuntime("Konan_js_runLambda")
fun runLambda(pointer: Int, argumentsArena: Arena, argumentsArenaSize: Int): Int { fun runLambda(pointer: Int, argumentsArena: Arena, argumentsArenaSize: Int): Int {
val arguments = arrayListOf<JsValue>() val arguments = arrayListOf<JsValue>()
@@ -104,19 +104,19 @@ open class JsArray(arena: Arena, index: Object): JsValue(arena, index) {
get() = this.getInt("length") get() = this.getInt("length")
} }
@RetainForTarget("wasm") @RetainForTarget("wasm32")
@SymbolName("Konan_js_getInt") @SymbolName("Konan_js_getInt")
external public fun getInt(arena: Arena, obj: Object, propertyPtr: Pointer, propertyLen: Int): Int; external public fun getInt(arena: Arena, obj: Object, propertyPtr: Pointer, propertyLen: Int): Int;
@RetainForTarget("wasm") @RetainForTarget("wasm32")
@SymbolName("Konan_js_getProperty") @SymbolName("Konan_js_getProperty")
external public fun Konan_js_getProperty(arena: Arena, obj: Object, propertyPtr: Pointer, propertyLen: Int): Int; external public fun Konan_js_getProperty(arena: Arena, obj: Object, propertyPtr: Pointer, propertyLen: Int): Int;
@RetainForTarget("wasm") @RetainForTarget("wasm32")
@SymbolName("Konan_js_setFunction") @SymbolName("Konan_js_setFunction")
external public fun setFunction(arena: Arena, obj: Object, propertyName: Pointer, propertyLength: Int , function: Int) external public fun setFunction(arena: Arena, obj: Object, propertyName: Pointer, propertyLength: Int , function: Int)
@RetainForTarget("wasm") @RetainForTarget("wasm32")
@SymbolName("Konan_js_setString") @SymbolName("Konan_js_setString")
external public fun setString(arena: Arena, obj: Object, propertyName: Pointer, propertyLength: Int, stringPtr: Pointer, stringLength: Int ) external public fun setString(arena: Arena, obj: Object, propertyName: Pointer, propertyLength: Int, stringPtr: Pointer, stringLength: Int )