# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1328778201 -3600
# Node ID 6dda62bf5be4fb05c9753497e92a1845903c14eb
# Parent  818757f088d3d288c3352e27204f6d7ceb4c5b9d# Parent  3a309467fc8e747cbb9e35924b5e76103ca3f7eb
Merge.

diff -r 3a309467fc8e -r 6dda62bf5be4 graal/com.oracle.max.graal.hotspot/src/com/oracle/max/graal/hotspot/ri/HotSpotSignature.java
--- a/graal/com.oracle.max.graal.hotspot/src/com/oracle/max/graal/hotspot/ri/HotSpotSignature.java	Wed Feb 08 21:15:00 2012 -0800
+++ b/graal/com.oracle.max.graal.hotspot/src/com/oracle/max/graal/hotspot/ri/HotSpotSignature.java	Thu Feb 09 10:03:21 2012 +0100
@@ -122,8 +122,8 @@
             argumentTypes = new RiType[arguments.size()];
         }
         RiType type = argumentTypes[index];
-        if (type == null) {
-            type = compiler.lookupType(arguments.get(index), (HotSpotTypeResolved) accessingClass, false);
+        if (type == null || !(type instanceof RiResolvedType)) {
+            type = compiler.lookupType(arguments.get(index), (HotSpotTypeResolved) accessingClass, true);
             argumentTypes[index] = type;
         }
         return type;
diff -r 3a309467fc8e -r 6dda62bf5be4 src/share/vm/graal/graalCompilerToVM.cpp
--- a/src/share/vm/graal/graalCompilerToVM.cpp	Wed Feb 08 21:15:00 2012 -0800
+++ b/src/share/vm/graal/graalCompilerToVM.cpp	Thu Feb 09 10:03:21 2012 +0100
@@ -285,7 +285,15 @@
       if (eagerResolve) {
         resolved_type = SystemDictionary::resolve_or_null(nameSymbol, classloader, protectionDomain, THREAD);
       } else {
-        resolved_type = SystemDictionary::find(nameSymbol, classloader, protectionDomain, THREAD);
+        if (FieldType::is_obj(nameSymbol)) {
+          ResourceMark rm(THREAD);
+          // Ignore wrapping L and ;.
+          TempNewSymbol tmp_name = SymbolTable::new_symbol(nameSymbol->as_C_string() + 1,
+                                         nameSymbol->utf8_length() - 2, CHECK_NULL);
+          resolved_type = SystemDictionary::find_instance_or_array_klass(tmp_name, classloader, protectionDomain, THREAD);
+        } else {
+          resolved_type = SystemDictionary::find_instance_or_array_klass(nameSymbol, classloader, protectionDomain, THREAD);
+        }
       }
       if (HAS_PENDING_EXCEPTION) {
         CLEAR_PENDING_EXCEPTION;
diff -r 3a309467fc8e -r 6dda62bf5be4 visualizer/nbproject/project.properties
--- a/visualizer/nbproject/project.properties	Wed Feb 08 21:15:00 2012 -0800
+++ b/visualizer/nbproject/project.properties	Thu Feb 09 10:03:21 2012 +0100
@@ -1,6 +1,6 @@
 app.icon=branding/core/core.jar/org/netbeans/core/startup/frame48.gif
 app.name=idealgraphvisualizer
-app.title=IdealGraphVisualizer
+app.title=Graal Visualizer
 branding.token=${app.name}
 modules=\
     ${project.com.sun.hotspot.igv.graph}:\