# HG changeset patch
# User Christian Wimmer <christian.wimmer@oracle.com>
# Date 1367456887 25200
# Node ID 3822ce079ec4e7f876ef68ebf2a409760f939c65
# Parent  b9e66fc67b317d814ef50f90eaf0cd49eabeea66# Parent  0285fbb8b05d7b8d408224cd6be58c40b4f45a20
Merge

diff -r 0285fbb8b05d -r 3822ce079ec4 graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/RuntimeCallTarget.java
--- 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();
         }
 
diff -r 0285fbb8b05d -r 3822ce079ec4 graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64ConvertSnippets.java
--- 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);
diff -r 0285fbb8b05d -r 3822ce079ec4 graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/BoxingSnippets.java
--- 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"));