Mercurial > hg > graal-compiler
changeset 13180:feff37de4465
Merge.
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Tue, 26 Nov 2013 23:14:18 +0100 |
parents | 5c7f67c7ccd4 (current diff) 57ea5bfec214 (diff) |
children | 389d40d7d99f |
files | |
diffstat | 4 files changed, 11 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- 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(); } }
--- 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
--- 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
--- 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;