# HG changeset patch
# User Thomas Wuerthinger <thomas@wuerthinger.net>
# Date 1305559607 -7200
# Node ID 026b21a81651c9ff90c92d8fa995d1b31632bddd
# Parent  c5739b99762a491db8102acbbd7cb87b07e73aa6# Parent  9836845a75e690a7d8091198cd7884a9bb408901
Merge.

diff -r c5739b99762a -r 026b21a81651 graal/GraalGraphviz/src/com/oracle/graal/graph/vis/GraphvizPrinter.java
--- a/graal/GraalGraphviz/src/com/oracle/graal/graph/vis/GraphvizPrinter.java	Mon May 16 17:26:31 2011 +0200
+++ b/graal/GraalGraphviz/src/com/oracle/graal/graph/vis/GraphvizPrinter.java	Mon May 16 17:26:47 2011 +0200
@@ -25,7 +25,6 @@
 import java.awt.Color;
 import java.io.OutputStream;
 import java.io.PrintStream;
-import java.util.HashMap;
 import java.util.HashSet;
 
 import com.oracle.graal.graph.Graph;
diff -r c5739b99762a -r 026b21a81651 graal/GraalRuntime/.classpath
--- a/graal/GraalRuntime/.classpath	Mon May 16 17:26:31 2011 +0200
+++ b/graal/GraalRuntime/.classpath	Mon May 16 17:26:47 2011 +0200
@@ -3,9 +3,9 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/Assembler"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/Base"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/CRI"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/GraalCompiler"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/com.oracle.max.asm"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/com.oracle.max.base"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff -r c5739b99762a -r 026b21a81651 graal/GraalRuntime/src/com/oracle/graal/runtime/HotSpotMethodResolved.java
--- a/graal/GraalRuntime/src/com/oracle/graal/runtime/HotSpotMethodResolved.java	Mon May 16 17:26:31 2011 +0200
+++ b/graal/GraalRuntime/src/com/oracle/graal/runtime/HotSpotMethodResolved.java	Mon May 16 17:26:47 2011 +0200
@@ -152,7 +152,6 @@
         return CiUtil.toStackTraceElement(this, bci);
     }
 
-    @Override
     public RiMethod uniqueConcreteMethod() {
         return compiler.getVMEntries().RiMethod_uniqueConcreteMethod(vmId);
     }
diff -r c5739b99762a -r 026b21a81651 graal/GraalRuntime/src/com/oracle/graal/runtime/HotSpotMethodUnresolved.java
--- a/graal/GraalRuntime/src/com/oracle/graal/runtime/HotSpotMethodUnresolved.java	Mon May 16 17:26:31 2011 +0200
+++ b/graal/GraalRuntime/src/com/oracle/graal/runtime/HotSpotMethodUnresolved.java	Mon May 16 17:26:47 2011 +0200
@@ -79,11 +79,6 @@
     }
 
     @Override
-    public RiMethod uniqueConcreteMethod() {
-        throw unresolved("uniqueConcreteMethod()");
-    }
-
-    @Override
     public int accessFlags() {
         throw unresolved("accessFlags");
     }
diff -r c5739b99762a -r 026b21a81651 graal/GraalRuntime/src/com/oracle/graal/runtime/HotSpotTypePrimitive.java
--- a/graal/GraalRuntime/src/com/oracle/graal/runtime/HotSpotTypePrimitive.java	Mon May 16 17:26:31 2011 +0200
+++ b/graal/GraalRuntime/src/com/oracle/graal/runtime/HotSpotTypePrimitive.java	Mon May 16 17:26:47 2011 +0200
@@ -150,4 +150,9 @@
         return this;
     }
 
+    @Override
+    public RiMethod uniqueConcreteMethod(RiMethod method) {
+        return null;
+    }
+
 }
diff -r c5739b99762a -r 026b21a81651 graal/GraalRuntime/src/com/oracle/graal/runtime/HotSpotTypeResolvedImpl.java
--- a/graal/GraalRuntime/src/com/oracle/graal/runtime/HotSpotTypeResolvedImpl.java	Mon May 16 17:26:31 2011 +0200
+++ b/graal/GraalRuntime/src/com/oracle/graal/runtime/HotSpotTypeResolvedImpl.java	Mon May 16 17:26:47 2011 +0200
@@ -222,4 +222,10 @@
         return result;
     }
 
+    @Override
+    public RiMethod uniqueConcreteMethod(RiMethod method) {
+        assert method instanceof HotSpotMethodResolved;
+        return ((HotSpotMethodResolved) method).uniqueConcreteMethod();
+    }
+
 }
diff -r c5739b99762a -r 026b21a81651 graal/GraalRuntime/src/com/oracle/graal/runtime/HotSpotTypeUnresolved.java
--- a/graal/GraalRuntime/src/com/oracle/graal/runtime/HotSpotTypeUnresolved.java	Mon May 16 17:26:31 2011 +0200
+++ b/graal/GraalRuntime/src/com/oracle/graal/runtime/HotSpotTypeUnresolved.java	Mon May 16 17:26:47 2011 +0200
@@ -201,4 +201,9 @@
         return CiKind.Object;
     }
 
+    @Override
+    public RiMethod uniqueConcreteMethod(RiMethod method) {
+        throw unresolved("uniqueConcreteMethod");
+    }
+
 }
diff -r c5739b99762a -r 026b21a81651 runtests.sh
--- a/runtests.sh	Mon May 16 17:26:31 2011 +0200
+++ b/runtests.sh	Mon May 16 17:26:47 2011 +0200
@@ -11,4 +11,4 @@
   echo "GRAAL is not defined. It must point to a maxine repository directory."
   exit 1;
 fi
-${JDK7}/bin/java -client -d64 -graal -ea -esa -Xcomp -XX:+PrintCompilation -XX:CompileOnly=jtt -Xbootclasspath/p:"${MAXINE}/VM/bin" -Xbootclasspath/p:"${MAXINE}/Base/bin" $1 test.com.sun.max.vm.compiler.JavaTester -verbose=1 -gen-run-scheme=false -run-scheme-package=all ${MAXINE}/VM/test/jtt/bytecode ${MAXINE}/VM/test/jtt/except ${MAXINE}/VM/test/jtt/hotpath ${MAXINE}/VM/test/jtt/jdk ${MAXINE}/VM/test/jtt/lang ${MAXINE}/VM/test/jtt/loop ${MAXINE}/VM/test/jtt/micro ${MAXINE}/VM/test/jtt/optimize ${MAXINE}/VM/test/jtt/reflect ${MAXINE}/VM/test/jtt/threads
+${JDK7}/bin/java -client -d64 -graal -ea -esa -Xcomp -XX:+PrintCompilation -XX:CompileOnly=jtt -Xbootclasspath/p:"${MAXINE}/VM/bin" -Xbootclasspath/p:"${MAXINE}/com.oracle.max.base/bin" $1 test.com.sun.max.vm.compiler.JavaTester -verbose=1 -gen-run-scheme=false -run-scheme-package=all ${MAXINE}/VM/test/jtt/bytecode ${MAXINE}/VM/test/jtt/except ${MAXINE}/VM/test/jtt/hotpath ${MAXINE}/VM/test/jtt/jdk ${MAXINE}/VM/test/jtt/lang ${MAXINE}/VM/test/jtt/loop ${MAXINE}/VM/test/jtt/micro ${MAXINE}/VM/test/jtt/optimize ${MAXINE}/VM/test/jtt/reflect ${MAXINE}/VM/test/jtt/threads