1.1 --- a/src/share/vm/opto/graphKit.hpp Thu Apr 28 14:00:13 2011 -0700
1.2 +++ b/src/share/vm/opto/graphKit.hpp Fri Apr 29 11:15:30 2011 -0700
1.3 @@ -544,8 +544,10 @@
1.4 BasicType bt);
1.5
1.6 // For the few case where the barriers need special help
1.7 - void pre_barrier(Node* ctl, Node* obj, Node* adr, uint adr_idx,
1.8 - Node* val, const TypeOopPtr* val_type, BasicType bt);
1.9 + void pre_barrier(bool do_load, Node* ctl,
1.10 + Node* obj, Node* adr, uint adr_idx, Node* val, const TypeOopPtr* val_type,
1.11 + Node* pre_val,
1.12 + BasicType bt);
1.13
1.14 void post_barrier(Node* ctl, Node* store, Node* obj, Node* adr, uint adr_idx,
1.15 Node* val, BasicType bt, bool use_precise);
1.16 @@ -671,11 +673,13 @@
1.17 Node* adr, uint adr_idx, Node* val, bool use_precise);
1.18
1.19 // G1 pre/post barriers
1.20 - void g1_write_barrier_pre(Node* obj,
1.21 + void g1_write_barrier_pre(bool do_load,
1.22 + Node* obj,
1.23 Node* adr,
1.24 uint alias_idx,
1.25 Node* val,
1.26 const TypeOopPtr* val_type,
1.27 + Node* pre_val,
1.28 BasicType bt);
1.29
1.30 void g1_write_barrier_post(Node* store,
