Mercurial > hg > truffle
changeset 9490:3822ce079ec4
Merge
author | Christian Wimmer <christian.wimmer@oracle.com> |
---|---|
date | Wed, 01 May 2013 18:08:07 -0700 |
parents | b9e66fc67b31 (diff) 0285fbb8b05d (current diff) |
children | 789cfd153265 |
files | |
diffstat | 3 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/RuntimeCallTarget.java Wed May 01 23:42:23 2013 +0200 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/RuntimeCallTarget.java Wed May 01 18:08:07 2013 -0700 @@ -67,14 +67,14 @@ /** * Gets the return kind of this runtime call. */ - public Class getResultType() { + public Class<?> getResultType() { return resultType; } /** * Gets the argument kinds of this runtime call. */ - public Class[] getArgumentTypes() { + public Class<?>[] getArgumentTypes() { return argumentTypes.clone(); }
--- a/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64ConvertSnippets.java Wed May 01 23:42:23 2013 +0200 +++ b/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64ConvertSnippets.java Wed May 01 18:08:07 2013 -0700 @@ -28,6 +28,7 @@ import java.util.*; import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.debug.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.calc.*; @@ -148,7 +149,7 @@ private final EnumMap<Op, SnippetInfo> snippets; - public Templates(CodeCacheProvider runtime, Replacements replacements, TargetDescription target) { + public Templates(MetaAccessProvider runtime, Replacements replacements, TargetDescription target) { super(runtime, replacements, target); snippets = new EnumMap<>(Op.class);
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/BoxingSnippets.java Wed May 01 23:42:23 2013 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/BoxingSnippets.java Wed May 01 18:08:07 2013 -0700 @@ -205,7 +205,7 @@ private final EnumMap<Kind, SnippetInfo> boxSnippets = new EnumMap<>(Kind.class); private final EnumMap<Kind, SnippetInfo> unboxSnippets = new EnumMap<>(Kind.class); - public Templates(CodeCacheProvider runtime, Replacements replacements, TargetDescription target) { + public Templates(MetaAccessProvider runtime, Replacements replacements, TargetDescription target) { super(runtime, replacements, target); for (Kind kind : new Kind[]{Kind.Boolean, Kind.Byte, Kind.Char, Kind.Double, Kind.Float, Kind.Int, Kind.Long, Kind.Short}) { boxSnippets.put(kind, snippet(BoxingSnippets.class, kind.getJavaName() + "ValueOf"));