From cc02ba7ab4a102f9cc2112a99494ee48892bd0e4 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Thu, 27 Jun 2013 18:38:47 +0400
Subject: [PATCH] Don't load KotlinInfo annotation in resolve.java

---
 .../lang/resolve/java/resolver/JavaAnnotationResolver.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaAnnotationResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaAnnotationResolver.java
index 07e56506faf..8b785ba5c22 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaAnnotationResolver.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaAnnotationResolver.java
@@ -84,7 +84,10 @@ public final class JavaAnnotationResolver {
         }
 
         // Don't process internal jet annotations and jetbrains NotNull annotations
-        if (qname.startsWith("jet.runtime.typeinfo.") || qname.equals(JvmAbi.JETBRAINS_NOT_NULL_ANNOTATION.getFqName().asString())) {
+        if (qname.startsWith("jet.runtime.typeinfo.")
+            || qname.equals(JvmAbi.JETBRAINS_NOT_NULL_ANNOTATION.getFqName().asString())
+            || qname.equals("jet.KotlinInfo")
+        ) {
             return null;
         }