--- a/hotspot/src/share/vm/code/codeBlob.hpp Mon Nov 21 08:27:10 2016 +0100
+++ b/hotspot/src/share/vm/code/codeBlob.hpp Mon Nov 21 09:33:06 2016 +0100
@@ -159,7 +159,8 @@
bool blob_contains(address addr) const { return header_begin() <= addr && addr < data_end(); }
bool code_contains(address addr) const { return code_begin() <= addr && addr < code_end(); }
bool contains(address addr) const { return content_begin() <= addr && addr < content_end(); }
- bool is_frame_complete_at(address addr) const { return code_contains(addr) && addr >= code_begin() + _frame_complete_offset; }
+ bool is_frame_complete_at(address addr) const { return _frame_complete_offset != CodeOffsets::frame_never_safe &&
+ code_contains(addr) && addr >= code_begin() + _frame_complete_offset; }
// CodeCache support: really only used by the nmethods, but in order to get
// asserts and certain bookkeeping to work in the CodeCache they are defined