changeset 3695:7c26db3259c6

Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Thu, 24 Nov 2011 16:14:33 +0100
parents 221133c5ed6c (diff) 60d31b1fada5 (current diff)
children 9b5611392eb9 67e92894d065
files
diffstat 1 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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();
+      }
     }
   }
 }