Mercurial > hg > truffle
diff src/share/vm/opto/graphKit.hpp @ 985:685e959d09ea
6877254: Server vm crashes with no branches off of store slice" when run with CMS and UseSuperWord(default)
Summary: design StoreCMNode::Ideal to promote its oopStore input if the input is a MergeMem node
Reviewed-by: kvn, never
author | cfang |
---|---|
date | Mon, 14 Sep 2009 09:49:54 -0700 |
parents | 9987d9d5eb0e |
children | 7c57aead6d3e |
line wrap: on
line diff
--- a/src/share/vm/opto/graphKit.hpp Thu Sep 10 18:18:06 2009 -0700 +++ b/src/share/vm/opto/graphKit.hpp Mon Sep 14 09:49:54 2009 -0700 @@ -603,7 +603,8 @@ void sync_kit(IdealKit& ideal); // vanilla/CMS post barrier - void write_barrier_post(Node *store, Node* obj, Node* adr, Node* val, bool use_precise); + void write_barrier_post(Node *store, Node* obj, + Node* adr, uint adr_idx, Node* val, bool use_precise); // G1 pre/post barriers void g1_write_barrier_pre(Node* obj, @@ -622,7 +623,8 @@ 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, uint oop_alias_idx, + Node* index, Node* index_adr, Node* buffer, const TypeFunc* tf); public: