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

6851742: (EA) allocation elimination doesn't work with UseG1GC

Browse source 
Fix eliminate_card_mark() to eliminate G1 pre/post barriers.

Reviewed-by: never
This commit is contained in:
Vladimir Kozlov 2009-07-16 14:10:42 -07:00
parent a24ea182cc
commit c3efa899b6
12 changed files with 315 additions and 232 deletions
Download patch file Download diff file Expand all files Collapse all files

30
hotspot/src/share/vm/opto/graphKit.hpp
View file

@ -449,13 +449,24 @@ class GraphKit : public Phase {
//
// If val==NULL, it is taken to be a completely unknown value. QQQ
Node* store_oop(Node* ctl,
Node* obj, // containing obj
Node* adr, // actual adress to store val at
const TypePtr* adr_type,
Node* val,
const TypeOopPtr* val_type,
BasicType bt,
bool use_precise);
Node* store_oop_to_object(Node* ctl,
Node* obj, // containing obj
Node* adr, // actual adress to store val at
const TypePtr* adr_type,
Node* val,
const TypeOopPtr* val_type,
BasicType bt);
BasicType bt) {
return store_oop(ctl, obj, adr, adr_type, val, val_type, bt, false);
}
Node* store_oop_to_array(Node* ctl,
Node* obj, // containing obj
@ -463,7 +474,9 @@ class GraphKit : public Phase {
const TypePtr* adr_type,
Node* val,
const TypeOopPtr* val_type,
BasicType bt);
BasicType bt) {
return store_oop(ctl, obj, adr, adr_type, val, val_type, bt, true);
}
// Could be an array or object we don't know at compile time (unsafe ref.)
Node* store_oop_to_unknown(Node* ctl,
@ -488,9 +501,6 @@ class GraphKit : public Phase {
// Return a load of array element at idx.
Node* load_array_element(Node* ctl, Node* ary, Node* idx, const TypeAryPtr* arytype);
// CMS card-marks have an input from the corresponding oop_store
void cms_card_mark(Node* ctl, Node* adr, Node* val, Node* oop_store);
//---------------- Dtrace support --------------------
void make_dtrace_method_entry_exit(ciMethod* method, bool is_entry);
void make_dtrace_method_entry(ciMethod* method) {
@ -582,9 +592,6 @@ class GraphKit : public Phase {
return C->too_many_recompiles(method(), bci(), reason);
}
// vanilla/CMS post barrier
void write_barrier_post(Node *store, Node* obj, Node* adr, Node* val, bool use_precise);
// Returns the object (if any) which was created the moment before.
Node* just_allocated_object(Node* current_control);
@ -593,6 +600,11 @@ class GraphKit : public Phase {
&& Universe::heap()->can_elide_tlab_store_barriers());
}
void sync_kit(IdealKit& ideal);
// vanilla/CMS post barrier
void write_barrier_post(Node *store, Node* obj, Node* adr, Node* val, bool use_precise);
// G1 pre/post barriers
void g1_write_barrier_pre(Node* obj,
Node* adr,
@ -610,7 +622,7 @@ class GraphKit : public Phase {
bool use_precise);
// Helper function for g1
private:
void g1_mark_card(IdealKit* ideal, Node* card_adr, Node* store, Node* index, Node* index_adr,
void g1_mark_card(IdealKit& ideal, Node* card_adr, Node* store, Node* index, Node* index_adr,
Node* buffer, const TypeFunc* tf);
public: