Fix wrong generated class name invoking inner objects from another module

compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenBinding.java

@@ -362,16 +362,14 @@ public class CodegenBinding {
                     if (containingKlass.getKind() == ClassKind.ENUM_CLASS) {
                         return getJvmInternalName(bindingTrace, containingKlass).getInternalName();
                     }
+                    else if (klass.getKind() == ClassKind.OBJECT) {
+                        return getJvmInternalName(bindingTrace, containingKlass).getInternalName() + "$" + klass.getName();
+                    }
                     else {
                         return getJvmInternalName(bindingTrace, containingKlass).getInternalName() + JvmAbi.CLASS_OBJECT_SUFFIX;
                     }
                 }
             }
-
-            JvmClassName name = bindingTrace.getBindingContext().get(FQN, descriptor);
-            if (name != null) {
-                return name.getInternalName();
-            }
         }
 
         DeclarationDescriptor container = descriptor.getContainingDeclaration();

compiler/testData/compileKotlinAgainstKotlin/InnerClass.A.kt

@@ -0,0 +1,7 @@
+package aaa
+
+class A {
+    class O {
+      val s = "OK"
+    }
+}

compiler/testData/compileKotlinAgainstKotlin/InnerClass.B.kt

@@ -0,0 +1,6 @@
+fun main(args: Array<String>) {
+    val str = aaa.A.O().s
+    if (str != "OK") {
+        throw Exception()
+    }
+}

compiler/testData/compileKotlinAgainstKotlin/InnerEnum.A.kt

@@ -0,0 +1,7 @@
+package aaa
+
+class A {
+    enum class E {
+      A
+    }
+}

compiler/testData/compileKotlinAgainstKotlin/InnerEnum.B.kt

@@ -0,0 +1,6 @@
+fun main(args: Array<String>) {
+    val str = aaa.A().E.A
+    if (str.toString() != "A") {
+        throw Exception()
+    }
+}

compiler/testData/compileKotlinAgainstKotlin/InnerInnerClass.A.kt

@@ -0,0 +1,9 @@
+package aaa
+
+class A {
+    class B {
+        class O {
+          val s = "OK"
+        }
+    }
+}

compiler/testData/compileKotlinAgainstKotlin/InnerInnerClass.B.kt

@@ -0,0 +1,6 @@
+fun main(args: Array<String>) {
+    val str = aaa.A.B.O().s
+    if (str != "OK") {
+        throw Exception()
+    }
+}

compiler/testData/compileKotlinAgainstKotlin/InnerObject.A.kt

@@ -0,0 +1,7 @@
+package aaa
+
+class A {
+    object O {
+      val s = "OK"
+    }
+}

compiler/testData/compileKotlinAgainstKotlin/InnerObject.B.kt

@@ -0,0 +1,6 @@
+fun main(args: Array<String>) {
+    val str = aaa.A().O.s
+    if (str != "OK") {
+        throw Exception()
+    }
+}

compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java

@@ -56,6 +56,26 @@ public class CompileKotlinAgainstKotlinTestGenerated extends AbstractCompileKotl
         doTest("compiler/testData/compileKotlinAgainstKotlin/ImportObject.A.kt");
     }
     
+    @TestMetadata("InnerClass.A.kt")
+    public void testInnerClass() throws Exception {
+        doTest("compiler/testData/compileKotlinAgainstKotlin/InnerClass.A.kt");
+    }
+    
+    @TestMetadata("InnerEnum.A.kt")
+    public void testInnerEnum() throws Exception {
+        doTest("compiler/testData/compileKotlinAgainstKotlin/InnerEnum.A.kt");
+    }
+    
+    @TestMetadata("InnerInnerClass.A.kt")
+    public void testInnerInnerClass() throws Exception {
+        doTest("compiler/testData/compileKotlinAgainstKotlin/InnerInnerClass.A.kt");
+    }
+    
+    @TestMetadata("InnerObject.A.kt")
+    public void testInnerObject() throws Exception {
+        doTest("compiler/testData/compileKotlinAgainstKotlin/InnerObject.A.kt");
+    }
+    
     @TestMetadata("Simple.A.kt")
     public void testSimple() throws Exception {
         doTest("compiler/testData/compileKotlinAgainstKotlin/Simple.A.kt");