Skip to content

Commit f4690eb

Browse files
committed
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
1 parent 1bb40af commit f4690eb

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import com.intellij.psi.search.GlobalSearchScope
2424
import org.jetbrains.kotlin.analyzer.AnalysisResult
2525
import org.jetbrains.kotlin.builtins.JvmBuiltInsPackageFragmentProvider
2626
import org.jetbrains.kotlin.config.CommonConfigurationKeys
27+
import org.jetbrains.kotlin.config.CommonConfigurationKeys.LANGUAGE_VERSION_SETTINGS
2728
import org.jetbrains.kotlin.config.CompilerConfiguration
2829
import org.jetbrains.kotlin.config.JVMConfigurationKeys
2930
import org.jetbrains.kotlin.config.LanguageVersionSettingsImpl
@@ -56,7 +57,6 @@ import org.jetbrains.kotlin.platform.JvmBuiltIns
5657
import org.jetbrains.kotlin.psi.KtFile
5758
import org.jetbrains.kotlin.resolve.BindingTrace
5859
import org.jetbrains.kotlin.resolve.LazyTopDownAnalyzer
59-
import org.jetbrains.kotlin.resolve.MultiTargetPlatform
6060
import org.jetbrains.kotlin.resolve.TopDownAnalysisMode
6161
import org.jetbrains.kotlin.resolve.jvm.extensions.AnalysisHandlerExtension
6262
import org.jetbrains.kotlin.resolve.jvm.extensions.PackageFragmentProviderExtension
@@ -253,6 +253,7 @@ object TopDownAnalyzerFacadeForJVM {
253253
fun createContextWithSealedModule(project: Project, configuration: CompilerConfiguration): MutableModuleContext =
254254
createModuleContext(project, configuration, false).apply {
255255
setDependencies(module, module.builtIns.builtInsModule)
256+
(module.builtIns as JvmBuiltIns).initialize(module, configuration.get(LANGUAGE_VERSION_SETTINGS, LanguageVersionSettingsImpl.DEFAULT))
256257
}
257258

258259
private fun createModuleContext(

0 commit comments

Comments
 (0)