commit 77f7d9a446d662be1d1be266cb8ff9d378e8ce02
author Leland Richardson <lelandr@google.com> Thu Sep 16 09:28:21 2021 -0700
committer Leland Richardson <lelandr@google.com> Thu Sep 23 15:40:56 2021 -0700
tree b01b4cef5d0f32c839d720651d8f4bdb8c96224a
parent 946f0843e4602c08a4a3eb3e4ce9c0d9dc656578

Use correct operator name

Change-Id: Ie5461bb4c694214d3084199be22a455ede33874f

compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/AbstractComposeLowering.kt

diff --git a/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/AbstractComposeLowering.kt b/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/AbstractComposeLowering.kt
index 7f2efdf..3437af9 100644
--- a/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/AbstractComposeLowering.kt
+++ b/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/AbstractComposeLowering.kt
@@ -54,7 +54,6 @@
 import org.jetbrains.kotlin.ir.IrStatement
 import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
 import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
-import org.jetbrains.kotlin.ir.backend.js.utils.OperatorNames
 import org.jetbrains.kotlin.ir.builders.IrBlockBodyBuilder
 import org.jetbrains.kotlin.ir.builders.IrBuilderWithScope
 import org.jetbrains.kotlin.ir.builders.declarations.buildField
@@ -149,6 +148,7 @@
 import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe
 import org.jetbrains.kotlin.resolve.source.PsiSourceElement
 import org.jetbrains.kotlin.types.KotlinType
+import org.jetbrains.kotlin.util.OperatorNameConventions
 import org.jetbrains.kotlin.utils.DFS
 
 @Suppress("DEPRECATION")
@@ -626,7 +626,7 @@
 
     protected fun irAnd(lhs: IrExpression, rhs: IrExpression): IrCallImpl {
         return irCall(
-            lhs.type.binaryOperator(OperatorNames.AND, rhs.type),
+            lhs.type.binaryOperator(OperatorNameConventions.AND, rhs.type),
             null,
             lhs,
             null,
@@ -637,7 +637,7 @@
     protected fun irInv(lhs: IrExpression): IrCallImpl {
         val int = context.irBuiltIns.intType
         return irCall(
-            int.unaryOperator(OperatorNames.INV),
+            int.unaryOperator(OperatorNameConventions.INV),
             null,
             lhs
         )
@@ -646,7 +646,7 @@
     protected fun irOr(lhs: IrExpression, rhs: IrExpression): IrCallImpl {
         val int = context.irBuiltIns.intType
         return irCall(
-            int.binaryOperator(OperatorNames.OR, int),
+            int.binaryOperator(OperatorNameConventions.OR, int),
             null,
             lhs,
             null,
@@ -657,7 +657,7 @@
     protected fun irBooleanOr(lhs: IrExpression, rhs: IrExpression): IrCallImpl {
         val boolean = context.irBuiltIns.booleanType
         return irCall(
-            boolean.binaryOperator(OperatorNames.OR, boolean),
+            boolean.binaryOperator(OperatorNameConventions.OR, boolean),
             null,
             lhs,
             null,
@@ -714,7 +714,7 @@
     protected fun irXor(lhs: IrExpression, rhs: IrExpression): IrCallImpl {
         val int = context.irBuiltIns.intType
         return irCall(
-            int.binaryOperator(OperatorNames.XOR, int),
+            int.binaryOperator(OperatorNameConventions.XOR, int),
             null,
             lhs,
             null,