# HG changeset patch
# User Andreas Woess <andreas.woess@jku.at>
# Date 1365520829 -7200
# Node ID 7a4dc62006bf9617bd99192c7c9b72f1c4534d31
# Parent  7ef66078d83755339e82d1221b1e74059f0f9162
canonicalize constant call site target

diff -r 7ef66078d837 -r 7a4dc62006bf graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaField.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaField.java	Tue Apr 09 17:11:17 2013 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaField.java	Tue Apr 09 17:20:29 2013 +0200
@@ -24,6 +24,7 @@
 package com.oracle.graal.hotspot.meta;
 
 import java.lang.annotation.*;
+import java.lang.invoke.*;
 import java.lang.reflect.*;
 
 import com.oracle.graal.api.meta.*;
@@ -97,6 +98,8 @@
                 if (assumeNonStaticFinalFieldsAsFinal(receiver.asObject().getClass()) || !value.isDefaultForKind()) {
                     return value;
                 }
+            } else if (receiver.asObject() instanceof ConstantCallSite) {
+                return readValue(receiver);
             }
         }
         return null;