Mercurial > hg > graal-compiler
changeset 8152:2bc6f232f74e
More fixes in the C++ part.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Thu, 07 Mar 2013 21:18:35 +0100 |
parents | b8f261ba79c6 |
children | 466de7e331ef |
files | src/share/vm/code/nmethod.cpp src/share/vm/compiler/compileBroker.cpp |
diffstat | 2 files changed, 8 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/code/nmethod.cpp Thu Mar 07 21:00:29 2013 +0100 +++ b/src/share/vm/code/nmethod.cpp Thu Mar 07 21:18:35 2013 +0100 @@ -125,6 +125,7 @@ // PrintC1Statistics, PrintOptoStatistics, LogVMOutput, and LogCompilation. // (In the latter two cases, they like other stats are printed to the log only.) +#ifndef PRODUCT // These variables are put into one block to reduce relocations // and make it simpler to print from the debugger. static @@ -214,6 +215,7 @@ pc_desc_tests, pc_desc_searches, pc_desc_adds); } } nmethod_stats; +#endif //PRODUCT //--------------------------------------------------------------------------------- @@ -553,7 +555,7 @@ nm = new (nmethod_size) nmethod(method(), nmethod_size, &offsets, code_buffer, frame_size); - if (nm != NULL) nmethod_stats.note_nmethod(nm); + NOT_PRODUCT(if (nm != NULL) nmethod_stats.note_nmethod(nm)); if (PrintAssembly && nm != NULL) Disassembler::decode(nm); } @@ -632,7 +634,7 @@ InstanceKlass::cast(klass)->add_dependent_nmethod(nm); } } - if (nm != NULL) nmethod_stats.note_nmethod(nm); + NOT_PRODUCT(if (nm != NULL) nmethod_stats.note_nmethod(nm)); if (PrintAssembly && nm != NULL) Disassembler::decode(nm); } @@ -1810,8 +1812,8 @@ // really alive. void nmethod::verify_metadata_loaders(address low_boundary, BoolObjectClosure* is_alive) { #ifdef ASSERT - RelocIterator iter(this, low_boundary); - while (iter.next()) { + RelocIterator iter(this, low_boundary); + while (iter.next()) { // static_stub_Relocations may have dangling references to // Method*s so trim them out here. Otherwise it looks like // compiled code is maintaining a link to dead metadata. @@ -2501,9 +2503,7 @@ // information in a table. break; } -#ifndef GRAAL assert(stub == NULL || stub_contains(stub), "static call stub outside stub section"); -#endif } } @@ -2995,8 +2995,6 @@ ImplicitExceptionTable(this).print(code_begin()); } -#endif // PRODUCT - void nmethod::print_statistics() { ttyLocker ttyl; if (xtty != NULL) xtty->head("statistics type='nmethod'"); @@ -3007,3 +3005,5 @@ Dependencies::print_statistics(); if (xtty != NULL) xtty->tail("statistics"); } + +#endif // PRODUCT
--- a/src/share/vm/compiler/compileBroker.cpp Thu Mar 07 21:00:29 2013 +0100 +++ b/src/share/vm/compiler/compileBroker.cpp Thu Mar 07 21:18:35 2013 +0100 @@ -44,9 +44,6 @@ #include "runtime/sharedRuntime.hpp" #include "runtime/sweeper.hpp" #include "utilities/dtrace.hpp" -#ifdef GRAAL -#include "graal/graalCompiler.hpp" -#endif #include "utilities/events.hpp" #ifdef COMPILER1 #include "c1/c1_Compiler.hpp"