From 4c52ce37d2a7fc11ab0388612af6cf3fa5e4b28c Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 20 Oct 2016 11:02:05 +0300 Subject: [PATCH] Drop TargetPlatform in utilities for module creation --- .../resolve/jvm/TopDownAnalyzerFacadeForJVM.kt | 5 ++--- .../jetbrains/kotlin/analyzer/AnalyzerFacade.kt | 3 +-- .../src/org/jetbrains/kotlin/context/context.kt | 15 +-------------- .../jetbrains/kotlin/resolve/TargetPlatform.kt | 14 -------------- .../jetbrains/kotlin/test/KotlinTestUtils.java | 5 ++--- ...AdditionalBuiltInsMembersSignatureListsTest.kt | 3 +-- .../kotlin/checkers/AbstractDiagnosticsTest.java | 5 +---- .../AbstractDiagnosticsTestWithJsStdLib.java | 4 +--- .../AbstractBuiltInsWithJDKMembersTest.kt | 3 +-- .../builtins/BuiltInsSerializerTest.kt | 4 +--- .../js/KotlinJavascriptSerializerTest.kt | 2 +- .../navigation/SourceNavigationHelper.java | 5 +++-- ...tlinJavaScriptDecompiledTextConsistencyTest.kt | 2 +- .../js/analyze/TopDownAnalyzerFacadeForJS.kt | 3 +-- .../org/jetbrains/kotlin/js/config/JsConfig.java | 7 +++---- 15 files changed, 20 insertions(+), 60 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.kt index 4f924219766..582cad1ce6e 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.kt @@ -55,7 +55,6 @@ import org.jetbrains.kotlin.resolve.LazyTopDownAnalyzer import org.jetbrains.kotlin.resolve.TopDownAnalysisMode import org.jetbrains.kotlin.resolve.jvm.extensions.AnalysisCompletedHandlerExtension import org.jetbrains.kotlin.resolve.jvm.extensions.PackageFragmentProviderExtension -import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform import org.jetbrains.kotlin.resolve.lazy.KotlinCodeAnalyzer import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactory import org.jetbrains.kotlin.resolve.lazy.declarations.FileBasedDeclarationProviderFactory @@ -118,7 +117,7 @@ object TopDownAnalyzerFacadeForJVM { val dependencyModule = if (separateModules) { val dependenciesContext = ContextForNewModule( moduleContext, Name.special(""), - JvmPlatform, module.builtIns + module.builtIns ) // Scope for the dependency module contains everything except files present in the scope for the source module @@ -222,7 +221,7 @@ object TopDownAnalyzerFacadeForJVM { val projectContext = ProjectContext(project) return ContextForNewModule( projectContext, Name.special("<${configuration.getNotNull(CommonConfigurationKeys.MODULE_NAME)}>"), - JvmPlatform, JvmBuiltIns(projectContext.storageManager) + JvmBuiltIns(projectContext.storageManager) ) } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt index 2843dab7ab1..a3580ba9ae9 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt @@ -35,7 +35,6 @@ import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.resolve.CompilerEnvironment import org.jetbrains.kotlin.resolve.TargetEnvironment import org.jetbrains.kotlin.resolve.TargetPlatform -import org.jetbrains.kotlin.resolve.createModule import org.jetbrains.kotlin.utils.singletonOrEmptyList import java.util.* @@ -161,7 +160,7 @@ abstract class AnalyzerFacade { modules.forEach { module -> descriptorByModule[module] = - targetPlatform.createModule(module.name, storageManager, builtIns, module.capabilities) + ModuleDescriptorImpl(module.name, storageManager, builtIns, module.capabilities) } return ResolverForProjectImpl(debugName, descriptorByModule, delegateResolver) } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/context/context.kt b/compiler/frontend/src/org/jetbrains/kotlin/context/context.kt index 81780494858..1ee2d07f4ab 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/context/context.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/context/context.kt @@ -22,8 +22,6 @@ import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.descriptors.PackageFragmentProvider import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.resolve.TargetPlatform -import org.jetbrains.kotlin.resolve.createModule import org.jetbrains.kotlin.storage.ExceptionTracker import org.jetbrains.kotlin.storage.LockBasedStorageManager import org.jetbrains.kotlin.storage.StorageManager @@ -96,22 +94,11 @@ fun ModuleContext(module: ModuleDescriptor, project: Project): ModuleContext = fun GlobalContext.withProject(project: Project): ProjectContext = ProjectContextImpl(project, this) fun ProjectContext.withModule(module: ModuleDescriptor): ModuleContext = ModuleContextImpl(module, this) -fun ContextForNewModule(project: Project, moduleName: Name, builtIns: KotlinBuiltIns): MutableModuleContext { - val projectContext = ProjectContext(project) +fun ContextForNewModule(projectContext: ProjectContext, moduleName: Name, builtIns: KotlinBuiltIns): MutableModuleContext { val module = ModuleDescriptorImpl(moduleName, projectContext.storageManager, builtIns) return MutableModuleContextImpl(module, projectContext) } -fun ContextForNewModule( - projectContext: ProjectContext, - moduleName: Name, - targetPlatform: TargetPlatform, - builtIns: KotlinBuiltIns -): MutableModuleContext { - val module = targetPlatform.createModule(moduleName, projectContext.storageManager, builtIns) - return MutableModuleContextImpl(module, projectContext) -} - @Deprecated("Used temporarily while we are in transition from to lazy resolve") open class TypeLazinessToken { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TargetPlatform.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TargetPlatform.kt index 80c1a73b4e5..13685d4330c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TargetPlatform.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TargetPlatform.kt @@ -16,20 +16,15 @@ package org.jetbrains.kotlin.resolve -import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.container.StorageComponentContainer import org.jetbrains.kotlin.container.composeContainer import org.jetbrains.kotlin.container.useInstance -import org.jetbrains.kotlin.descriptors.ModuleDescriptor -import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl -import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap import org.jetbrains.kotlin.resolve.calls.checkers.* import org.jetbrains.kotlin.resolve.calls.results.TypeSpecificityComparator import org.jetbrains.kotlin.resolve.checkers.* import org.jetbrains.kotlin.resolve.scopes.SyntheticConstructorsProvider import org.jetbrains.kotlin.resolve.scopes.SyntheticScopes -import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.kotlin.types.DynamicTypesSettings import java.util.* @@ -113,14 +108,5 @@ abstract class PlatformConfigurator( } } -@JvmOverloads -fun TargetPlatform.createModule( - name: Name, - storageManager: StorageManager, - builtIns: KotlinBuiltIns, - capabilities: Map, Any?> = emptyMap() -) = ModuleDescriptorImpl(name, storageManager, builtIns, capabilities) - - fun createContainer(id: String, platform: TargetPlatform, init: StorageComponentContainer.() -> Unit) = composeContainer(id, platform.platformConfigurator.platformSpecificContainer, init) diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java b/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java index 342c491b904..808ce999e94 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java +++ b/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java @@ -68,7 +68,6 @@ import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.psi.KtPsiFactoryKt; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingTrace; -import org.jetbrains.kotlin.resolve.TargetPlatform; import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics; import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil; import org.jetbrains.kotlin.storage.LockBasedStorageManager; @@ -956,11 +955,11 @@ public class KotlinTestUtils { @NotNull public static ModuleDescriptorImpl createEmptyModule(@NotNull String name) { - return createEmptyModule(name, TargetPlatform.Default.INSTANCE, DefaultBuiltIns.getInstance()); + return createEmptyModule(name, DefaultBuiltIns.getInstance()); } @NotNull - public static ModuleDescriptorImpl createEmptyModule(@NotNull String name, @NotNull TargetPlatform platform, KotlinBuiltIns builtIns) { + public static ModuleDescriptorImpl createEmptyModule(@NotNull String name, @NotNull KotlinBuiltIns builtIns) { return new ModuleDescriptorImpl(Name.special(name), LockBasedStorageManager.NO_LOCKS, builtIns); } diff --git a/compiler/tests-java8/tests/org/jetbrains/kotlin/serialization/builtins/AdditionalBuiltInsMembersSignatureListsTest.kt b/compiler/tests-java8/tests/org/jetbrains/kotlin/serialization/builtins/AdditionalBuiltInsMembersSignatureListsTest.kt index c95f151c33d..9f216ddb943 100644 --- a/compiler/tests-java8/tests/org/jetbrains/kotlin/serialization/builtins/AdditionalBuiltInsMembersSignatureListsTest.kt +++ b/compiler/tests-java8/tests/org/jetbrains/kotlin/serialization/builtins/AdditionalBuiltInsMembersSignatureListsTest.kt @@ -32,7 +32,6 @@ import org.jetbrains.kotlin.platform.JvmBuiltIns import org.jetbrains.kotlin.resolve.descriptorUtil.isEffectivelyPublicApi import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolver import org.jetbrains.kotlin.resolve.jvm.JvmClassName -import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactory import org.jetbrains.kotlin.storage.LockBasedStorageManager import org.jetbrains.kotlin.test.ConfigurationKind @@ -47,7 +46,7 @@ class AdditionalBuiltInsMembersSignatureListsTest : KotlinTestWithEnvironment() fun testAllListedSignaturesExistInJdk() { val jvmBuiltIns = JvmBuiltIns(LockBasedStorageManager.NO_LOCKS) - val emptyModule = KotlinTestUtils.createEmptyModule("", JvmPlatform, jvmBuiltIns) + val emptyModule = KotlinTestUtils.createEmptyModule("", jvmBuiltIns) val container = createContainerForTopDownSingleModuleAnalyzerForJvm( ModuleContext(emptyModule, environment.project), CliLightClassGenerationSupport.CliBindingTrace(), diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.java b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.java index 8ab16c75a7c..a0d2176adf6 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.java @@ -63,7 +63,6 @@ import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics; import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolver; import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM; -import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform; import org.jetbrains.kotlin.resolve.lazy.KotlinCodeAnalyzer; import org.jetbrains.kotlin.resolve.lazy.declarations.FileBasedDeclarationProviderFactory; import org.jetbrains.kotlin.storage.ExceptionTracker; @@ -465,9 +464,7 @@ public abstract class AbstractDiagnosticsTest extends BaseDiagnosticsTest { @NotNull protected ModuleDescriptorImpl createModule(@NotNull String moduleName, @NotNull StorageManager storageManager) { - JvmBuiltIns builtIns = new JvmBuiltIns(storageManager); - return TargetPlatformKt.createModule( - JvmPlatform.INSTANCE, Name.special(moduleName), storageManager, builtIns); + return new ModuleDescriptorImpl(Name.special(moduleName), storageManager, new JvmBuiltIns(storageManager)); } @NotNull diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTestWithJsStdLib.java b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTestWithJsStdLib.java index 0b5c58cc598..c1ce3f8f44d 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTestWithJsStdLib.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTestWithJsStdLib.java @@ -33,7 +33,6 @@ import org.jetbrains.kotlin.js.resolve.JsPlatform; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.resolve.BindingTrace; -import org.jetbrains.kotlin.resolve.TargetPlatformKt; import org.jetbrains.kotlin.serialization.js.JsModuleDescriptor; import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.kotlin.test.KotlinTestUtils; @@ -89,8 +88,7 @@ public abstract class AbstractDiagnosticsTestWithJsStdLib extends AbstractDiagno @NotNull @Override protected ModuleDescriptorImpl createModule(@NotNull String moduleName, @NotNull StorageManager storageManager) { - return TargetPlatformKt.createModule( - JsPlatform.INSTANCE, Name.special(moduleName), storageManager, JsPlatform.INSTANCE.getBuiltIns()); + return new ModuleDescriptorImpl(Name.special(moduleName), storageManager, JsPlatform.INSTANCE.getBuiltIns()); } @NotNull diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/AbstractBuiltInsWithJDKMembersTest.kt b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/AbstractBuiltInsWithJDKMembersTest.kt index c1a6470d054..3b376aa4b47 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/AbstractBuiltInsWithJDKMembersTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/AbstractBuiltInsWithJDKMembersTest.kt @@ -30,7 +30,6 @@ import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.kotlin.renderer.DescriptorRendererModifier import org.jetbrains.kotlin.renderer.OverrideRenderingPolicy import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolver -import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactory import org.jetbrains.kotlin.storage.LockBasedStorageManager import org.jetbrains.kotlin.test.ConfigurationKind @@ -56,7 +55,7 @@ abstract class AbstractBuiltInsWithJDKMembersTest : KotlinTestWithEnvironment() }) val jvmBuiltIns = JvmBuiltIns(LockBasedStorageManager.NO_LOCKS) - val emptyModule = KotlinTestUtils.createEmptyModule("", JvmPlatform, jvmBuiltIns) + val emptyModule = KotlinTestUtils.createEmptyModule("", jvmBuiltIns) val container = createContainerForTopDownSingleModuleAnalyzerForJvm( ModuleContext(emptyModule, environment.project), CliLightClassGenerationSupport.CliBindingTrace(), diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerTest.kt b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerTest.kt index a55d5798b56..55790dda73b 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerTest.kt @@ -20,7 +20,6 @@ import org.jetbrains.kotlin.builtins.DefaultBuiltIns import org.jetbrains.kotlin.builtins.createBuiltInPackageFragmentProvider import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime import org.jetbrains.kotlin.jvm.compiler.LoadDescriptorUtil.TEST_PACKAGE_FQNAME -import org.jetbrains.kotlin.resolve.TargetPlatform import org.jetbrains.kotlin.serialization.deserialization.ClassDescriptorFactory import org.jetbrains.kotlin.serialization.deserialization.PlatformDependentDeclarationFilter import org.jetbrains.kotlin.storage.LockBasedStorageManager @@ -40,8 +39,7 @@ class BuiltInsSerializerTest : TestCaseWithTmpdir() { onComplete = { totalSize, totalFiles -> } ) - val platform = TargetPlatform.Default - val module = KotlinTestUtils.createEmptyModule("", platform, DefaultBuiltIns.Instance) + val module = KotlinTestUtils.createEmptyModule("", DefaultBuiltIns.Instance) val packageFragmentProvider = createBuiltInPackageFragmentProvider( LockBasedStorageManager(), module, setOf(TEST_PACKAGE_FQNAME), ClassDescriptorFactory.EMPTY, diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializerTest.kt b/compiler/tests/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializerTest.kt index 51a3b68acb1..0c21008c6b9 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializerTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializerTest.kt @@ -85,7 +85,7 @@ class KotlinJavascriptSerializerTest : TestCaseWithTmpdir() { } private fun deserialize(metaFile: File): ModuleDescriptorImpl { - val module = KotlinTestUtils.createEmptyModule("<${KotlinTestUtils.TEST_MODULE_NAME}>", JsPlatform, JsPlatform.builtIns) + val module = KotlinTestUtils.createEmptyModule("<${KotlinTestUtils.TEST_MODULE_NAME}>", JsPlatform.builtIns) val metadata = KotlinJavascriptMetadataUtils.loadMetadata(metaFile) assert(metadata.size == 1) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/SourceNavigationHelper.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/SourceNavigationHelper.java index 1a0ffa42cc8..0f79f1c1e0a 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/SourceNavigationHelper.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/SourceNavigationHelper.java @@ -235,8 +235,9 @@ public class SourceNavigationHelper { @NotNull Collection candidates, @NotNull Project project ) { - MutableModuleContext newModuleContext = - ContextKt.ContextForNewModule(project, Name.special(""), DefaultBuiltIns.getInstance()); + MutableModuleContext newModuleContext = ContextKt.ContextForNewModule( + ContextKt.ProjectContext(project), Name.special(""), DefaultBuiltIns.getInstance() + ); newModuleContext.setDependencies(newModuleContext.getModule(), newModuleContext.getModule().getBuiltIns().getBuiltInsModule()); diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/KotlinJavaScriptDecompiledTextConsistencyTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/KotlinJavaScriptDecompiledTextConsistencyTest.kt index 86bfffab95d..125d96c9482 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/KotlinJavaScriptDecompiledTextConsistencyTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/KotlinJavaScriptDecompiledTextConsistencyTest.kt @@ -49,7 +49,7 @@ class KotlinJavaScriptDecompiledTextConsistencyTest : TextConsistencyBaseTest() override fun getModuleDescriptor(): ModuleDescriptor { val stdlibJar = PathUtil.getKotlinPathsForDistDirectory().jsStdLibJarPath.absolutePath - val module = KotlinTestUtils.createEmptyModule("", JsPlatform, JsPlatform.builtIns) + val module = KotlinTestUtils.createEmptyModule("", JsPlatform.builtIns) val metadata = KotlinJavascriptMetadataUtils.loadMetadata(stdlibJar) assert(metadata.size == 1) diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/TopDownAnalyzerFacadeForJS.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/TopDownAnalyzerFacadeForJS.kt index 7d952b79f6c..fa4f8c341ac 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/TopDownAnalyzerFacadeForJS.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/TopDownAnalyzerFacadeForJS.kt @@ -33,8 +33,7 @@ import org.jetbrains.kotlin.resolve.lazy.declarations.FileBasedDeclarationProvid object TopDownAnalyzerFacadeForJS { @JvmStatic fun analyzeFiles(files: Collection, config: JsConfig): JsAnalysisResult { - val context = - ContextForNewModule(ProjectContext(config.project), Name.special("<${config.moduleId}>"), JsPlatform, JsPlatform.builtIns) + val context = ContextForNewModule(ProjectContext(config.project), Name.special("<${config.moduleId}>"), JsPlatform.builtIns) context.setDependencies( listOf(context.module) + config.moduleDescriptors.map { it.data } + diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/config/JsConfig.java b/js/js.frontend/src/org/jetbrains/kotlin/js/config/JsConfig.java index c2e8dddff15..d7eaecb1e2a 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/config/JsConfig.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/config/JsConfig.java @@ -33,7 +33,6 @@ import org.jetbrains.kotlin.js.resolve.JsPlatform; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.resolve.CompilerDeserializationConfiguration; -import org.jetbrains.kotlin.resolve.TargetPlatformKt; import org.jetbrains.kotlin.serialization.js.JsModuleDescriptor; import org.jetbrains.kotlin.serialization.js.KotlinJavascriptSerializationUtil; import org.jetbrains.kotlin.serialization.js.ModuleKind; @@ -133,9 +132,9 @@ public abstract class JsConfig { "expected abi version " + KotlinJavascriptMetadataUtils.ABI_VERSION + ", but metadata.abiVersion = " + metadata.getAbiVersion(); - ModuleDescriptorImpl moduleDescriptor = TargetPlatformKt.createModule( - JsPlatform.INSTANCE, Name.special("<" + metadata.getModuleName() + ">"), storageManager, - JsPlatform.INSTANCE.getBuiltIns()); + ModuleDescriptorImpl moduleDescriptor = new ModuleDescriptorImpl( + Name.special("<" + metadata.getModuleName() + ">"), storageManager, JsPlatform.INSTANCE.getBuiltIns() + ); JsModuleDescriptor rawDescriptor = KotlinJavascriptSerializationUtil.readModule( metadata.getBody(), storageManager, moduleDescriptor, new CompilerDeserializationConfiguration(