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

[JS IR] Add property name to boolean in externals diagnostic

Browse Source
This commit is contained in:
Ilya Goncharov
2021-06-22 16:45:11 +03:00
committed by Space
parent 21a3494bca
commit 82f979b11f
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/BooleanPropertyInExternalLowering.kt
+3 -1
View File
@@ -16,6 +16,7 @@ import org.jetbrains.kotlin.ir.declarations.IrDeclaration
import org.jetbrains.kotlin.ir.expressions.IrBody import org.jetbrains.kotlin.ir.expressions.IrBody
import org.jetbrains.kotlin.ir.expressions.IrCall import org.jetbrains.kotlin.ir.expressions.IrCall
import org.jetbrains.kotlin.ir.expressions.IrExpression import org.jetbrains.kotlin.ir.expressions.IrExpression
import org.jetbrains.kotlin.ir.interpreter.toIrConst
import org.jetbrains.kotlin.ir.util.isEffectivelyExternal import org.jetbrains.kotlin.ir.util.isEffectivelyExternal
import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid
import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid
@@ -77,7 +78,8 @@ class BooleanPropertyInExternalLowering(
val call = JsIrBuilder.buildCall( val call = JsIrBuilder.buildCall(
target = function!! target = function!!
).apply { ).apply {
putValueArgument(0, irGet(tmp)) putValueArgument(0, property.name.identifier.toIrConst(context.irBuiltIns.stringType))
putValueArgument(1, irGet(tmp))
} }
+call +call
libraries/stdlib/js-ir/runtime/booleanInExternalHelpers.kt
+4 -4
View File
@@ -10,14 +10,14 @@ import JsError
@JsName("Boolean") @JsName("Boolean")
internal external fun nativeBoolean(obj: Any?): Boolean internal external fun nativeBoolean(obj: Any?): Boolean
internal fun booleanInExternalLog(obj: dynamic) { internal fun booleanInExternalLog(name: String, obj: dynamic) {
if (jsTypeOf(obj) != "boolean") { if (jsTypeOf(obj) != "boolean") {
console.asDynamic().error("Boolean expected, but actual:", obj) console.asDynamic().error("Boolean expected for '$name', but actual:", obj)
} }
} }
internal fun booleanInExternalException(obj: dynamic) { internal fun booleanInExternalException(name: String, obj: dynamic) {
if (jsTypeOf(obj) != "boolean") { if (jsTypeOf(obj) != "boolean") {
throw JsError("Boolean expected, but actual: $obj") throw JsError("Boolean expected for '$name', but actual: $obj")
} }
} }