From 0417df6429596b1c2c1a4baae6a914cf1f2ebf57 Mon Sep 17 00:00:00 2001
From: Stepan Koltsov <stepan.koltsov@jetbrains.com>
Date: Sat, 7 Apr 2012 06:32:20 +0400
Subject: [PATCH] initialize ANY_NULLABLE without cyclic dependencies

between <clinit> of ErrorUtils and JetStandardClasses
---
 .../jetbrains/jet/lang/types/lang/JetStandardClasses.java    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/JetStandardClasses.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/JetStandardClasses.java
index 6ed1135cd21..74983a38b95 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/JetStandardClasses.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/JetStandardClasses.java
@@ -31,7 +31,6 @@ import org.jetbrains.jet.lang.types.JetTypeImpl;
 import org.jetbrains.jet.lang.types.NamespaceType;
 import org.jetbrains.jet.lang.types.TypeConstructor;
 import org.jetbrains.jet.lang.types.TypeProjection;
-import org.jetbrains.jet.lang.types.TypeUtils;
 import org.jetbrains.jet.lang.types.Variance;
 
 import java.lang.reflect.Field;
@@ -124,9 +123,9 @@ public class JetStandardClasses {
             return "Scope for Any";
         }
     });
-    private static final JetType NULLABLE_ANY_TYPE = TypeUtils.makeNullable(ANY_TYPE);
+    private static final JetType NULLABLE_ANY_TYPE = new JetTypeImpl(ANY_TYPE.getAnnotations(), ANY_TYPE.getConstructor(), true, ANY_TYPE.getArguments(), ANY_TYPE.getMemberScope());
 
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
     private static final JetType DEFAULT_BOUND = getNullableAnyType();