# HG changeset patch
# User Lukas Stadler <lukas.stadler@jku.at>
# Date 1307728232 -7200
# Node ID 668603cb3263109f5a7d181ad3c47c14ab196147
# Parent  c7783b6773ea9048da1642d48f855dcd62e443a5# Parent  2823897b2da23d1e4a0623ba065c2a10341b5d31
merge

diff -r c7783b6773ea -r 668603cb3263 graal/com.oracle.max.graal.graph/src/com/oracle/max/graal/graph/NodeWorkList.java
--- a/graal/com.oracle.max.graal.graph/src/com/oracle/max/graal/graph/NodeWorkList.java	Fri Jun 10 19:50:16 2011 +0200
+++ b/graal/com.oracle.max.graal.graph/src/com/oracle/max/graal/graph/NodeWorkList.java	Fri Jun 10 19:50:32 2011 +0200
@@ -77,6 +77,7 @@
 
     public void replaced(Node newNode, Node oldNode, boolean add, EdgeType... edges) {
         visited.grow(newNode);
+        inQueue.grow(newNode);
         worklist.remove(oldNode);
         assert !worklist.contains(oldNode);
         if (add) {
diff -r c7783b6773ea -r 668603cb3263 graal/com.oracle.max.graal.runtime/src/com/oracle/max/graal/runtime/VMExitsNative.java
--- a/graal/com.oracle.max.graal.runtime/src/com/oracle/max/graal/runtime/VMExitsNative.java	Fri Jun 10 19:50:16 2011 +0200
+++ b/graal/com.oracle.max.graal.runtime/src/com/oracle/max/graal/runtime/VMExitsNative.java	Fri Jun 10 19:50:32 2011 +0200
@@ -77,7 +77,7 @@
     public void startCompiler() {
         originalOut = System.out;
         originalErr = System.err;
-        TTY.println("startCompiler: " + originalOut);
+        //TTY.println("startCompiler: " + originalOut);
     }
 
     public void shutdownCompiler() throws Throwable {
diff -r c7783b6773ea -r 668603cb3263 src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputBlock.java
--- a/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputBlock.java	Fri Jun 10 19:50:16 2011 +0200
+++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputBlock.java	Fri Jun 10 19:50:32 2011 +0200
@@ -98,7 +98,7 @@
         graph.setBlock(n, this);
         final InputNode node = graph.getNode(id);
         assert node != null;
-        assert !nodes.contains(node);
+        assert !nodes.contains(node) : "duplicate : " + node;
         nodes.add(node);
     }
 
diff -r c7783b6773ea -r 668603cb3263 src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramScene.java
--- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramScene.java	Fri Jun 10 19:50:16 2011 +0200
+++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramScene.java	Fri Jun 10 19:50:32 2011 +0200
@@ -1021,7 +1021,7 @@
 
         for (Figure f : diagram.getFigures()) {
             FigureWidget w = getWidget(f);
-            if (w.isVisible()) {
+            if (w != null && w.isVisible()) {
                 oldVisibleWidgets.add(w);
             }
         }
diff -r c7783b6773ea -r 668603cb3263 src/share/vm/runtime/java.cpp
--- a/src/share/vm/runtime/java.cpp	Fri Jun 10 19:50:16 2011 +0200
+++ b/src/share/vm/runtime/java.cpp	Fri Jun 10 19:50:32 2011 +0200
@@ -419,9 +419,9 @@
   #define BEFORE_EXIT_DONE    2
   static jint volatile _before_exit_status = BEFORE_EXIT_NOT_RUN;
 
-//  if (UseGraal) {
-//    GraalCompiler::instance()->exit();
-//  }
+  if (UseGraal) {
+    GraalCompiler::instance()->exit();
+  }
 
   // Note: don't use a Mutex to guard the entire before_exit(), as
   // JVMTI post_thread_end_event and post_vm_death_event will run native code.