From 111dd13d393e5b06dc6cfc24055c90107ee45804 Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Sun, 27 Jan 2013 00:12:03 +0400
Subject: [PATCH] Moved error checking of built-ins to more direct place.

---
 .../org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java  | 7 +++----
 .../jet/plugin/references/BuiltInsReferenceResolver.java   | 2 --
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java
index a3863aabc01..08465297882 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java
@@ -37,10 +37,7 @@ import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.psi.JetImportDirective;
 import org.jetbrains.jet.lang.psi.JetPsiFactory;
-import org.jetbrains.jet.lang.resolve.BindingTrace;
-import org.jetbrains.jet.lang.resolve.BindingTraceContext;
-import org.jetbrains.jet.lang.resolve.DescriptorUtils;
-import org.jetbrains.jet.lang.resolve.ImportPath;
+import org.jetbrains.jet.lang.resolve.*;
 import org.jetbrains.jet.lang.resolve.lazy.FileBasedDeclarationProviderFactory;
 import org.jetbrains.jet.lang.resolve.lazy.ResolveSession;
 import org.jetbrains.jet.lang.resolve.name.FqName;
@@ -217,6 +214,8 @@ public class KotlinBuiltIns {
         nonPhysicalClasses = computeNonPhysicalClasses();
 
         resolveSession.forceResolveAll();
+
+        AnalyzingUtils.throwExceptionOnErrors(resolveSession.getBindingContext());
     }
 
     @NotNull
diff --git a/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java b/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java
index 8c2d8cb7489..eba35ac9e92 100644
--- a/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java
+++ b/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java
@@ -107,8 +107,6 @@ public class BuiltInsReferenceResolver extends AbstractProjectComponent {
         TopDownAnalyzer.processStandardLibraryNamespace(myProject, context, scope, jetNamespace,
                                                         getJetFiles("jet", Predicates.not(jetFilesIndependentOfUnit)));
 
-        AnalyzingUtils.throwExceptionOnErrors(context.getBindingContext());
-
         bindingContext = context.getBindingContext();
     }