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

JVM IR: Avoid IndexOutOfBounds exceptions in TypeOperatorLowering

Browse Source 
The code didn't account for SYNTHETIC_OFFSETs (KT-45688) and could
throw on IR containing broken line numbers (KT-44910).
This commit is contained in:
Steven Schäfer
2021-03-29 15:04:09 +02:00
committed by TeamCityServer
parent 6567b0e8ad
commit a7f8f0d903
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/TypeOperatorLowering.kt
+12 -5
View File
@@ -408,7 +408,14 @@ private class TypeOperatorLowering(private val context: JvmBackendContext) : Fil
"${owner.name.asString()}(...)" "${owner.name.asString()}(...)"
} else { } else {
val (startOffset, endOffset) = expression.extents() val (startOffset, endOffset) = expression.extents()
sourceViewFor(parent as IrDeclaration).subSequence(startOffset, endOffset).toString() val declarationParent = parent as? IrDeclaration
val sourceView = declarationParent?.let(::sourceViewFor)
if (sourceView != null && startOffset >= 0 && endOffset < sourceView.length) {
sourceView.subSequence(startOffset, endOffset).toString()
} else {
// Fallback for inconsistent line numbers
declarationParent.safeAs<IrDeclarationWithName>()?.name?.asString() ?: "Unknown Declaration"
}
} }
irLetS(expression.argument.transformVoid(), irType = context.irBuiltIns.anyNType) { valueSymbol -> irLetS(expression.argument.transformVoid(), irType = context.irBuiltIns.anyNType) { valueSymbol ->
@@ -434,14 +441,14 @@ private class TypeOperatorLowering(private val context: JvmBackendContext) : Fil
origin == IrDeclarationOrigin.DELEGATED_MEMBER origin == IrDeclarationOrigin.DELEGATED_MEMBER
private fun IrElement.extents(): Pair<Int, Int> { private fun IrElement.extents(): Pair<Int, Int> {
var startOffset = UNDEFINED_OFFSET var startOffset = Int.MAX_VALUE
var endOffset = UNDEFINED_OFFSET var endOffset = 0
acceptVoid(object : IrElementVisitorVoid { acceptVoid(object : IrElementVisitorVoid {
override fun visitElement(element: IrElement) { override fun visitElement(element: IrElement) {
element.acceptChildrenVoid(this) element.acceptChildrenVoid(this)
if (startOffset == UNDEFINED_OFFSET || element.startOffset != UNDEFINED_OFFSET && element.startOffset < startOffset) if (element.startOffset in 0 until startOffset)
startOffset = element.startOffset startOffset = element.startOffset
if (endOffset == UNDEFINED_OFFSET || element.endOffset != UNDEFINED_OFFSET && endOffset < element.endOffset) if (endOffset < element.endOffset)
endOffset = element.endOffset endOffset = element.endOffset
} }
}) })