From 0d1bb9acaf02381b9ab54078ad639ea6f85d72a6 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 28 Oct 2020 20:52:34 +0100 Subject: [PATCH] JVM IR: do not clear BindingContext in bytecode tool window --- .../kotlin/idea/internal/KotlinBytecodeToolWindow.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.kt index 628a64df85b..dcfd2cdc5a6 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.kt @@ -283,7 +283,7 @@ class KotlinBytecodeToolWindow(private val myProject: Project, private val toolW fun compileSingleFile( ktFile: KtFile, - configuration: CompilerConfiguration + initialConfiguration: CompilerConfiguration ): GenerationState? { val platform = ktFile.platform if (!platform.isCommon() && !platform.isJvm()) return null @@ -294,6 +294,10 @@ class KotlinBytecodeToolWindow(private val myProject: Project, private val toolW val bindingContextForFile = resolutionFacade.analyzeWithAllCompilerChecks(listOf(ktFile)).bindingContext + val configuration = initialConfiguration.copy().apply { + put(JVMConfigurationKeys.DO_NOT_CLEAR_BINDING_CONTEXT, true) + } + val (bindingContext, toProcess) = DebuggerUtils.analyzeInlinedFunctions( resolutionFacade, ktFile, configuration.getBoolean(CommonConfigurationKeys.DISABLE_INLINE), bindingContextForFile