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

Remove unnecessary code about handling KotlinNullPointerException

Browse Source 
This part of code was necessary because jvm threw
KotlinNullPointerException, but js expected NullPointerException.
This commit is contained in:
Ivan Kylchik
2020-04-08 15:31:52 +03:00
parent 2f41eef797
commit fe7abb7132
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/interpreter/IrInterpreter.kt
+1 -10
View File
@@ -128,16 +128,7 @@ class IrInterpreter(irModule: IrModuleFragment) {
// catch exception from JVM such as: ArithmeticException, StackOverflowError and others // catch exception from JVM such as: ArithmeticException, StackOverflowError and others
val exceptionName = e::class.java.simpleName val exceptionName = e::class.java.simpleName
val irExceptionClass = irExceptions.firstOrNull { it.name.asString() == exceptionName } ?: irBuiltIns.throwableClass.owner val irExceptionClass = irExceptions.firstOrNull { it.name.asString() == exceptionName } ?: irBuiltIns.throwableClass.owner
data.pushReturnValue(ExceptionState(e, irExceptionClass, stackTrace))
val exceptionState = when {
// this block is used to replace jvm null pointer exception with common one
// TODO figure something better
irExceptionClass == irBuiltIns.throwableClass.owner && exceptionName == "KotlinNullPointerException" ->
ExceptionState(e, irExceptions.first { it.name.asString() == "NullPointerException" }, stackTrace)
else -> ExceptionState(e, irExceptionClass, stackTrace)
}
data.pushReturnValue(exceptionState)
return Exception return Exception
} }
} }