From 52a93f189eaf84c13bce159e07d9a521bf7709bf Mon Sep 17 00:00:00 2001 From: Roman Artemev Date: Thu, 14 May 2020 13:33:11 +0300 Subject: [PATCH] [JS SCRIPT] Fix IrBuiltIns to make it stable if symbols already defined --- .../src/org/jetbrains/kotlin/ir/descriptors/IrBuiltIns.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBuiltIns.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBuiltIns.kt index 34653c94edd..8db05a9fdda 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBuiltIns.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBuiltIns.kt @@ -60,7 +60,7 @@ class IrBuiltIns( operatorDescriptor.addValueParameter(valueParameterDescriptor) } - val symbol = symbolTable.declareSimpleFunction(UNDEFINED_OFFSET, UNDEFINED_OFFSET, BUILTIN_OPERATOR, operatorDescriptor) { + val symbol = symbolTable.declareSimpleFunctionIfNotExists(operatorDescriptor) { val operator = IrBuiltInOperator(it, Name.identifier(name), returnType) operator.parent = packageFragment packageFragment.declarations += operator @@ -134,7 +134,7 @@ class IrBuiltIns( buildSimpleType() } - return symbolTable.declareSimpleFunction(UNDEFINED_OFFSET, UNDEFINED_OFFSET, BUILTIN_OPERATOR, operatorDescriptor) { + return symbolTable.declareSimpleFunctionIfNotExists(operatorDescriptor) { val operator = IrBuiltInOperator(it, name, returnIrType) operator.parent = packageFragment packageFragment.declarations += operator