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

Native: remove harmful assertions from NaiveSourceBasedFileEntryImpl

Browse Source 
These assertions checked that nobody requests line and column number
for the UNDEFINED_OFFSET.
But diagnostic and crash reporting tools might request line and column,
and crashing during crash reporting is not great.

So handle UNDEFINED_OFFSET gracefully instead, in a conventional manner.
This commit is contained in:
Svyatoslav Scherbina
2021-12-17 14:49:34 +00:00
committed by Space
parent ab7615adaf
commit 3fd4d90cca
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/AdditionalIrUtils.kt
+2 -2
View File
@@ -206,14 +206,14 @@ class NaiveSourceBasedFileEntryImpl(
} }
override fun getLineNumber(offset: Int): Int { override fun getLineNumber(offset: Int): Int {
assert(offset != UNDEFINED_OFFSET)
if (offset == SYNTHETIC_OFFSET) return 0 if (offset == SYNTHETIC_OFFSET) return 0
if (offset < 0) return -1
return calculatedBeforeLineNumbers.get(offset) return calculatedBeforeLineNumbers.get(offset)
} }
override fun getColumnNumber(offset: Int): Int { override fun getColumnNumber(offset: Int): Int {
assert(offset != UNDEFINED_OFFSET)
if (offset == SYNTHETIC_OFFSET) return 0 if (offset == SYNTHETIC_OFFSET) return 0
if (offset < 0) return -1
val lineNumber = getLineNumber(offset) val lineNumber = getLineNumber(offset)
return offset - lineStartOffsets[lineNumber] return offset - lineStartOffsets[lineNumber]
} }