From 1107ae9a114436ea1701c364094d7de9351392c3 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Wed, 29 Jan 2014 16:16:59 +0400
Subject: [PATCH] Revert hack for annotations on built-ins

This reverts commit 5cae5c0338e9ace30c8d80f4a030981d9193c96e
---
 .../descriptors/AnnotationDeserializer.java   | 31 -------------------
 .../types/lang/BuiltinsPackageFragment.java   |  4 +--
 2 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/AnnotationDeserializer.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/AnnotationDeserializer.java
index d544c644aef..213d84a5973 100644
--- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/AnnotationDeserializer.java
+++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/AnnotationDeserializer.java
@@ -60,37 +60,6 @@ public interface AnnotationDeserializer {
         }
     };
 
-    AnnotationDeserializer EMPTY = new AnnotationDeserializer() {
-        @NotNull
-        @Override
-        public Annotations loadClassAnnotations(@NotNull ClassDescriptor descriptor, @NotNull ProtoBuf.Class classProto) {
-            return Annotations.EMPTY;
-        }
-
-        @NotNull
-        @Override
-        public Annotations loadCallableAnnotations(
-                @NotNull ClassOrPackageFragmentDescriptor container,
-                @NotNull ProtoBuf.Callable proto,
-                @NotNull NameResolver nameResolver,
-                @NotNull AnnotatedCallableKind kind
-        ) {
-            return Annotations.EMPTY;
-        }
-
-        @NotNull
-        @Override
-        public Annotations loadValueParameterAnnotations(
-                @NotNull ClassOrPackageFragmentDescriptor container,
-                @NotNull ProtoBuf.Callable callable,
-                @NotNull NameResolver nameResolver,
-                @NotNull AnnotatedCallableKind kind,
-                @NotNull ProtoBuf.Callable.ValueParameter proto
-        ) {
-            return Annotations.EMPTY;
-        }
-    };
-
     enum AnnotatedCallableKind {
         FUNCTION,
         PROPERTY,
diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsPackageFragment.java b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsPackageFragment.java
index 13ebe204ce7..24370ceca6f 100644
--- a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsPackageFragment.java
+++ b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsPackageFragment.java
@@ -39,7 +39,7 @@ class BuiltinsPackageFragment extends DeclarationDescriptorImpl implements Packa
         packageFragmentProvider = new BuiltinsPackageFragmentProvider();
 
         // TODO: support annotations
-        members = new DeserializedPackageMemberScope(storageManager, this, AnnotationDeserializer.EMPTY,
+        members = new DeserializedPackageMemberScope(storageManager, this, AnnotationDeserializer.UNSUPPORTED,
                                                      new BuiltInsDescriptorFinder(storageManager), loadPackage(), nameResolver);
     }
 
@@ -134,7 +134,7 @@ class BuiltinsPackageFragment extends DeclarationDescriptorImpl implements Packa
 
         public BuiltInsDescriptorFinder(@NotNull StorageManager storageManager) {
             // TODO: support annotations
-            super(storageManager, AnnotationDeserializer.EMPTY, packageFragmentProvider);
+            super(storageManager, AnnotationDeserializer.UNSUPPORTED, packageFragmentProvider);
 
             classNames = storageManager.createLazyValue(new Function0<Collection<Name>>() {
                 @Override