# HG changeset patch
# User Gilles Duboscq <gilles.m.duboscq@gmail.com>
# Date 1322152037 -3600
# Node ID 9b5611392eb974ef52a37968e389d5eb6cc8ef1d
# Parent  872e949a08270d75746672bbe151d2f535ed7531# Parent  7c26db3259c60c3e4bf75e0b42a429301314b79b
Merge

diff -r 872e949a0827 -r 9b5611392eb9 src/share/vm/graal/graalCompiler.cpp
--- a/src/share/vm/graal/graalCompiler.cpp	Thu Nov 24 17:25:39 2011 +0100
+++ b/src/share/vm/graal/graalCompiler.cpp	Thu Nov 24 17:27:17 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();
+      }
     }
   }
 }