From f21d8a4c5baa13f57c77f35028d12a8e44ccc5dc Mon Sep 17 00:00:00 2001
From: Georgy Bronnikov <georgy.bronnikov@jetbrains.com>
Date: Tue, 11 Aug 2020 15:15:33 +0300
Subject: [PATCH] JVM_IR, minor: use vals instead of objects

---
 .../kotlin/backend/jvm/intrinsics/IrIntrinsicMethods.kt   | 8 ++++----
 .../kotlin/backend/jvm/intrinsics/ThrowIntrinsics.kt      | 6 +-----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrIntrinsicMethods.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrIntrinsicMethods.kt
index 16e8ccf1897..b4355e3119a 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrIntrinsicMethods.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrIntrinsicMethods.kt
@@ -113,10 +113,10 @@ class IrIntrinsicMethods(val irBuiltIns: IrBuiltIns, val symbols: JvmSymbols) {
                 symbols.unsafeCoerceIntrinsic.toKey()!! to UnsafeCoerce,
                 symbols.signatureStringIntrinsic.toKey()!! to SignatureString,
                 symbols.reassignParameterIntrinsic.toKey()!! to ReassignParameter,
-                symbols.throwNullPointerException.toKey() to ThrowNullPointerException,
-                symbols.throwTypeCastException.toKey() to ThrowTypeCastException,
-                symbols.throwUnsupportedOperationException.toKey() to ThrowUnsupportedOperationException,
-                symbols.throwKotlinNothingValueException.toKey()!! to ThrowKotlinNothingValueException
+                symbols.throwNullPointerException.toKey()!! to ThrowException(Type.getObjectType("java/lang/NullPointerException")),
+                symbols.throwTypeCastException.toKey()!! to ThrowException(Type.getObjectType("kotlin/TypeCastException")),
+                symbols.throwUnsupportedOperationException.toKey()!! to ThrowException(Type.getObjectType("java/lang/UnsupportedOperationException")),
+                symbols.throwKotlinNothingValueException.toKey()!! to ThrowKotlinNothingValueException,
             ) +
                     numberConversionMethods() +
                     unaryFunForPrimitives("plus", UnaryPlus) +
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/ThrowIntrinsics.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/ThrowIntrinsics.kt
index 46ccf40588d..80b4ee6f251 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/ThrowIntrinsics.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/ThrowIntrinsics.kt
@@ -12,7 +12,7 @@ import org.jetbrains.kotlin.ir.expressions.IrFunctionAccessExpression
 import org.jetbrains.kotlin.resolve.jvm.AsmTypes
 import org.jetbrains.org.objectweb.asm.Type
 
-abstract class ThrowException(val exceptionClass: Type) : IntrinsicMethod() {
+class ThrowException(val exceptionClass: Type) : IntrinsicMethod() {
     override fun invoke(expression: IrFunctionAccessExpression, codegen: ExpressionCodegen, data: BlockInfo): PromisedValue? {
         with(codegen) {
             mv.anew(exceptionClass)
@@ -25,7 +25,3 @@ abstract class ThrowException(val exceptionClass: Type) : IntrinsicMethod() {
     }
 }
 
-object ThrowNullPointerException : ThrowException(Type.getObjectType("java/lang/NullPointerException"))
-object ThrowTypeCastException : ThrowException(Type.getObjectType("kotlin/TypeCastException"))
-object ThrowUnsupportedOperationException : ThrowException(Type.getObjectType("java/lang/UnsupportedOperationException"))
-