1.1 --- a/src/share/vm/opto/graphKit.hpp Tue Apr 05 19:14:03 2011 -0700
1.2 +++ b/src/share/vm/opto/graphKit.hpp Thu Apr 07 09:53:20 2011 -0700
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -544,8 +544,10 @@
1.11 BasicType bt);
1.12
1.13 // For the few case where the barriers need special help
1.14 - void pre_barrier(Node* ctl, Node* obj, Node* adr, uint adr_idx,
1.15 - Node* val, const TypeOopPtr* val_type, BasicType bt);
1.16 + void pre_barrier(bool do_load, Node* ctl,
1.17 + Node* obj, Node* adr, uint adr_idx, Node* val, const TypeOopPtr* val_type,
1.18 + Node* pre_val,
1.19 + BasicType bt);
1.20
1.21 void post_barrier(Node* ctl, Node* store, Node* obj, Node* adr, uint adr_idx,
1.22 Node* val, BasicType bt, bool use_precise);
1.23 @@ -669,11 +671,13 @@
1.24 Node* adr, uint adr_idx, Node* val, bool use_precise);
1.25
1.26 // G1 pre/post barriers
1.27 - void g1_write_barrier_pre(Node* obj,
1.28 + void g1_write_barrier_pre(bool do_load,
1.29 + Node* obj,
1.30 Node* adr,
1.31 uint alias_idx,
1.32 Node* val,
1.33 const TypeOopPtr* val_type,
1.34 + Node* pre_val,
1.35 BasicType bt);
1.36
1.37 void g1_write_barrier_post(Node* store,
