diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSupertypesResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSupertypesResolver.java index f8620e236ab..6de47e166bd 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSupertypesResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSupertypesResolver.java @@ -155,7 +155,9 @@ public final class JavaSupertypesResolver { result.add(object.getDefaultType()); } else { - throw new IllegalStateException("Could not resolve java.lang.Object"); + //TODO: hack here + result.add(JetStandardClasses.getAnyType()); + // throw new IllegalStateException("Could not resolve java.lang.Object"); } } }