Mercurial > hg > truffle
diff src/share/vm/code/nmethod.cpp @ 6806:f2e12eb74117 hs25-b03
Merge
author | kvn |
---|---|
date | Fri, 28 Sep 2012 10:16:29 -0700 |
parents | 8966c2d65d96 b31471cdc53e |
children | 18fb7da42534 |
line wrap: on
line diff
--- a/src/share/vm/code/nmethod.cpp Fri Sep 28 14:14:25 2012 +0200 +++ b/src/share/vm/code/nmethod.cpp Fri Sep 28 10:16:29 2012 -0700 @@ -463,6 +463,7 @@ _has_unsafe_access = 0; _has_method_handle_invokes = 0; _lazy_critical_native = 0; + _has_wide_vectors = 0; _marked_for_deoptimization = 0; _lock_count = 0; _stack_traversal_mark = 0; @@ -700,7 +701,9 @@ // then print the requested information if (PrintNativeNMethods) { print_code(); - oop_maps->print(); + if (oop_maps != NULL) { + oop_maps->print(); + } } if (PrintRelocations) { print_relocations(); @@ -2666,7 +2669,7 @@ return NULL; } -void nmethod::print_nmethod_labels(outputStream* stream, address block_begin) { +void nmethod::print_nmethod_labels(outputStream* stream, address block_begin) const { if (block_begin == entry_point()) stream->print_cr("[Entry Point]"); if (block_begin == verified_entry_point()) stream->print_cr("[Verified Entry Point]"); if (block_begin == exception_begin()) stream->print_cr("[Exception Handler]");