From 2cfe11cb6b7828dfa6ca66d54d8806ca06d73485 Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Fri, 19 Jul 2013 17:42:42 +0400
Subject: [PATCH] Moved method.

---
 .../java/resolver/JavaFunctionResolver.java   | 24 ++-----------------
 .../jetbrains/jet/lang/types/ErrorUtils.java  | 20 ++++++++++++++++
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java
index 71cf1a6972d..ac096b902d7 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java
@@ -460,12 +460,12 @@ public final class JavaFunctionResolver {
     }
 
     private static boolean containsErrorType(@NotNull List<FunctionDescriptor> superFunctions, @NotNull FunctionDescriptor function) {
-        if (containsErrorType(function)) {
+        if (ErrorUtils.containsErrorType(function)) {
             return true;
         }
 
         for (FunctionDescriptor superFunction : superFunctions) {
-            if (containsErrorType(superFunction)) {
+            if (ErrorUtils.containsErrorType(superFunction)) {
                 return true;
             }
         }
@@ -473,26 +473,6 @@ public final class JavaFunctionResolver {
         return false;
     }
 
-    private static boolean containsErrorType(@NotNull FunctionDescriptor function) {
-        if (ErrorUtils.containsErrorType(function.getReturnType())) {
-            return true;
-        }
-        for (ValueParameterDescriptor parameter : function.getValueParameters()) {
-            if (ErrorUtils.containsErrorType(parameter.getType())) {
-                return true;
-            }
-        }
-        for (TypeParameterDescriptor parameter : function.getTypeParameters()) {
-            for (JetType upperBound : parameter.getUpperBounds()) {
-                if (ErrorUtils.containsErrorType(upperBound)) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
     private static SimpleFunctionDescriptor recordSamConstructor(ClassDescriptorFromJvmBytecode klass, SimpleFunctionDescriptor constructorFunction, BindingTrace trace) {
         trace.record(JavaBindingContext.SAM_CONSTRUCTOR_TO_INTERFACE, constructorFunction, klass);
         trace.record(BindingContext.SOURCE_DESCRIPTOR_FOR_SYNTHESIZED, constructorFunction, klass);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/ErrorUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/ErrorUtils.java
index ccd90c59bad..5a3d535a954 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/types/ErrorUtils.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/ErrorUtils.java
@@ -45,6 +45,26 @@ public class ErrorUtils {
         ERROR_MODULE = module;
     }
 
+    public static boolean containsErrorType(@NotNull FunctionDescriptor function) {
+        if (containsErrorType(function.getReturnType())) {
+            return true;
+        }
+        for (ValueParameterDescriptor parameter : function.getValueParameters()) {
+            if (containsErrorType(parameter.getType())) {
+                return true;
+            }
+        }
+        for (TypeParameterDescriptor parameter : function.getTypeParameters()) {
+            for (JetType upperBound : parameter.getUpperBounds()) {
+                if (containsErrorType(upperBound)) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
 
     public static class ErrorScope implements JetScope {