Simplify class object naming madness

- get rid of DescriptorNamer, always use descriptor.getName() instead
- delete AbstractClassResolver.getClassObjectName(), always use
  "<class-object-for-...>", except for the case of built-ins serialization
  (class object names should be replaced by "object" when writing files with
  serialized data for built-ins)
- delete NestedClassResolver.resolveClassObject(), always use the other method
  of this class instead

compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java

@@ -41,7 +41,10 @@ import org.jetbrains.jet.codegen.signature.kotlin.JetMethodAnnotationWriter;
 import org.jetbrains.jet.codegen.state.GenerationState;
 import org.jetbrains.jet.codegen.state.JetTypeMapper;
 import org.jetbrains.jet.codegen.state.JetTypeMapperMode;
-import org.jetbrains.jet.descriptors.serialization.*;
+import org.jetbrains.jet.descriptors.serialization.ClassSerializationUtil;
+import org.jetbrains.jet.descriptors.serialization.DescriptorSerializer;
+import org.jetbrains.jet.descriptors.serialization.NameSerializationUtil;
+import org.jetbrains.jet.descriptors.serialization.ProtoBuf;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.descriptors.impl.MutableClassDescriptor;
 import org.jetbrains.jet.lang.psi.*;
@@ -222,7 +225,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
 
     private void writeKotlinInfo() {
         AnnotationVisitor av = v.getVisitor().visitAnnotation(JvmStdlibNames.KOTLIN_INFO_CLASS.getDescriptor(), true);
-        DescriptorSerializer serializer = new DescriptorSerializer(DescriptorNamer.DEFAULT);
+        DescriptorSerializer serializer = new DescriptorSerializer();
 
         final ByteArrayOutputStream classStream = new ByteArrayOutputStream();
 

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DeserializedDescriptorResolver.java

@@ -32,7 +32,6 @@ import org.jetbrains.jet.lang.descriptors.ClassOrNamespaceDescriptor;
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
-import org.jetbrains.jet.lang.resolve.DescriptorUtils;
 import org.jetbrains.jet.lang.resolve.java.JvmAbi;
 import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames;
 import org.jetbrains.jet.lang.resolve.lazy.storage.LockBasedStorageManager;
@@ -268,7 +267,7 @@ public final class DeserializedDescriptorResolver {
         @NotNull
         @Override
         protected ClassId getClassId(@NotNull ClassDescriptor classDescriptor) {
-            return ClassSerializationUtil.getClassId(classDescriptor, DescriptorNamer.DEFAULT);
+            return ClassSerializationUtil.getClassId(classDescriptor);
         }
 
         @Nullable
@@ -277,12 +276,6 @@ public final class DeserializedDescriptorResolver {
             return javaClassResolver.resolveClass(kotlinFqNameToJavaFqName(classId.asSingleFqName()));
         }
 
-        @NotNull
-        @Override
-        protected Name getClassObjectName(@NotNull ClassDescriptor outerClass) {
-            return DescriptorUtils.getClassObjectName(outerClass.getName());
-        }
-
         @Override
         protected void classDescriptorCreated(@NotNull ClassDescriptor classDescriptor) {
             //nothing to do here

compiler/frontend/builtins/jet/ByteRange.object.kotlin_class

@@ -1,4 +1,4 @@
 † H2
 
RÂ
0B
-ZĆ0JB
+ZĆ0IB
 

compiler/frontend/builtins/jet/CharIterator.kotlin_class

@@ -1,8 +1,8 @@
-& L2
+& K2
 
 RĆ
0B
  Z
 0B
 Z
-&0MB
+&0LB
 

compiler/frontend/builtins/jet/CharRange.object.kotlin_class

@@ -1,4 +1,4 @@
-† O2
+† N2
 
RÂ
0B
-"ZÆ0JB
+"ZĆ0IB
 

compiler/frontend/builtins/jet/DoubleIterator.kotlin_class

@@ -1,8 +1,8 @@
-& _2
+& ^2
 
 RĆ
0B
 (Z
 0B
 Z
-&0`B
+&0_B
 

compiler/frontend/builtins/jet/DoubleRange.object.kotlin_class

@@ -1,4 +1,4 @@
-† b2
+† a2
 
RÂ
0B
-*ZĆ0JB
+*ZÆ0IB
 

compiler/frontend/builtins/jet/FloatIterator.kotlin_class

@@ -1,7 +1,7 @@
-& Ź
2
+& Ť
2
 
 RĆ
0B
 -Z
 0B
-Z&0­
B
+Z&0Ź
B
 

compiler/frontend/builtins/jet/FloatRange.object.kotlin_class

@@ -1,4 +1,4 @@
-† Ż
2
+† ®
2
 
RВ
0B
-/ZĆ0JB
+/ZЖ0IB
 

compiler/frontend/builtins/jet/IntIterator.kotlin_class

@@ -1,7 +1,7 @@
-& Ě
2
+& Ë
2
 
 RĆ
0B
 1Z
 0B
-Z&0Í
B
+Z&0Ě
B
 

compiler/frontend/builtins/jet/IntRange.object.kotlin_class

@@ -1,4 +1,4 @@
-† Ď
2
+† Î
2
 
RÂ
0B
-3ZĆ0JB
+3ZĆ0IB