From dbb360555ccb4910d3455b5c918f5b1a40a6cf62 Mon Sep 17 00:00:00 2001 From: Roman Artemev Date: Fri, 8 Jun 2018 21:58:28 +0300 Subject: [PATCH] [JS IR BE] Fix logic boolean operations --- .../kotlin/ir/backend/js/lower/IntrinsicifyCallsLowering.kt | 4 ++-- .../testData/box/expression/evaluationOrder/booleanAndOr.kt | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/IntrinsicifyCallsLowering.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/IntrinsicifyCallsLowering.kt index 313ec78f37b..5896b04bc4e 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/IntrinsicifyCallsLowering.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/IntrinsicifyCallsLowering.kt @@ -72,8 +72,8 @@ class IntrinsicifyCallsLowering(private val context: JsIrBackendContext) : FileL } context.irBuiltIns.bool.let { - op(it, OperatorNames.AND, context.intrinsics.jsAnd) - op(it, OperatorNames.OR, context.intrinsics.jsOr) + op(it, OperatorNames.AND, context.intrinsics.jsBitAnd) + op(it, OperatorNames.OR, context.intrinsics.jsBitOr) op(it, OperatorNames.NOT, context.intrinsics.jsNot) op(it, OperatorNames.XOR, context.intrinsics.jsBitXor) } diff --git a/js/js.translator/testData/box/expression/evaluationOrder/booleanAndOr.kt b/js/js.translator/testData/box/expression/evaluationOrder/booleanAndOr.kt index 5dedc8757bc..4b57b72404b 100644 --- a/js/js.translator/testData/box/expression/evaluationOrder/booleanAndOr.kt +++ b/js/js.translator/testData/box/expression/evaluationOrder/booleanAndOr.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JS_IR // EXPECTED_REACHABLE_NODES: 1135 var log = ""