azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Debugger: Fix 'expect fun' evaluation from common code (KT-26742)

Browse Source
This commit is contained in:
Yan Zhulanow
2019-06-14 22:33:27 +09:00
parent 873f4a1b08
commit 6d7d524b9b
4 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluatorBuilder.kt
+13 -8
View File
@@ -69,6 +69,8 @@ import org.jetbrains.org.objectweb.asm.*
import org.jetbrains.org.objectweb.asm.tree.ClassNode
import org.jetbrains.kotlin.idea.debugger.evaluate.EvaluationStatus.EvaluationContextLanguage
import org.jetbrains.kotlin.idea.debugger.evaluate.compilingEvaluator.ClassLoadingResult
import org.jetbrains.kotlin.idea.resolve.ResolutionFacade
import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
import java.util.*
internal val LOG = Logger.getInstance(KotlinEvaluator::class.java)
@@ -209,10 +211,8 @@ class KotlinEvaluator(val codeFragment: KtCodeFragment, val sourcePosition: Sour
}
val (bindingContext) = runReadAction {
DebuggerUtils.analyzeInlinedFunctions(
KotlinCacheService.getInstance(codeFragment.project).getResolutionFacade(listOf(codeFragment)),
codeFragment, false, analysisResult.bindingContext
)
val resolutionFacade = getResolutionFacadeForCodeFragment(codeFragment)
DebuggerUtils.analyzeInlinedFunctions(resolutionFacade, codeFragment, false, analysisResult.bindingContext)
}
val moduleDescriptor = analysisResult.moduleDescriptor
@@ -263,12 +263,11 @@ class KotlinEvaluator(val codeFragment: KtCodeFragment, val sourcePosition: Sour
evaluationException(e.message ?: e.toString())
}
val filesToAnalyze = listOf(codeFragment)
val resolutionFacade = KotlinCacheService.getInstance(codeFragment.project).getResolutionFacade(filesToAnalyze)
val resolutionFacade = getResolutionFacadeForCodeFragment(codeFragment)
DebugLabelPropertyDescriptorProvider(codeFragment, debugProcess).supplyDebugLabels()
val analysisResult = resolutionFacade.analyzeWithAllCompilerChecks(filesToAnalyze)
val analysisResult = resolutionFacade.analyzeWithAllCompilerChecks(listOf(codeFragment))
if (analysisResult.isError()) {
status.error(EvaluationError.FrontendException)
@@ -508,4 +507,10 @@ fun createCompiledDataDescriptor(result: CodeFragmentCompiler.CompilationResult,
}
private fun evaluationException(msg: String): Nothing = throw EvaluateExceptionUtil.createEvaluateException(msg)
private fun evaluationException(e: Throwable): Nothing = throw EvaluateExceptionUtil.createEvaluateException(e)
private fun evaluationException(e: Throwable): Nothing = throw EvaluateExceptionUtil.createEvaluateException(e)
internal fun getResolutionFacadeForCodeFragment(codeFragment: KtCodeFragment): ResolutionFacade {
val filesToAnalyze = listOf(codeFragment)
val kotlinCacheService = KotlinCacheService.getInstance(codeFragment.project)
return kotlinCacheService.getResolutionFacade(filesToAnalyze, JvmPlatforms.unspecifiedJvmPlatform)
}
idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/compilation/CodeFragmentCompiler.kt
+1 -1
View File
@@ -65,7 +65,7 @@ class CodeFragmentCompiler(private val executionContext: ExecutionContext) {
}
val project = codeFragment.project
val resolutionFacade = KotlinCacheService.getInstance(project).getResolutionFacade(listOf(codeFragment))
val resolutionFacade = getResolutionFacadeForCodeFragment(codeFragment)
val resolveSession = resolutionFacade.getFrontendService(ResolveSession::class.java)
val moduleDescriptorWrapper = EvaluatorModuleDescriptor(codeFragment, moduleDescriptor, resolveSession)