From f4690ebff9b0e761db2a3d1497ce3b2654f84567 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Wed, 8 Feb 2017 11:00:40 +0300 Subject: [PATCH] Initialize JvmBuiltins for module configuration used in test This method is only used within tests, and they didn't fail mostly by coincidence. But because of more eager reading of JvmBuiltIns.isAdditionalBuiltInsFeatureSupported (that checks if built-ins have been initialized) these tests started failing --- .../kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 92a34108627..c779026e224 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 @@ -24,6 +24,7 @@ import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.kotlin.analyzer.AnalysisResult import org.jetbrains.kotlin.builtins.JvmBuiltInsPackageFragmentProvider import org.jetbrains.kotlin.config.CommonConfigurationKeys +import org.jetbrains.kotlin.config.CommonConfigurationKeys.LANGUAGE_VERSION_SETTINGS import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.JVMConfigurationKeys import org.jetbrains.kotlin.config.LanguageVersionSettingsImpl @@ -56,7 +57,6 @@ import org.jetbrains.kotlin.platform.JvmBuiltIns import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.resolve.BindingTrace import org.jetbrains.kotlin.resolve.LazyTopDownAnalyzer -import org.jetbrains.kotlin.resolve.MultiTargetPlatform import org.jetbrains.kotlin.resolve.TopDownAnalysisMode import org.jetbrains.kotlin.resolve.jvm.extensions.AnalysisHandlerExtension import org.jetbrains.kotlin.resolve.jvm.extensions.PackageFragmentProviderExtension @@ -253,6 +253,7 @@ object TopDownAnalyzerFacadeForJVM { fun createContextWithSealedModule(project: Project, configuration: CompilerConfiguration): MutableModuleContext = createModuleContext(project, configuration, false).apply { setDependencies(module, module.builtIns.builtInsModule) + (module.builtIns as JvmBuiltIns).initialize(module, configuration.get(LANGUAGE_VERSION_SETTINGS, LanguageVersionSettingsImpl.DEFAULT)) } private fun createModuleContext(