< prev index next >
src/hotspot/share/oops/generateOopMap.cpp
Print this page
*** 119,129 ****
virtual void do_byte () { set(CellTypeState::value); };
virtual void do_short () { set(CellTypeState::value); };
virtual void do_int () { set(CellTypeState::value); };
virtual void do_void () { set(CellTypeState::bottom);};
virtual void do_object(int begin, int end) { set(CellTypeState::ref); };
- virtual void do_valuetype (int begin, int end) { set(CellTypeState::valuetype); };
virtual void do_array (int begin, int end) { set(CellTypeState::ref); };
void do_double() { set(CellTypeState::value);
set(CellTypeState::value); }
void do_long () { set(CellTypeState::value);
--- 119,128 ----
*** 136,146 ****
int compute_for_parameters(bool is_static, CellTypeState *effect) {
_idx = 0;
_effect = effect;
if (!is_static) {
! effect[_idx++] = CellTypeState::refOrValueType;
}
iterate_parameters();
return length();
--- 135,145 ----
int compute_for_parameters(bool is_static, CellTypeState *effect) {
_idx = 0;
_effect = effect;
if (!is_static) {
! effect[_idx++] = CellTypeState::ref;
}
iterate_parameters();
return length();
*** 176,186 ****
virtual void do_short () { set(CellTypeState::value); };
virtual void do_int () { set(CellTypeState::value); };
virtual void do_void () { set(CellTypeState::bottom);};
virtual void do_object(int begin, int end) { set(CellTypeState::make_slot_ref(_idx)); }
virtual void do_array (int begin, int end) { set(CellTypeState::make_slot_ref(_idx)); }
- virtual void do_valuetype(int begin, int end) { set(CellTypeState::make_slot_valuetype(_idx)); }
void do_double() { set(CellTypeState::value);
set(CellTypeState::value); }
void do_long () { set(CellTypeState::value);
set(CellTypeState::value); }
--- 175,184 ----
*** 298,342 ****
CellTypeState CellTypeState::bottom = CellTypeState::make_bottom();
CellTypeState CellTypeState::uninit = CellTypeState::make_any(uninit_value);
CellTypeState CellTypeState::ref = CellTypeState::make_any(ref_conflict);
CellTypeState CellTypeState::value = CellTypeState::make_any(val_value);
- CellTypeState CellTypeState::valuetype = CellTypeState::make_any(valuetype_conflict);
- CellTypeState CellTypeState::refOrValueType = CellTypeState::make_any(valuetype_conflict | ref_conflict);
CellTypeState CellTypeState::refUninit = CellTypeState::make_any(ref_conflict | uninit_value);
CellTypeState CellTypeState::top = CellTypeState::make_top();
CellTypeState CellTypeState::addr = CellTypeState::make_any(addr_conflict);
// Commonly used constants
static CellTypeState epsilonCTS[1] = { CellTypeState::bottom };
static CellTypeState refCTS = CellTypeState::ref;
static CellTypeState valCTS = CellTypeState::value;
- static CellTypeState valuetypeCTS = CellTypeState::valuetype;
static CellTypeState vCTS[2] = { CellTypeState::value, CellTypeState::bottom };
static CellTypeState rCTS[2] = { CellTypeState::ref, CellTypeState::bottom };
- static CellTypeState qCTS[2] = { CellTypeState::valuetype, CellTypeState::bottom };
static CellTypeState rrCTS[3] = { CellTypeState::ref, CellTypeState::ref, CellTypeState::bottom };
static CellTypeState vrCTS[3] = { CellTypeState::value, CellTypeState::ref, CellTypeState::bottom };
static CellTypeState vvCTS[3] = { CellTypeState::value, CellTypeState::value, CellTypeState::bottom };
static CellTypeState rvrCTS[4] = { CellTypeState::ref, CellTypeState::value, CellTypeState::ref, CellTypeState::bottom };
- static CellTypeState qvrCTS[4] = { CellTypeState::valuetype, CellTypeState::value, CellTypeState::ref, CellTypeState::bottom };
static CellTypeState vvrCTS[4] = { CellTypeState::value, CellTypeState::value, CellTypeState::ref, CellTypeState::bottom };
static CellTypeState vvvCTS[4] = { CellTypeState::value, CellTypeState::value, CellTypeState::value, CellTypeState::bottom };
static CellTypeState vvvrCTS[5] = { CellTypeState::value, CellTypeState::value, CellTypeState::value, CellTypeState::ref, CellTypeState::bottom };
static CellTypeState vvvvCTS[5] = { CellTypeState::value, CellTypeState::value, CellTypeState::value, CellTypeState::value, CellTypeState::bottom };
char CellTypeState::to_char() const {
if (can_be_reference()) {
- if (can_be_value() || can_be_address() || can_be_valuetype())
- return '#'; // Conflict that needs to be rewritten
- else
- return 'r';
- } else if (can_be_valuetype()) {
if (can_be_value() || can_be_address())
return '#'; // Conflict that needs to be rewritten
else
! return 'q';
} else if (can_be_value())
return 'v';
else if (can_be_address())
return 'p';
else if (can_be_uninit())
--- 296,330 ----
CellTypeState CellTypeState::bottom = CellTypeState::make_bottom();
CellTypeState CellTypeState::uninit = CellTypeState::make_any(uninit_value);
CellTypeState CellTypeState::ref = CellTypeState::make_any(ref_conflict);
CellTypeState CellTypeState::value = CellTypeState::make_any(val_value);
CellTypeState CellTypeState::refUninit = CellTypeState::make_any(ref_conflict | uninit_value);
CellTypeState CellTypeState::top = CellTypeState::make_top();
CellTypeState CellTypeState::addr = CellTypeState::make_any(addr_conflict);
// Commonly used constants
static CellTypeState epsilonCTS[1] = { CellTypeState::bottom };
static CellTypeState refCTS = CellTypeState::ref;
static CellTypeState valCTS = CellTypeState::value;
static CellTypeState vCTS[2] = { CellTypeState::value, CellTypeState::bottom };
static CellTypeState rCTS[2] = { CellTypeState::ref, CellTypeState::bottom };
static CellTypeState rrCTS[3] = { CellTypeState::ref, CellTypeState::ref, CellTypeState::bottom };
static CellTypeState vrCTS[3] = { CellTypeState::value, CellTypeState::ref, CellTypeState::bottom };
static CellTypeState vvCTS[3] = { CellTypeState::value, CellTypeState::value, CellTypeState::bottom };
static CellTypeState rvrCTS[4] = { CellTypeState::ref, CellTypeState::value, CellTypeState::ref, CellTypeState::bottom };
static CellTypeState vvrCTS[4] = { CellTypeState::value, CellTypeState::value, CellTypeState::ref, CellTypeState::bottom };
static CellTypeState vvvCTS[4] = { CellTypeState::value, CellTypeState::value, CellTypeState::value, CellTypeState::bottom };
static CellTypeState vvvrCTS[5] = { CellTypeState::value, CellTypeState::value, CellTypeState::value, CellTypeState::ref, CellTypeState::bottom };
static CellTypeState vvvvCTS[5] = { CellTypeState::value, CellTypeState::value, CellTypeState::value, CellTypeState::value, CellTypeState::bottom };
char CellTypeState::to_char() const {
if (can_be_reference()) {
if (can_be_value() || can_be_address())
return '#'; // Conflict that needs to be rewritten
else
! return 'r';
} else if (can_be_value())
return 'v';
else if (can_be_address())
return 'p';
else if (can_be_uninit())
*** 363,377 ****
if (can_be_value()) {
os->print("v");
} else {
os->print(" ");
}
- if (can_be_valuetype()) {
- os->print("q");
- } else {
- os->print(" ");
- }
if (can_be_uninit()) {
os->print("u|");
} else {
os->print(" |");
}
--- 351,360 ----
*** 610,620 ****
case Bytecodes::_ireturn:
case Bytecodes::_lreturn:
case Bytecodes::_freturn:
case Bytecodes::_dreturn:
case Bytecodes::_areturn:
- case Bytecodes::_vreturn:
case Bytecodes::_return:
case Bytecodes::_ret:
break;
default:
return true;
--- 593,602 ----
*** 722,740 ****
result._state = _state | cts._state;
// If the top bit is set, we don't need to do any more work.
if (!result.is_info_top()) {
! assert((result.can_be_address() || result.can_be_reference() || result.can_be_valuetype()),
"only addresses and references have non-top info");
if (!equal(cts)) {
// The two values being merged are different. Raise to top.
if (result.is_reference()) {
result = CellTypeState::make_slot_ref(slot);
- } else if (result.is_valuetype()) {
- result = CellTypeState::make_slot_valuetype(slot);
} else {
result._state |= info_conflict;
}
}
}
--- 704,720 ----
result._state = _state | cts._state;
// If the top bit is set, we don't need to do any more work.
if (!result.is_info_top()) {
! assert((result.can_be_address() || result.can_be_reference()),
"only addresses and references have non-top info");
if (!equal(cts)) {
// The two values being merged are different. Raise to top.
if (result.is_reference()) {
result = CellTypeState::make_slot_ref(slot);
} else {
result._state |= info_conflict;
}
}
}
*** 853,863 ****
void GenerateOopMap::merge_state(GenerateOopMap *gom, int bci, int* data) {
gom->merge_state_into_bb(gom->get_basic_block_at(bci));
}
void GenerateOopMap::set_var(int localNo, CellTypeState cts) {
! assert(cts.is_reference() || cts.is_value() || cts.is_address() || cts.is_valuetype(),
"wrong celltypestate");
if (localNo < 0 || localNo > _max_locals) {
verify_error("variable write error: r%d", localNo);
return;
}
--- 833,843 ----
void GenerateOopMap::merge_state(GenerateOopMap *gom, int bci, int* data) {
gom->merge_state_into_bb(gom->get_basic_block_at(bci));
}
void GenerateOopMap::set_var(int localNo, CellTypeState cts) {
! assert(cts.is_reference() || cts.is_value() || cts.is_address(),
"wrong celltypestate");
if (localNo < 0 || localNo > _max_locals) {
verify_error("variable write error: r%d", localNo);
return;
}
*** 1394,1405 ****
case Bytecodes::_aconst_null:
case Bytecodes::_new: ppush1(CellTypeState::make_line_ref(itr->bci()));
break;
! case Bytecodes::_vdefault: ppush1(CellTypeState::make_line_valuetype(itr->bci())); break;
! case Bytecodes::_vwithfield: do_vwithfield(itr->get_index_u2_cpcache(), itr->bci()); break;
case Bytecodes::_iconst_m1:
case Bytecodes::_iconst_0:
case Bytecodes::_iconst_1:
case Bytecodes::_iconst_2:
--- 1374,1385 ----
case Bytecodes::_aconst_null:
case Bytecodes::_new: ppush1(CellTypeState::make_line_ref(itr->bci()));
break;
! case Bytecodes::_defaultvalue: ppush1(CellTypeState::make_line_ref(itr->bci())); break;
! case Bytecodes::_withfield: do_withfield(itr->get_index_u2_cpcache(), itr->bci()); break;
case Bytecodes::_iconst_m1:
case Bytecodes::_iconst_0:
case Bytecodes::_iconst_1:
case Bytecodes::_iconst_2:
*** 1428,1439 ****
case Bytecodes::_lload:
case Bytecodes::_dload: ppload(vvCTS,itr->get_index()); break;
case Bytecodes::_aload: ppload(rCTS, itr->get_index()); break;
- case Bytecodes::_vload: ppload(qCTS, itr->get_index()); break;
-
case Bytecodes::_iload_0:
case Bytecodes::_fload_0: ppload(vCTS, 0); break;
case Bytecodes::_iload_1:
case Bytecodes::_fload_1: ppload(vCTS, 1); break;
case Bytecodes::_iload_2:
--- 1408,1417 ----
*** 1463,1482 ****
case Bytecodes::_laload: pp(vrCTS, vvCTS); break;
case Bytecodes::_daload: pp(vrCTS, vvCTS); break;
case Bytecodes::_aaload: pp_new_ref(vrCTS, itr->bci()); break;
- case Bytecodes::_vaload: pp_new_valuetype(vrCTS, itr->bci()); break;
case Bytecodes::_istore:
case Bytecodes::_fstore: ppstore(vCTS, itr->get_index()); break;
case Bytecodes::_lstore:
case Bytecodes::_dstore: ppstore(vvCTS, itr->get_index()); break;
case Bytecodes::_astore: do_astore(itr->get_index()); break;
- case Bytecodes::_vstore: do_vstore(itr->get_index()); break;
case Bytecodes::_istore_0:
case Bytecodes::_fstore_0: ppstore(vCTS, 0); break;
case Bytecodes::_istore_1:
case Bytecodes::_fstore_1: ppstore(vCTS, 1); break;
--- 1441,1458 ----
*** 1505,1515 ****
case Bytecodes::_castore:
case Bytecodes::_sastore: ppop(vvrCTS); break;
case Bytecodes::_lastore:
case Bytecodes::_dastore: ppop(vvvrCTS); break;
case Bytecodes::_aastore: ppop(rvrCTS); break;
- case Bytecodes::_vastore: ppop(qvrCTS); break;
case Bytecodes::_pop: ppop_any(1); break;
case Bytecodes::_pop2: ppop_any(2); break;
case Bytecodes::_dup: ppdupswap(1, "11"); break;
--- 1481,1490 ----
*** 1647,1667 ****
case Bytecodes::_areturn: do_return_monitor_check();
ppop1(refCTS);
break;
- case Bytecodes::_vreturn: do_return_monitor_check();
- ppop1(valuetypeCTS);
- break;
-
case Bytecodes::_ifnull:
case Bytecodes::_ifnonnull: ppop1(refCTS); break;
case Bytecodes::_multianewarray: do_multianewarray(*(itr->bcp()+3), itr->bci()); break;
- case Bytecodes::_vbox: pp_new_ref(qCTS, itr->bci()); break;
- case Bytecodes::_vunbox: pp_new_valuetype(rCTS, itr->bci()); break;
-
case Bytecodes::_wide: fatal("Iterator should skip this bytecode"); break;
case Bytecodes::_ret: break;
// Java opcodes
case Bytecodes::_lookupswitch: ppop1(valCTS); break;
--- 1622,1635 ----
*** 1673,1685 ****
}
}
void GenerateOopMap::check_type(CellTypeState expected, CellTypeState actual) {
if (!expected.equal_kind(actual)) {
- // dirty hack for invokevirtual
- if (expected.equal_kind(CellTypeState::refOrValueType) &&
- (actual.equal_kind(CellTypeState::ref) || actual.equal_kind(CellTypeState::valuetype))) return;
verify_error("wrong type on stack (found: %c expected: %c)", actual.to_char(), expected.to_char());
}
}
void GenerateOopMap::ppstore(CellTypeState *in, int loc_no) {
--- 1641,1650 ----
*** 1694,1704 ****
void GenerateOopMap::ppload(CellTypeState *out, int loc_no) {
while(!(*out).is_bottom()) {
CellTypeState out1 = *out++;
CellTypeState vcts = get_var(loc_no);
! assert(out1.can_be_reference() || out1.can_be_value() || out1.can_be_valuetype(),
"can only load refs. and values.");
if (out1.is_reference()) {
assert(loc_no>=0, "sanity check");
if (!vcts.is_reference()) {
// We were asked to push a reference, but the type of the
--- 1659,1669 ----
void GenerateOopMap::ppload(CellTypeState *out, int loc_no) {
while(!(*out).is_bottom()) {
CellTypeState out1 = *out++;
CellTypeState vcts = get_var(loc_no);
! assert(out1.can_be_reference() || out1.can_be_value(),
"can only load refs. and values.");
if (out1.is_reference()) {
assert(loc_no>=0, "sanity check");
if (!vcts.is_reference()) {
// We were asked to push a reference, but the type of the
*** 1763,1773 ****
ppop1(*out++);
}
}
void GenerateOopMap::ppush1(CellTypeState in) {
! assert(in.is_reference() || in.is_value() || in.is_valuetype(), "sanity check");
push(in);
}
void GenerateOopMap::ppush(CellTypeState *in) {
while (!(*in).is_bottom()) {
--- 1728,1738 ----
ppop1(*out++);
}
}
void GenerateOopMap::ppush1(CellTypeState in) {
! assert(in.is_reference() || in.is_value(), "sanity check");
push(in);
}
void GenerateOopMap::ppush(CellTypeState *in) {
while (!(*in).is_bottom()) {
*** 1783,1797 ****
void GenerateOopMap::pp_new_ref(CellTypeState *in, int bci) {
ppop(in);
ppush1(CellTypeState::make_line_ref(bci));
}
- void GenerateOopMap::pp_new_valuetype(CellTypeState *in, int bci) {
- ppop(in);
- ppush1(CellTypeState::make_line_valuetype(bci));
- }
-
void GenerateOopMap::ppop_any(int poplen) {
if (_stack_top >= poplen) {
_stack_top -= poplen;
} else {
verify_error("stack underflow");
--- 1748,1757 ----
*** 1956,1974 ****
return;
}
set_var(idx, r_or_p);
}
- void GenerateOopMap::do_vstore(int idx) {
- CellTypeState q = pop();
- if (!q.is_valuetype()) {
- verify_error("wrong type on stack (found: %c, expected: {q})", q.to_char());
- return;
- }
- set_var(idx, q);
- }
-
// Copies bottom/zero terminated CTS string from "src" into "dst".
// Does NOT terminate with a bottom. Returns the number of cells copied.
int GenerateOopMap::copy_cts(CellTypeState *dst, CellTypeState *src) {
int idx = 0;
while (!src[idx].is_bottom()) {
--- 1916,1925 ----
*** 2001,2011 ****
} else {
out = epsilonCTS;
i = copy_cts(in, eff);
}
if (!is_static) {
! in[i++] = CellTypeState::refOrValueType;
}
in[i] = CellTypeState::bottom;
assert(i<=3, "sanity check");
pp(in, out);
}
--- 1952,1962 ----
} else {
out = epsilonCTS;
i = copy_cts(in, eff);
}
if (!is_static) {
! in[i++] = CellTypeState::ref;
}
in[i] = CellTypeState::bottom;
assert(i<=3, "sanity check");
pp(in, out);
}
*** 2045,2055 ****
// Push return address
ppush(out);
}
! void GenerateOopMap::do_vwithfield(int idx, int bci) {
// Dig up signature for field in constant pool
ConstantPool* cp = method()->constants();
int nameAndTypeIdx = cp->name_and_type_ref_index_at(idx);
int signatureIdx = cp->signature_ref_index_at(nameAndTypeIdx);
Symbol* signature = cp->symbol_at(signatureIdx);
--- 1996,2006 ----
// Push return address
ppush(out);
}
! void GenerateOopMap::do_withfield(int idx, int bci) {
// Dig up signature for field in constant pool
ConstantPool* cp = method()->constants();
int nameAndTypeIdx = cp->name_and_type_ref_index_at(idx);
int signatureIdx = cp->signature_ref_index_at(nameAndTypeIdx);
Symbol* signature = cp->symbol_at(signatureIdx);
*** 2062,2077 ****
CellTypeState temp[4];
CellTypeState *eff = sigchar_to_effect(sigch, bci, temp);
CellTypeState in[4];
int i = copy_cts(in, eff);
! in[i++] = CellTypeState::valuetype;
in[i] = CellTypeState::bottom;
assert(i <= 3, "sanity check");
CellTypeState out[2];
! out[0] = CellTypeState::valuetype;
out[1] = CellTypeState::bottom;
pp(in, out);
}
--- 2013,2028 ----
CellTypeState temp[4];
CellTypeState *eff = sigchar_to_effect(sigch, bci, temp);
CellTypeState in[4];
int i = copy_cts(in, eff);
! in[i++] = CellTypeState::ref;
in[i] = CellTypeState::bottom;
assert(i <= 3, "sanity check");
CellTypeState out[2];
! out[0] = CellTypeState::ref;
out[1] = CellTypeState::bottom;
pp(in, out);
}
*** 2081,2095 ****
if (sigch=='L' || sigch=='[') {
out[0] = CellTypeState::make_line_ref(bci);
out[1] = CellTypeState::bottom;
return out;
}
- if (sigch == 'Q') {
- out[0] = CellTypeState::make_line_valuetype(bci);
- out[1] = CellTypeState::bottom;
- return out;
- }
if (sigch == 'J' || sigch == 'D' ) return vvCTS; // Long and Double
if (sigch == 'V' ) return epsilonCTS; // Void
return vCTS; // Otherwise
}
--- 2032,2041 ----
< prev index next >