From 4194f1c418f69f58d9a08a4fc7ed979a37b0363c Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Thu, 18 Sep 2014 17:41:09 +0400
Subject: [PATCH] Minor, simplify old code in ImplementationBodyCodegen

---
 .../codegen/ImplementationBodyCodegen.java    | 23 +++++--------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
index 7ac90062dff..053283c190c 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
@@ -286,28 +286,17 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
 
     private void writeInnerClass(@NotNull ClassDescriptor innerClass) {
         DeclarationDescriptor containing = innerClass.getContainingDeclaration();
-        String outerClassInternalName = containing instanceof ClassDescriptor ? getInternalNameForImpl((ClassDescriptor) containing) : null;
+        String outerClassInternalName =
+                containing instanceof ClassDescriptor ? typeMapper.mapClass((ClassDescriptor) containing).getInternalName() : null;
 
-        String innerClassInternalName;
-        String innerName;
-
-        if (isClassObject(innerClass)) {
-            innerName = JvmAbi.CLASS_OBJECT_CLASS_NAME;
-            innerClassInternalName = outerClassInternalName + JvmAbi.CLASS_OBJECT_SUFFIX;
-        }
-        else {
-            innerName = innerClass.getName().isSpecial() ? null : innerClass.getName().asString();
-            innerClassInternalName = getInternalNameForImpl(innerClass);
-        }
+        String innerName = isClassObject(innerClass)
+                           ? JvmAbi.CLASS_OBJECT_CLASS_NAME
+                           : innerClass.getName().isSpecial() ? null : innerClass.getName().asString();
 
+        String innerClassInternalName = typeMapper.mapClass(innerClass).getInternalName();
         v.visitInnerClass(innerClassInternalName, outerClassInternalName, innerName, calculateInnerClassAccessFlags(innerClass));
     }
 
-    @NotNull
-    private String getInternalNameForImpl(@NotNull ClassDescriptor descriptor) {
-        return typeMapper.mapClass(descriptor).getInternalName();
-    }
-
     @NotNull
     private JvmClassSignature signature() {
         BothSignatureWriter sw = new BothSignatureWriter(BothSignatureWriter.Mode.CLASS);