archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 19:44:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Changpeng Fang 2009-10-16 14:08:44 -07:00
commit 35ca20c546
129 changed files with 8124 additions and 186 deletions
Download patch file Download diff file Expand all files Collapse all files

3
hotspot/src/share/vm/code/debugInfoRec.cpp
View file

@ -356,8 +356,7 @@ void DebugInformationRecorder::end_scopes(int pc_offset, bool is_safepoint) {
// search forward until it finds last.
// In addition, it does not matter if the last PcDesc
// is for a safepoint or not.
if (_prev_safepoint_pc < prev->pc_offset() &&
prev->scope_decode_offset() == last->scope_decode_offset()) {
if (_prev_safepoint_pc < prev->pc_offset() && prev->is_same_info(last)) {
assert(prev == last-1, "sane");
prev->set_pc_offset(pc_offset);
_pcs_length -= 1;

8
hotspot/src/share/vm/code/pcDesc.hpp
View file

@ -39,6 +39,7 @@ class PcDesc VALUE_OBJ_CLASS_SPEC {
struct {
unsigned int reexecute: 1;
} bits;
bool operator ==(const PcDescFlags& other) { return word == other.word; }
} _flags;
public:
@ -64,6 +65,13 @@ class PcDesc VALUE_OBJ_CLASS_SPEC {
bool should_reexecute() const { return _flags.bits.reexecute; }
void set_should_reexecute(bool z) { _flags.bits.reexecute = z; }
// Does pd refer to the same information as pd?
bool is_same_info(const PcDesc* pd) {
return _scope_decode_offset == pd->_scope_decode_offset &&
_obj_decode_offset == pd->_obj_decode_offset &&
_flags == pd->_flags;
}
// Returns the real pc
address real_pc(const nmethod* code) const;