fix for KT-1515 wrong loading of annotations

compiler/backend/src/org/jetbrains/jet/codegen/AnnotationCodegen.java

@@ -81,7 +81,8 @@ public abstract class AnnotationCodegen {
                     CompileTimeConstant<?> compileTimeConstant = bindingContext.get(BindingContext.COMPILE_TIME_VALUE, valueArguments.get(0));
                     assert compileTimeConstant != null;
 
-                    annotationVisitor.visit(entry.getKey().getName(), compileTimeConstant.getValue());
+                    Object value = compileTimeConstant.getValue();
+                    annotationVisitor.visit(entry.getKey().getName(), value);
                 }
 
                 annotationVisitor.visitEnd();

compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java

@@ -72,8 +72,8 @@ public class IntrinsicMethods {
         myProject = project;
         myStdLib = stdlib;
 
-        namedMethods.put("\"kotlin.javaClass.function\"", new JavaClassFunction());
+        namedMethods.put("kotlin.javaClass.function", new JavaClassFunction());
-        namedMethods.put("\"kotlin.javaClass.property\"", new JavaClassProperty());
+        namedMethods.put("kotlin.javaClass.property", new JavaClassProperty());
 
         List<String> primitiveCastMethods = OperatorConventions.NUMBER_CONVERSIONS.asList();
         for (String method : primitiveCastMethods) {
@@ -246,7 +246,10 @@ public class IntrinsicMethods {
             if (annotations != null) {
                 for (AnnotationDescriptor annotation : annotations) {
                     if("Intrinsic".equals(annotation.getType().getConstructor().getDeclarationDescriptor().getName())) {
-                        intrinsicMethod = namedMethods.get(annotation.getValueArguments().get(0).getValue());
+                        Object value = annotation.getValueArguments().get(0).getValue();
+                        intrinsicMethod = namedMethods.get(value);
+                        if(intrinsicMethod != null)
+                            break;
                     }
                 }
             }

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java

@@ -1522,13 +1522,34 @@ public class JavaDescriptorResolver {
         }
         annotation.setAnnotationType(clazz.getDefaultType());
         ArrayList<CompileTimeConstant<?>> valueArguments = new ArrayList<CompileTimeConstant<?>>();
-        if("jet.runtime.Intrinsic".equals(psiAnnotation.getQualifiedName())) {
+
-            // temporary hack
+        PsiAnnotationParameterList parameterList = psiAnnotation.getParameterList();
-            valueArguments.add(new StringValue(psiAnnotation.findAttributeValue("value").getText()));
+        for (PsiNameValuePair psiNameValuePair : parameterList.getAttributes()) {
-            annotation.setValueArguments(valueArguments); // TODO
+            PsiAnnotationMemberValue value = psiNameValuePair.getValue();
+            // todo
+            assert value instanceof PsiLiteralExpression;
+            Object literalValue = ((PsiLiteralExpression) value).getValue();
+            if(literalValue instanceof String)
+                valueArguments.add(new StringValue((String) literalValue));
+            else if(literalValue instanceof Byte)
+                valueArguments.add(new ByteValue((Byte) literalValue));
+            else if(literalValue instanceof Short)
+                valueArguments.add(new ShortValue((Short) literalValue));
+            else if(literalValue instanceof Character)
+                valueArguments.add(new CharValue((Character) literalValue));
+            else if(literalValue instanceof Integer)
+                valueArguments.add(new IntValue((Integer) literalValue));
+            else if(literalValue instanceof Long)
+                valueArguments.add(new LongValue((Long) literalValue));
+            else if(literalValue instanceof Float)
+                valueArguments.add(new FloatValue((Float) literalValue));
+            else if(literalValue instanceof Double)
+                valueArguments.add(new DoubleValue((Double) literalValue));
+            else if(literalValue == null)
+                valueArguments.add(NullValue.NULL);
         }
-        else
+
-            annotation.setValueArguments(valueArguments); // TODO
+        annotation.setValueArguments(valueArguments); // TODO
         return annotation;
     }
 

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/PsiAnnotationUtils.java

@@ -27,6 +27,9 @@ import org.jetbrains.annotations.Nullable;
  */
 public class PsiAnnotationUtils {
 
+    private PsiAnnotationUtils() {
+    }
+
     @NotNull
     public static String getStringAttribute(@Nullable PsiAnnotation annotation, @NotNull String field, @NotNull String defaultValue) {
         return getAttribute(annotation, field, defaultValue);

compiler/testData/codegen/regressions/kt1515.kt

@@ -0,0 +1,4 @@
+fun box(): String {
+    val c = javaClass<Runnable>()
+    return if(c.getName().sure() == "java.lang.Runnable") "OK" else "fail"
+}

compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java

@@ -124,4 +124,8 @@ public class StdlibTest extends CodegenTestCase {
     public void testKt1568() throws Exception {
         blackBoxFile("regressions/kt1568.kt");
     }
+
+    public void testKt1515() throws Exception {
+        blackBoxFile("regressions/kt1515.kt");
+    }
 }

libraries/testlib/test/JavaClassTest.kt

@@ -8,7 +8,7 @@ class C()
 class JavaClassTest() : TestCase() {
     fun testMe () {
         assertEquals("java.util.ArrayList", java.util.ArrayList<Any>().javaClass.getName())
-//        assertEquals("java.util.ArrayList", javaClass<java.util.ArrayList<Any>>().getName())
+        assertEquals("java.util.ArrayList", javaClass<java.util.ArrayList<Any>>().getName())
-//        assertEquals("testjc.C", javaClass<C>().getName())
+        assertEquals("testjc.C", javaClass<C>().getName())
     }
 }

libraries/testlib/test/language/JavaClassTest.kt

@@ -17,7 +17,7 @@ class JavaClassTest : TestCase() {
 
         // TODO this function fails!
         // see KT-1515
-        // loadAsserter()
+        loadAsserter()
     }
 }