changeset 6392:4f7b8550daf8

Merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Fri, 14 Sep 2012 13:50:49 +0200
parents 07cd99f9dafb (diff) 1e1c85d9ca7e (current diff)
children e7b50827698e
files graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/DirectStoreNode.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/GetObjectAddressNode.java
diffstat 1 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/BinaryGraphPrinter.java	Fri Sep 14 13:32:04 2012 +0200
+++ b/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/BinaryGraphPrinter.java	Fri Sep 14 13:50:49 2012 +0200
@@ -241,6 +241,13 @@
         }
     }
 
+    private static String getClassName(Class<?> klass) {
+        if (!klass.isArray()) {
+            return klass.getName();
+        }
+        return getClassName(klass.getComponentType()) + "[]";
+    }
+
     private void addPoolEntry(Object object) throws IOException {
         int index = constantPool.add(object);
         writeByte(POOL_NEW);
@@ -248,7 +255,7 @@
         if (object instanceof Class<?>) {
             Class<?> klass = (Class< ? >) object;
             writeByte(POOL_CLASS);
-            writeString(klass.getName());
+            writeString(getClassName(klass));
             if (klass.isEnum()) {
                 writeByte(ENUM_KLASS);
                 Object[] enumConstants = klass.getEnumConstants();