# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1385504058 -3600
# Node ID feff37de44653ad89bdced4d93fcddd91edcc0ac
# Parent  5c7f67c7ccd483258f505351fbb1988cbe7bf465# Parent  57ea5bfec214499efec03789b3c1793e6d3c843f
Merge.

diff -r 5c7f67c7ccd4 -r feff37de4465 src/share/vm/asm/codeBuffer.cpp
--- a/src/share/vm/asm/codeBuffer.cpp	Tue Nov 26 22:15:04 2013 +0100
+++ b/src/share/vm/asm/codeBuffer.cpp	Tue Nov 26 23:14:18 2013 +0100
@@ -1096,8 +1096,9 @@
     CodeString* c = find(offset);
     while (c && c->offset() == offset) {
       stream->bol();
-      stream->print("  ;; ");
-      stream->print_cr(c->string());
+      stream->print_raw("  ;; ");
+      // Don't interpret as format strings since it could contain %
+      stream->print_raw_cr(c->string());
       c = c->next_comment();
     }
   }
diff -r 5c7f67c7ccd4 -r feff37de4465 src/share/vm/prims/jni.cpp
--- a/src/share/vm/prims/jni.cpp	Tue Nov 26 22:15:04 2013 +0100
+++ b/src/share/vm/prims/jni.cpp	Tue Nov 26 23:14:18 2013 +0100
@@ -5176,7 +5176,11 @@
 #ifdef GRAAL
     // GraalCompiler needs to have been created in compileBroker.cpp
     GraalCompiler* graal_compiler = GraalCompiler::instance();
-    graal_compiler->initialize();
+    if (graal_compiler != NULL) {
+      graal_compiler->initialize();
+    } else {
+      assert(!UseCompiler, "why isn't there are compiler?");
+    }
 #endif
 
     // Tracks the time application was running before GC
diff -r 5c7f67c7ccd4 -r feff37de4465 src/share/vm/runtime/java.cpp
--- a/src/share/vm/runtime/java.cpp	Tue Nov 26 22:15:04 2013 +0100
+++ b/src/share/vm/runtime/java.cpp	Tue Nov 26 23:14:18 2013 +0100
@@ -462,7 +462,9 @@
   static jint volatile _before_exit_status = BEFORE_EXIT_NOT_RUN;
 
 #ifdef GRAAL
-  GraalCompiler::instance()->exit();
+  if (GraalCompiler::instance() != NULL) {
+    GraalCompiler::instance()->exit();
+  }
 #endif
 
   // Note: don't use a Mutex to guard the entire before_exit(), as
diff -r 5c7f67c7ccd4 -r feff37de4465 src/share/vm/runtime/vframeArray.cpp
--- a/src/share/vm/runtime/vframeArray.cpp	Tue Nov 26 22:15:04 2013 +0100
+++ b/src/share/vm/runtime/vframeArray.cpp	Tue Nov 26 23:14:18 2013 +0100
@@ -251,9 +251,6 @@
       case Deoptimization::Unpack_uncommon_trap:
       case Deoptimization::Unpack_reexecute:
         // redo last byte code
-#ifdef GRAALVM
-        assert(should_reexecute(), "");
-#endif
         pc  = Interpreter::deopt_entry(vtos, 0);
         use_next_mdp = false;
         break;