Mercurial > hg > truffle
changeset 16479:558cf39c646b
moved toJavaName(JavaType type) from MetaUtil to be a default method in JavaType
line wrap: on
line diff
--- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/Assumptions.java Thu Jul 10 22:25:08 2014 +0200 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/Assumptions.java Thu Jul 10 22:33:53 2014 +0200 @@ -71,7 +71,7 @@ @Override public String toString() { - return "NoFinalizableSubclass[receiverType=" + toJavaName(receiverType) + "]"; + return "NoFinalizableSubclass[receiverType=" + receiverType.toJavaName() + "]"; } } @@ -120,7 +120,7 @@ @Override public String toString() { - return "ConcreteSubtype[context=" + toJavaName(context) + ", subtype=" + toJavaName(subtype) + "]"; + return "ConcreteSubtype[context=" + context.toJavaName() + ", subtype=" + subtype.toJavaName() + "]"; } } @@ -174,7 +174,7 @@ @Override public String toString() { - return "ConcreteMethod[method=" + format("%H.%n(%p)", method) + ", context=" + toJavaName(context) + ", impl=" + format("%H.%n(%p)", impl) + "]"; + return "ConcreteMethod[method=" + format("%H.%n(%p)", method) + ", context=" + context.toJavaName() + ", impl=" + format("%H.%n(%p)", impl) + "]"; } }
--- a/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestMetaAccessProvider.java Thu Jul 10 22:25:08 2014 +0200 +++ b/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestMetaAccessProvider.java Thu Jul 10 22:33:53 2014 +0200 @@ -44,7 +44,7 @@ assertEquals(c.getModifiers(), type.getModifiers()); if (!type.isArray()) { assertEquals(type.getName(), toInternalName(c.getName())); - assertEquals(toJavaName(type), c.getName()); + assertEquals(type.toJavaName(), c.getName()); } } }
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/JavaType.java Thu Jul 10 22:25:08 2014 +0200 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/JavaType.java Thu Jul 10 22:33:53 2014 +0200 @@ -85,6 +85,22 @@ * returned by this method: * * <pre> + * java.lang.Object + * int + * boolean[][] + * </pre> + * + * @return the Java name corresponding to this type + */ + default String toJavaName() { + return internalNameToJava(getName(), true, false); + } + + /** + * Gets the Java programming language name for this type. The following are examples of strings + * returned by this method: + * + * <pre> * qualified == true: * java.lang.Object * int @@ -97,7 +113,7 @@ * * @param qualified specifies if the package prefix of this type should be included in the * returned name - * @return the Java name corresponding to {@code type} + * @return the Java name corresponding to this type */ default String toJavaName(boolean qualified) { Kind kind = getKind();
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/Kind.java Thu Jul 10 22:25:08 2014 +0200 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/Kind.java Thu Jul 10 22:33:53 2014 +0200 @@ -305,7 +305,7 @@ return "String:\"" + s + '"'; } } else if (value instanceof JavaType) { - return "JavaType:" + MetaUtil.toJavaName((JavaType) value); + return "JavaType:" + ((JavaType) value).toJavaName(); } else if (value instanceof Enum) { return MetaUtil.getSimpleName(value.getClass(), true) + ":" + ((Enum<?>) value).name(); } else if (value instanceof FormatWithToString) {
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/MetaUtil.java Thu Jul 10 22:25:08 2014 +0200 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/MetaUtil.java Thu Jul 10 22:33:53 2014 +0200 @@ -201,23 +201,6 @@ } /** - * Converts a given type to its Java programming language name. The following are examples of - * strings returned by this method: - * - * <pre> - * java.lang.Object - * int - * boolean[][] - * </pre> - * - * @param type the type to be converted to a Java name - * @return the Java name corresponding to {@code type} - */ - public static String toJavaName(JavaType type) { - return internalNameToJava(type.getName(), true, false); - } - - /** * Returns the type name in the same format as {@link Class#getName()}. */ public static String toClassName(JavaType type) {
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/MethodFilter.java Thu Jul 10 22:25:08 2014 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/MethodFilter.java Thu Jul 10 22:33:53 2014 +0200 @@ -171,7 +171,7 @@ if (methodName != null && !methodName.matcher(o.getName()).matches()) { return false; } - if (clazz != null && !clazz.matcher(MetaUtil.toJavaName(o.getDeclaringClass())).matches()) { + if (clazz != null && !clazz.matcher(o.getDeclaringClass().toJavaName()).matches()) { return false; } if (signature != null) { @@ -181,7 +181,7 @@ } for (int i = 0; i < signature.length; i++) { JavaType type = sig.getParameterType(i, null); - String javaName = MetaUtil.toJavaName(type); + String javaName = type.toJavaName(); if (signature[i] != null && !signature[i].matcher(javaName).matches()) { return false; }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMethodData.java Thu Jul 10 22:25:08 2014 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMethodData.java Thu Jul 10 22:33:53 2014 +0200 @@ -84,7 +84,7 @@ /** * Returns the size of the extra data records. This method does the same calculation as * MethodData::extra_data_size(). - * + * * @return size of extra data records */ private int extraDataSize() { @@ -543,7 +543,7 @@ getTypesNotRecordedExecutionCount(data, pos), profile.entries)); for (int i = 0; i < profile.entries; i++) { long count = profile.counts[i]; - sb.append(format("%n %s (%d, %4.2f)", MetaUtil.toJavaName(profile.items[i]), count, (double) count / profile.totalCount)); + sb.append(format("%n %s (%d, %4.2f)", profile.items[i].toJavaName(), count, (double) count / profile.totalCount)); } return sb; }
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/BytecodeDisassembler.java Thu Jul 10 22:25:08 2014 +0200 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/BytecodeDisassembler.java Thu Jul 10 22:33:53 2014 +0200 @@ -47,7 +47,7 @@ /** * Disassembles the bytecode of a given method in a {@code javap}-like format. - * + * * @return {@code null} if {@code method} has no bytecode (e.g., it is native or abstract) */ public String disassemble(ResolvedJavaMethod method) { @@ -73,7 +73,7 @@ case ANEWARRAY : { int cpi = stream.readCPI(); JavaType type = cp.lookupType(cpi, opcode); - buf.append(String.format("#%-10d // %s", cpi, MetaUtil.toJavaName(type))); + buf.append(String.format("#%-10d // %s", cpi, type.toJavaName())); break; } case GETSTATIC : @@ -206,7 +206,7 @@ case MULTIANEWARRAY : { int cpi = stream.readCPI(); JavaType type = cp.lookupType(cpi, opcode); - buf.append(String.format("#%-10s // %s", cpi + ", " + stream.readUByte(bci + 3), MetaUtil.toJavaName(type))); + buf.append(String.format("#%-10s // %s", cpi + ", " + stream.readUByte(bci + 3), type.toJavaName())); break; } }
--- a/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/BinaryGraphPrinter.java Thu Jul 10 22:25:08 2014 +0200 +++ b/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/BinaryGraphPrinter.java Thu Jul 10 22:33:53 2014 +0200 @@ -287,7 +287,7 @@ } else if (object instanceof JavaType) { JavaType type = (JavaType) object; writeByte(POOL_CLASS); - writeString(MetaUtil.toJavaName(type)); + writeString(type.toJavaName()); writeByte(KLASS); } else if (object instanceof NodeClass) { NodeClass nodeClass = (NodeClass) object;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/NodeIntrinsificationPhase.java Thu Jul 10 22:25:08 2014 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/NodeIntrinsificationPhase.java Thu Jul 10 22:33:53 2014 +0200 @@ -221,12 +221,12 @@ constructor = c; arguments = match; } else { - throw new GraalInternalError("Found multiple constructors in %s compatible with signature %s: %s, %s", toJavaName(nodeClass), sigString(parameterTypes), constructor, c); + throw new GraalInternalError("Found multiple constructors in %s compatible with signature %s: %s, %s", nodeClass.toJavaName(), sigString(parameterTypes), constructor, c); } } } if (constructor == null) { - throw new GraalInternalError("Could not find constructor in %s compatible with signature %s", toJavaName(nodeClass), sigString(parameterTypes)); + throw new GraalInternalError("Could not find constructor in %s compatible with signature %s", nodeClass.toJavaName(), sigString(parameterTypes)); } try { @@ -247,7 +247,7 @@ if (i != 0) { sb.append(", "); } - sb.append(toJavaName(types[i])); + sb.append(types[i].toJavaName()); } return sb.append(")").toString(); } @@ -279,7 +279,7 @@ } else if (signature[i].equals(metaAccess.lookupJavaType(SnippetReflectionProvider.class))) { injected[injected.length - 1] = snippetReflection.forObject(snippetReflection); } else { - throw new GraalInternalError("Cannot handle injected argument of type %s in %s", toJavaName(signature[i]), format("%H.%n(%p)", c)); + throw new GraalInternalError("Cannot handle injected argument of type %s in %s", signature[i].toJavaName(), format("%H.%n(%p)", c)); } } else { if (i > 0) {
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsImpl.java Thu Jul 10 22:25:08 2014 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsImpl.java Thu Jul 10 22:33:53 2014 +0200 @@ -715,7 +715,7 @@ dimensions++; } - Class<?> baseClass = base.getKind() != Kind.Object ? base.getKind().toJavaClass() : resolveClass(toJavaName(base), false); + Class<?> baseClass = base.getKind() != Kind.Object ? base.getKind().toJavaClass() : resolveClass(base.toJavaName(), false); return dimensions == 0 ? baseClass : Array.newInstance(baseClass, new int[dimensions]).getClass(); }
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/SnippetTemplate.java Thu Jul 10 22:25:08 2014 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/SnippetTemplate.java Thu Jul 10 22:33:53 2014 +0200 @@ -747,7 +747,7 @@ private static boolean checkVarargs(MetaAccessProvider metaAccess, final ResolvedJavaMethod method, Signature signature, int i, String name, Varargs varargs) { ResolvedJavaType type = (ResolvedJavaType) signature.getParameterType(i, method.getDeclaringClass()); assert type.isArray() : "varargs parameter must be an array type"; - assert type.getComponentType().isAssignableFrom(metaAccess.lookupJavaType(varargs.componentType)) : "componentType for " + name + " not matching " + MetaUtil.toJavaName(type) + " instance: " + + assert type.getComponentType().isAssignableFrom(metaAccess.lookupJavaType(varargs.componentType)) : "componentType for " + name + " not matching " + type.toJavaName() + " instance: " + varargs.componentType; return true; }