Fix build after subtle change of Enum.name from function to property

core/descriptor.loader.java/src/org/jetbrains/kotlin/resolve/jvm/JvmPrimitiveType.java

@@ -44,7 +44,7 @@ public enum JvmPrimitiveType {
 
         for (JvmPrimitiveType type : values()) {
             WRAPPERS_CLASS_NAMES.add(type.getWrapperFqName());
-            TYPE_BY_NAME.put(type.getName(), type);
+            TYPE_BY_NAME.put(type.getJavaKeywordName(), type);
             TYPE_BY_PRIMITIVE_TYPE.put(type.getPrimitiveType(), type);
         }
     }
@@ -85,7 +85,7 @@ public enum JvmPrimitiveType {
     }
 
     @NotNull
-    public String getName() {
+    public String getJavaKeywordName() {
         return name;
     }
 

j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt

@@ -174,7 +174,7 @@ class DefaultExpressionConverter : JavaElementVisitor(), ExpressionConverter {
     override fun visitClassObjectAccessExpression(expression: PsiClassObjectAccessExpression) {
         val operand = expression.getOperand()
         val typeName = operand.getType().getCanonicalText()
-        val primitiveType = JvmPrimitiveType.values().firstOrNull { it.getName() == typeName }
+        val primitiveType = JvmPrimitiveType.values().firstOrNull { it.getJavaKeywordName() == typeName }
         val wrapperTypeName = if (primitiveType != null) {
             primitiveType.getWrapperFqName()
         }

j2k/src/org/jetbrains/kotlin/j2k/TypeVisitor.kt

@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.j2k.ast.*
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType
 
-private val PRIMITIVE_TYPES_NAMES = JvmPrimitiveType.values().map { it.getName() }
+private val PRIMITIVE_TYPES_NAMES = JvmPrimitiveType.values().map { it.getJavaKeywordName() }
 
 class TypeVisitor(
         private val converter: Converter,