Mercurial > hg > truffle
changeset 5749:12706c5b39bc
minor C1/C2 bugfix
author | Christian Haeubl <haeubl@ssw.jku.at> |
---|---|
date | Tue, 03 Jul 2012 18:02:03 +0200 |
parents | 63f0719bde9a |
children | 99e186e7ad62 0ed5c283c55d 87e8baf5447c |
files | src/share/vm/runtime/deoptimization.cpp src/share/vm/utilities/globalDefinitions.hpp |
diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/runtime/deoptimization.cpp Tue Jul 03 17:29:11 2012 +0200 +++ b/src/share/vm/runtime/deoptimization.cpp Tue Jul 03 18:02:03 2012 +0200 @@ -1291,6 +1291,7 @@ if (TraceDeoptimization) { tty->print_cr(" bci=%d pc=%d, relative_pc=%d, method=%s", trap_scope->bci(), fr.pc(), fr.pc() - nm->code_begin(), trap_scope->method()->name()->as_C_string()); +#ifdef GRAAL if (thread->graal_deopt_info() != NULL) { oop deopt_info = thread->graal_deopt_info(); if (java_lang_String::is_instance(deopt_info)) { @@ -1303,6 +1304,7 @@ } thread->set_graal_deopt_info(NULL); } +#endif } methodHandle trap_method = trap_scope->method();
--- a/src/share/vm/utilities/globalDefinitions.hpp Tue Jul 03 17:29:11 2012 +0200 +++ b/src/share/vm/utilities/globalDefinitions.hpp Tue Jul 03 18:02:03 2012 +0200 @@ -106,9 +106,9 @@ // log2_intptr(sizeof(class JavaThread)) - log2_intptr(64); // see os::set_memory_serialize_page() #ifdef _LP64 -const int SerializePageShiftCount = 5; +const int SerializePageShiftCount = GRAAL_ONLY(5) NOT_GRAAL(4); #else -const int SerializePageShiftCount = 4; +const int SerializePageShiftCount = GRAAL_ONLY(4) NOT_GRAAL(3); #endif // An opaque struct of heap-word width, so that HeapWord* can be a generic