Mercurial > hg > graal-compiler
changeset 16486:d3fc4779fc60
moved signatureToTypes(ResolvedJavaMethod method) from MetaUtil to be a default method in ResolvedJavaMethod
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Thu, 10 Jul 2014 23:22:47 +0200 |
parents | d6604020da93 |
children | 1ffe4349f945 |
files | graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/MetaUtil.java graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/ResolvedJavaMethod.java graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/InstalledCodeExecuteHelperTest.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotNmethod.java graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/JTTTest.java graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/NodeIntrinsificationPhase.java |
diffstat | 7 files changed, 11 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/MetaUtil.java Thu Jul 10 23:15:02 2014 +0200 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/MetaUtil.java Thu Jul 10 23:22:47 2014 +0200 @@ -298,11 +298,6 @@ return sb.append(" [bci: ").append(bci).append(']'); } - public static JavaType[] signatureToTypes(ResolvedJavaMethod method) { - JavaType receiver = method.isStatic() ? null : method.getDeclaringClass(); - return method.getSignature().toParameterTypes(receiver); - } - /** * Formats some profiling information associated as a string. *
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/ResolvedJavaMethod.java Thu Jul 10 23:15:02 2014 +0200 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/ResolvedJavaMethod.java Thu Jul 10 23:22:47 2014 +0200 @@ -247,4 +247,9 @@ return null; } + default JavaType[] toParameterTypes() { + JavaType receiver = isStatic() ? null : getDeclaringClass(); + return getSignature().toParameterTypes(receiver); + } + }
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java Thu Jul 10 23:15:02 2014 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java Thu Jul 10 23:22:47 2014 +0200 @@ -501,7 +501,7 @@ } protected void checkArgs(ResolvedJavaMethod method, Object[] args) { - JavaType[] sig = MetaUtil.signatureToTypes(method); + JavaType[] sig = method.toParameterTypes(); Assert.assertEquals(sig.length, args.length); for (int i = 0; i < args.length; i++) { JavaType javaType = sig[i];
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/InstalledCodeExecuteHelperTest.java Thu Jul 10 23:15:02 2014 +0200 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/InstalledCodeExecuteHelperTest.java Thu Jul 10 23:22:47 2014 +0200 @@ -22,7 +22,6 @@ */ package com.oracle.graal.hotspot.test; -import static com.oracle.graal.api.meta.MetaUtil.*; import static java.lang.reflect.Modifier.*; import java.lang.reflect.*; @@ -85,7 +84,7 @@ if (argsToBind != null) { Object receiver = isStatic(m.getModifiers()) ? null : this; Object[] args = argsWithReceiver(receiver, argsToBind); - JavaType[] parameterTypes = signatureToTypes(getMetaAccess().lookupJavaMethod(m)); + JavaType[] parameterTypes = getMetaAccess().lookupJavaMethod(m).toParameterTypes(); assert parameterTypes.length == args.length; for (int i = 0; i < argsToBind.length; i++) { ParameterNode param = graph.getParameter(i);
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotNmethod.java Thu Jul 10 23:15:02 2014 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotNmethod.java Thu Jul 10 23:22:47 2014 +0200 @@ -89,7 +89,7 @@ } private boolean checkArgs(Object... args) { - JavaType[] sig = MetaUtil.signatureToTypes(method); + JavaType[] sig = method.toParameterTypes(); assert args.length == sig.length : method.format("%H.%n(%p): expected ") + sig.length + " args, got " + args.length; for (int i = 0; i < sig.length; i++) { Object arg = args[i];
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/JTTTest.java Thu Jul 10 23:15:02 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/JTTTest.java Thu Jul 10 23:22:47 2014 +0200 @@ -22,7 +22,6 @@ */ package com.oracle.graal.jtt; -import static com.oracle.graal.api.meta.MetaUtil.*; import static java.lang.reflect.Modifier.*; import java.lang.reflect.*; @@ -63,7 +62,7 @@ if (argsToBind != null) { Object receiver = isStatic(m.getModifiers()) ? null : this; Object[] args = argsWithReceiver(receiver, argsToBind); - JavaType[] parameterTypes = signatureToTypes(getMetaAccess().lookupJavaMethod(m)); + JavaType[] parameterTypes = getMetaAccess().lookupJavaMethod(m).toParameterTypes(); assert parameterTypes.length == args.length; for (int i = 0; i < args.length; i++) { ParameterNode param = graph.getParameter(i);
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/NodeIntrinsificationPhase.java Thu Jul 10 23:15:02 2014 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/NodeIntrinsificationPhase.java Thu Jul 10 23:22:47 2014 +0200 @@ -83,7 +83,7 @@ assert target.getAnnotation(Fold.class) == null; assert target.isStatic() : "node intrinsic must be static: " + target; - ResolvedJavaType[] parameterTypes = resolveJavaTypes(signatureToTypes(target), declaringClass); + ResolvedJavaType[] parameterTypes = resolveJavaTypes(target.toParameterTypes(), declaringClass); // Prepare the arguments for the reflective constructor call on the node class. Constant[] nodeConstructorArguments = prepareArguments(methodCallTargetNode, parameterTypes, target, false); @@ -102,7 +102,7 @@ // Clean up checkcast instructions inserted by javac if the return type is generic. cleanUpReturnList.add(newInstance); } else if (isFoldable(target)) { - ResolvedJavaType[] parameterTypes = resolveJavaTypes(signatureToTypes(target), declaringClass); + ResolvedJavaType[] parameterTypes = resolveJavaTypes(target.toParameterTypes(), declaringClass); // Prepare the arguments for the reflective method call Constant[] arguments = prepareArguments(methodCallTargetNode, parameterTypes, target, true);