ReadJavaBinaryClassTest: Any

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java

@@ -187,7 +187,6 @@ public class JavaTypeTransformer {
                 PrimitiveType primitiveType = jvmPrimitiveType.getPrimitiveType();
                 classDescriptorMap.put(jvmPrimitiveType.getWrapper().getFqName(), standardLibrary.getPrimitiveClassDescriptor(primitiveType));
             }
-            //classDescriptorMap.put("java.lang.Object", standardLibrary.get
             classDescriptorMap.put("java.lang.String", standardLibrary.getString());
         }
         return classDescriptorMap;

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JetTypeJetSignatureReader.java

@@ -74,6 +74,10 @@ public abstract class JetTypeJetSignatureReader extends JetSignatureExceptionsAd
         String ourName = name.replace('/', '.');
         
         this.classDescriptor = this.javaSemanticServices.getTypeTransformer().getPrimitiveWrappersClassDescriptorMap().get(ourName);
+        
+        if (this.classDescriptor == null && ourName.equals("java.lang.Object")) {
+            this.classDescriptor = JetStandardClasses.getAny();
+        }
 
         if (this.classDescriptor == null) {
             this.classDescriptor = javaDescriptorResolver.resolveClass(ourName);

compiler/testData/readKotlinBinaryClass/type/Any.kt

@@ -0,0 +1,3 @@
+package test
+
+fun any(): Any = 1

compiler/testData/readKotlinBinaryClass/type/AnyQ.kt

@@ -0,0 +1,3 @@
+package test
+
+fun anyq(): Any? = 1

compiler/testData/readKotlinBinaryClass/type/ListOfAny.kt

@@ -0,0 +1,5 @@
+package test
+
+import java.util.List
+
+fun listOfAny(): List<Any> = throw Exception()

compiler/testData/readKotlinBinaryClass/type/ListOfAnyQ.kt

@@ -0,0 +1,5 @@
+package test
+
+import java.util.List
+
+fun listOfAnyQ(): List<Any?> = throw Exception()