From d86b9c8f544356bb9cb4530620196aa17a37d5d9 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Tue, 21 Apr 2015 03:37:22 +0300
Subject: [PATCH] Drop unused primitive wrapper mapping in JavaToKotlinClassMap

---
 .../jetbrains/kotlin/platform/JavaToKotlinClassMap.java   | 4 +---
 .../src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java | 8 --------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JavaToKotlinClassMap.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JavaToKotlinClassMap.java
index bdcd6acde5c..ea5ba6099c9 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JavaToKotlinClassMap.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JavaToKotlinClassMap.java
@@ -49,12 +49,10 @@ public class JavaToKotlinClassMap extends JavaToKotlinClassMapBuilder implements
         for (JvmPrimitiveType jvmPrimitiveType : JvmPrimitiveType.values()) {
             PrimitiveType primitiveType = jvmPrimitiveType.getPrimitiveType();
             String name = jvmPrimitiveType.getName();
-            FqName wrapperFqName = jvmPrimitiveType.getWrapperFqName();
 
-            register(wrapperFqName, builtIns.getPrimitiveClassDescriptor(primitiveType));
+            register(jvmPrimitiveType.getWrapperFqName(), builtIns.getPrimitiveClassDescriptor(primitiveType));
             primitiveTypesMap.put(name, builtIns.getPrimitiveJetType(primitiveType));
             primitiveTypesMap.put("[" + name, builtIns.getPrimitiveArrayJetType(primitiveType));
-            primitiveTypesMap.put(wrapperFqName.asString(), builtIns.getNullablePrimitiveJetType(primitiveType));
         }
         primitiveTypesMap.put("void", builtIns.getUnitType());
 
diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java
index c5908163e43..33568332478 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java
+++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java
@@ -101,7 +101,6 @@ public class KotlinBuiltIns {
     private final ModuleDescriptorImpl builtInsModule;
     private final BuiltinsPackageFragment builtinsPackageFragment;
 
-    private final Map<PrimitiveType, JetType> primitiveTypeToNullableJetType;
     private final Map<PrimitiveType, JetType> primitiveTypeToArrayJetType;
     private final Map<JetType, JetType> primitiveJetTypeToJetArrayType;
     private final Map<JetType, JetType> jetArrayTypeToPrimitiveJetType;
@@ -129,7 +128,6 @@ public class KotlinBuiltIns {
 
         builtinsPackageFragment = (BuiltinsPackageFragment) single(packageFragmentProvider.getPackageFragments(BUILT_INS_PACKAGE_FQ_NAME));
 
-        primitiveTypeToNullableJetType = new EnumMap<PrimitiveType, JetType>(PrimitiveType.class);
         primitiveTypeToArrayJetType = new EnumMap<PrimitiveType, JetType>(PrimitiveType.class);
         primitiveJetTypeToJetArrayType = new HashMap<JetType, JetType>();
         jetArrayTypeToPrimitiveJetType = new HashMap<JetType, JetType>();
@@ -145,7 +143,6 @@ public class KotlinBuiltIns {
         JetType type = getBuiltInTypeByClassName(primitiveType.getTypeName().asString());
         JetType arrayType = getBuiltInTypeByClassName(primitiveType.getArrayTypeName().asString());
 
-        primitiveTypeToNullableJetType.put(primitiveType, TypeUtils.makeNullable(type));
         primitiveTypeToArrayJetType.put(primitiveType, arrayType);
         primitiveJetTypeToJetArrayType.put(type, arrayType);
         jetArrayTypeToPrimitiveJetType.put(arrayType, type);
@@ -511,11 +508,6 @@ public class KotlinBuiltIns {
         return getPrimitiveClassDescriptor(type).getDefaultType();
     }
 
-    @NotNull
-    public JetType getNullablePrimitiveJetType(@NotNull PrimitiveType primitiveType) {
-        return primitiveTypeToNullableJetType.get(primitiveType);
-    }
-
     @NotNull
     public JetType getByteType() {
         return getPrimitiveJetType(BYTE);