Merge remote branch 'origin/master'

2011-12-13 16:00:35 +02:00
parent 3419df7d0c ac29a020e2
commit 8f01bcb9be
1 changed files with 5 additions and 0 deletions
@@ -248,6 +248,11 @@ public class JetTypeMapper {
        }

        DeclarationDescriptor descriptor = jetType.getConstructor().getDeclarationDescriptor();
+
+        if (ErrorUtils.isError(descriptor)) {
+            throw new IllegalStateException("should not compile an error type");
+        }
+
        if (standardLibrary.getArray().equals(descriptor)) {
            if (jetType.getArguments().size() != 1) {
                throw new UnsupportedOperationException("arrays must have one type argument");