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

EA-210823: Fix AIE in breakpoint applicability test

Browse Source
This commit is contained in:
Yan Zhulanow
2019-11-14 22:31:48 +09:00
parent ab06f772fc
commit 16c4b0e458
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinLineBreakpoint.kt
+7 -5
View File
@@ -16,6 +16,7 @@ import com.sun.jdi.AbsentInformationException
import com.sun.jdi.ReferenceType import com.sun.jdi.ReferenceType
import org.jetbrains.kotlin.codegen.inline.KOTLIN_STRATA_NAME import org.jetbrains.kotlin.codegen.inline.KOTLIN_STRATA_NAME
import org.jetbrains.kotlin.idea.debugger.isDexDebug import org.jetbrains.kotlin.idea.debugger.isDexDebug
import org.jetbrains.kotlin.idea.debugger.safeSourceName
import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtElement
import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
import org.jetbrains.kotlin.util.containingNonLocalDeclaration import org.jetbrains.kotlin.util.containingNonLocalDeclaration
@@ -50,14 +51,15 @@ class KotlinLineBreakpoint(
val lineNumber = sourcePosition.line + 1 val lineNumber = sourcePosition.line + 1
for (location in allLineLocations) { for (location in allLineLocations) {
try { val kotlinFileName = location.safeSourceName(KOTLIN_STRATA_NAME)
val kotlinFileName = location.sourceName(KOTLIN_STRATA_NAME) val kotlinLineNumber = location.lineNumber(KOTLIN_STRATA_NAME)
val kotlinLineNumber = location.lineNumber(KOTLIN_STRATA_NAME)
if (kotlinFileName != null) {
if (kotlinFileName == fileName && kotlinLineNumber == lineNumber) { if (kotlinFileName == fileName && kotlinLineNumber == lineNumber) {
return true return true
} }
} catch (e: AbsentInformationException) { } else {
if (location.sourceName() == fileName && location.lineNumber() == lineNumber) { if (location.safeSourceName() == fileName && location.lineNumber() == lineNumber) {
return true return true
} }
} }
idea/jvm-debugger/jvm-debugger-util/src/org/jetbrains/kotlin/idea/debugger/safeUtil.kt
+7 -1
View File
@@ -62,7 +62,11 @@ fun StackFrameProxy.safeLocation(): Location? {
} }
fun Location.safeSourceName(): String? { fun Location.safeSourceName(): String? {
return DebuggerUtilsEx.getSourceName(this) { null } return wrapAbsentInformationException { this.sourceName() }
}
fun Location.safeSourceName(stratum: String): String? {
return wrapAbsentInformationException { this.sourceName(stratum) }
} }
fun Location.safeLineNumber(): Int { fun Location.safeLineNumber(): Int {
@@ -92,6 +96,8 @@ private inline fun <T> wrapAbsentInformationException(block: () -> T): T? {
null null
} catch (e: AbsentInformationEvaluateException) { } catch (e: AbsentInformationEvaluateException) {
null null
} catch (e: InternalException) {
null
} }
} }