# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1322147673 -3600
# Node ID 7c26db3259c60c3e4bf75e0b42a429301314b79b
# Parent  221133c5ed6c30dccb54af70d2904d3e2763bdc2# Parent  60d31b1fada5bf4ba6a938e918ea1796c1f12c4d
Merge.

diff -r 60d31b1fada5 -r 7c26db3259c6 src/share/vm/graal/graalCompiler.cpp
--- a/src/share/vm/graal/graalCompiler.cpp	Thu Nov 24 14:09:18 2011 +0100
+++ b/src/share/vm/graal/graalCompiler.cpp	Thu Nov 24 16:14:33 2011 +0100
@@ -80,11 +80,12 @@
         vm_abort(false);
       }
     }
-    VMExits::startCompiler();
-  
-    _initialized = true;
-    if (BootstrapGraal) {
-      VMExits::bootstrap();
+    if (UseCompiler) {
+      VMExits::startCompiler();
+      _initialized = true;
+      if (BootstrapGraal) {
+        VMExits::bootstrap();
+      }
     }
   }
 }