From 4455532210d0d7d08911523db70e530227393f24 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Mon, 25 May 2020 15:46:44 +0300 Subject: [PATCH] JsIntrinsics: use createEmptyExternalPackageFragment --- .../src/org/jetbrains/kotlin/ir/backend/js/JsIntrinsics.kt | 5 ++--- .../org/jetbrains/kotlin/ir/backend/js/JsIrBackendContext.kt | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsIntrinsics.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsIntrinsics.kt index 82c3ff66c1f..976a907e2e4 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsIntrinsics.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsIntrinsics.kt @@ -31,9 +31,8 @@ import java.util.* class JsIntrinsics(private val irBuiltIns: IrBuiltIns, val context: JsIrBackendContext) { - private val externalPackageFragmentSymbol = IrExternalPackageFragmentSymbolImpl(context.internalPackageFragmentDescriptor) - val externalPackageFragment = IrExternalPackageFragmentImpl( - externalPackageFragmentSymbol, context.internalPackageFragmentDescriptor.fqName + val externalPackageFragment = IrExternalPackageFragmentImpl.createEmptyExternalPackageFragment( + context.builtIns.builtInsModule, FqName("kotlin.js.internal") ) // TODO: Should we drop operator intrinsics in favor of IrDynamicOperatorExpression? diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsIrBackendContext.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsIrBackendContext.kt index 7cfb0a132e1..509d42893f3 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsIrBackendContext.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsIrBackendContext.kt @@ -90,7 +90,7 @@ class JsIrBackendContext( val packageLevelJsModules = mutableSetOf() val declarationLevelJsModules = mutableListOf() - val internalPackageFragmentDescriptor = EmptyPackageFragmentDescriptor(builtIns.builtInsModule, FqName("kotlin.js.internal")) + private val internalPackageFragmentDescriptor = EmptyPackageFragmentDescriptor(builtIns.builtInsModule, FqName("kotlin.js.internal")) val implicitDeclarationFile by lazy2 { IrFileImpl(object : SourceManager.FileEntry { override val name = ""