From c015b552f61789f031d86c72e756767fff4a9297 Mon Sep 17 00:00:00 2001 From: Svetlana Isakova Date: Tue, 11 Sep 2012 16:30:30 +0400 Subject: [PATCH] add asm constant types to the TYPES_MAP as well --- .../org/jetbrains/jet/codegen/AsmTypeConstants.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/AsmTypeConstants.java b/compiler/backend/src/org/jetbrains/jet/codegen/AsmTypeConstants.java index a721a90eb90..ae386bc4cce 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/AsmTypeConstants.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/AsmTypeConstants.java @@ -26,10 +26,12 @@ import java.util.Map; * @author alex.tkachman */ public class AsmTypeConstants { - public static final Type OBJECT_TYPE = Type.getType(Object.class); - public static final Type JAVA_STRING_TYPE = Type.getType(String.class); - public static final Type JAVA_THROWABLE_TYPE = Type.getType(Throwable.class); - public static final Type JAVA_ARRAY_GENERIC_TYPE = Type.getType(Object[].class); + private static final Map, Type> TYPES_MAP = Maps.newHashMap(); + + public static final Type OBJECT_TYPE = getType(Object.class); + public static final Type JAVA_STRING_TYPE = getType(String.class); + public static final Type JAVA_THROWABLE_TYPE = getType(Throwable.class); + public static final Type JAVA_ARRAY_GENERIC_TYPE = getType(Object[].class); public static final Type JET_NOTHING_TYPE = Type.getObjectType("jet/Nothing"); public static final Type JET_TUPLE0_TYPE = Type.getObjectType("jet/Tuple0"); @@ -47,7 +49,6 @@ public class AsmTypeConstants { public static final Type JET_SHARED_LONG_TYPE = Type.getObjectType("jet/runtime/SharedVar$Long"); public static final Type JET_SHARED_BOOLEAN_TYPE = Type.getObjectType("jet/runtime/SharedVar$Boolean"); - private static final Map, Type> TYPES_MAP = Maps.newHashMap(); public static Type getType(@NotNull Class javaClass) { Type type = TYPES_MAP.get(javaClass);