Frontend: Allow using KClass as annotation parameter type

core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java

@@ -161,6 +161,8 @@ public class KotlinBuiltIns {
         public final FqName tailRecursive = fqName("tailRecursive");
         public final FqName noinline = fqName("noinline");
 
+        public final FqNameUnsafe kClass = new FqName("kotlin.reflect.KClass").toUnsafe();
+
         public final Set<FqNameUnsafe> primitiveTypes;
         public final Set<FqNameUnsafe> primitiveArrays;
         {
@@ -853,6 +855,10 @@ public class KotlinBuiltIns {
         return type != null && isNotNullConstructedFromGivenClass(type, FQ_NAMES.string);
     }
 
+    public static boolean isKClass(@NotNull ClassDescriptor descriptor) {
+        return FQ_NAMES.kClass.equals(DescriptorUtils.getFqName(descriptor));
+    }
+
     public static boolean isNonPrimitiveArray(@NotNull ClassDescriptor descriptor) {
         return FQ_NAMES.array.equals(DescriptorUtils.getFqName(descriptor));
     }

core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationArgumentVisitor.java

@@ -51,5 +51,7 @@ public interface AnnotationArgumentVisitor<R, D> {
 
     R visitJavaClassValue(JavaClassValue value, D data);
 
+    R visitKClassValue(KClassValue value, D data);
+
     R visitNumberTypeValue(IntegerValueTypeConstant value, D data);
 }

core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.java

@@ -31,10 +31,7 @@ import org.jetbrains.kotlin.name.FqNameBase;
 import org.jetbrains.kotlin.name.FqNameUnsafe;
 import org.jetbrains.kotlin.name.Name;
 import org.jetbrains.kotlin.resolve.DescriptorUtils;
-import org.jetbrains.kotlin.resolve.constants.AnnotationValue;
-import org.jetbrains.kotlin.resolve.constants.ArrayValue;
-import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant;
-import org.jetbrains.kotlin.resolve.constants.JavaClassValue;
+import org.jetbrains.kotlin.resolve.constants.*;
 import org.jetbrains.kotlin.types.*;
 import org.jetbrains.kotlin.types.ErrorUtils.UninferredParameterTypeConstructor;
 import org.jetbrains.kotlin.types.error.MissingDependencyErrorClass;
@@ -614,6 +611,11 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
                     public String visitJavaClassValue(JavaClassValue value, Void data) {
                         return renderType(value.getValue()) + ".class";
                     }
+
+                    @Override
+                    public String visitKClassValue(KClassValue value, Void data) {
+                         return renderType(value.getValue()) + "::class";
+                    }
                 },
                 null
         );

core/descriptors/src/org/jetbrains/kotlin/resolve/constants/KClassValue.kt

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.resolve.constants
+
+import org.jetbrains.kotlin.builtins.KotlinBuiltIns
+import org.jetbrains.kotlin.descriptors.annotations.AnnotationArgumentVisitor
+import org.jetbrains.kotlin.types.JetType
+
+
+public class KClassValue(type: JetType) : CompileTimeConstant<JetType>(type, true, false, false) {
+    override fun getType(kotlinBuiltIns: KotlinBuiltIns) = value
+    override fun getValue(): JetType = value.getArguments().single().getType()
+
+    override fun <R, D> accept(visitor: AnnotationArgumentVisitor<R, D>, data: D) = visitor.visitKClassValue(this, data)
+}