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

7017732: move static fields into Class to prepare for perm gen removal

Browse source 
Reviewed-by: kvn, coleenp, twisti, stefank
This commit is contained in:
Tom Rodriguez 2011-03-18 16:00:34 -07:00
parent f5ef48f3b9
commit 6e8a263a06
66 changed files with 1031 additions and 461 deletions
Download patch file Download diff file Expand all files Collapse all files

18
hotspot/src/share/vm/opto/parse3.cpp
View file

@ -112,29 +112,31 @@ void Parse::do_field_access(bool is_get, bool is_field) {
// Compile-time detect of null-exception?
if (stopped()) return;
#ifdef ASSERT
const TypeInstPtr *tjp = TypeInstPtr::make(TypePtr::NotNull, iter().get_declared_field_holder());
assert(_gvn.type(obj)->higher_equal(tjp), "cast_up is no longer needed");
#endif
if (is_get) {
--_sp; // pop receiver before getting
do_get_xxx(tjp, obj, field, is_field);
do_get_xxx(obj, field, is_field);
} else {
do_put_xxx(tjp, obj, field, is_field);
do_put_xxx(obj, field, is_field);
--_sp; // pop receiver after putting
}
} else {
const TypeKlassPtr* tkp = TypeKlassPtr::make(field_holder);
obj = _gvn.makecon(tkp);
const TypeInstPtr* tip = TypeInstPtr::make(field_holder->java_mirror());
obj = _gvn.makecon(tip);
if (is_get) {
do_get_xxx(tkp, obj, field, is_field);
do_get_xxx(obj, field, is_field);
} else {
do_put_xxx(tkp, obj, field, is_field);
do_put_xxx(obj, field, is_field);
}
}
}
void Parse::do_get_xxx(const TypePtr* obj_type, Node* obj, ciField* field, bool is_field) {
void Parse::do_get_xxx(Node* obj, ciField* field, bool is_field) {
// Does this field have a constant value? If so, just push the value.
if (field->is_constant()) {
if (field->is_static()) {
@ -231,7 +233,7 @@ void Parse::do_get_xxx(const TypePtr* obj_type, Node* obj, ciField* field, bool
}
}
void Parse::do_put_xxx(const TypePtr* obj_type, Node* obj, ciField* field, bool is_field) {
void Parse::do_put_xxx(Node* obj, ciField* field, bool is_field) {
bool is_vol = field->is_volatile();
// If reference is volatile, prevent following memory ops from
// floating down past the volatile write. Also prevents commoning