Mercurial > hg > graal-compiler
changeset 13717:a65486301b31
Merge.
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 20 Jan 2014 22:30:19 +0100 |
parents | 984782c1211c (current diff) 810f2c413ace (diff) |
children | 34b07168b505 |
files | |
diffstat | 3 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/oops/instanceKlass.cpp Mon Jan 20 19:12:01 2014 +0100 +++ b/src/share/vm/oops/instanceKlass.cpp Mon Jan 20 22:30:19 2014 +0100 @@ -3016,9 +3016,9 @@ if (this == SystemDictionary::String_klass()) { typeArrayOop value = java_lang_String::value(obj); juint offset = java_lang_String::offset(obj); + if (value != NULL) { juint length = java_lang_String::length(obj); - if (value != NULL && - value->is_typeArray() && + if (value->is_typeArray() && offset <= (juint) value->length() && offset + length <= (juint) value->length()) { st->print(BULLET"string: "); @@ -3028,6 +3028,7 @@ if (!WizardMode) return; // that is enough } } + } st->print_cr(BULLET"---- fields (total size %d words):", oop_size(obj)); FieldPrinter print_field(st, obj);
--- a/src/share/vm/runtime/deoptimization.cpp Mon Jan 20 19:12:01 2014 +0100 +++ b/src/share/vm/runtime/deoptimization.cpp Mon Jan 20 22:30:19 2014 +0100 @@ -1370,6 +1370,7 @@ int trap_bci = trap_scope->bci(); #ifdef GRAAL oop speculation = thread->pending_failed_speculation(); + if (nm->is_compiled_by_graal()) { if (speculation != NULL) { oop speculation_log = nm->speculation_log(); if (speculation_log != NULL) { @@ -1393,6 +1394,11 @@ tty->print_cr("No speculation"); } } + } else { +#ifdef ASSERT + assert(speculation == NULL, "There should not be a speculation for method compiled by other compilers"); +#endif + } if (trap_bci == SynchronizationEntryBCI) { trap_bci = 0;
--- a/src/share/vm/runtime/sweeper.cpp Mon Jan 20 19:12:01 2014 +0100 +++ b/src/share/vm/runtime/sweeper.cpp Mon Jan 20 22:30:19 2014 +0100 @@ -233,7 +233,7 @@ void NMethodSweeper::possibly_sweep() { assert(JavaThread::current()->thread_state() == _thread_in_vm, "must run in vm mode"); // Only compiler threads are allowed to sweep - if (!MethodFlushing || !sweep_in_progress() || !Thread::current()->is_Compiler_thread()) { + if (!MethodFlushing || !sweep_in_progress() NOT_GRAAL(|| !Thread::current()->is_Compiler_thread())) { return; }