--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleExpansionLogger.java	Mon Sep 29 18:39:05 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleExpansionLogger.java	Mon Sep 29 18:39:05 2014 +0200
@@ -137,15 +137,16 @@
                 className = className.substring(lastIndex + 1, className.length());
             }
 
-            lastIndex = className.lastIndexOf('$');
-            if (lastIndex != -1) {
-                className = className.substring(lastIndex + 1, className.length());
-            }
+            className = extractInnerClassName(className);
 
             String constantType = "";
             if (targetReceiverType != null) {
-                if (!targetReceiverType.getName().equals(className)) {
-                    constantType = "<" + targetReceiverType.getName() + ">";
+                String javaName = targetReceiverType.toJavaName(false);
+
+                javaName = extractInnerClassName(javaName);
+
+                if (!javaName.equals(className)) {
+                    constantType = "<" + javaName + ">";
                 }
             }
 
@@ -164,6 +165,14 @@
             }
         }
 
+        private static String extractInnerClassName(String className) {
+            int lastIndex = className.lastIndexOf('$');
+            if (lastIndex != -1) {
+                return className.substring(lastIndex + 1, className.length());
+            }
+            return className;
+        }
+
         private static String formatSource(StackTraceElement e) {
             if (e == null) {
                 return "";