1.1 --- a/src/share/vm/opto/cfgnode.hpp Fri Dec 21 10:27:49 2012 -0800 1.2 +++ b/src/share/vm/opto/cfgnode.hpp Sun Dec 23 17:08:22 2012 +0100 1.3 @@ -95,6 +95,7 @@ 1.4 virtual Node *Identity( PhaseTransform *phase ); 1.5 virtual Node *Ideal(PhaseGVN *phase, bool can_reshape); 1.6 virtual const RegMask &out_RegMask() const; 1.7 + bool try_clean_mem_phi(PhaseGVN *phase); 1.8 }; 1.9 1.10 //------------------------------JProjNode-------------------------------------- 1.11 @@ -181,7 +182,7 @@ 1.12 LoopSafety simple_data_loop_check(Node *in) const; 1.13 // Is it unsafe data loop? It becomes a dead loop if this phi node removed. 1.14 bool is_unsafe_data_reference(Node *in) const; 1.15 - int is_diamond_phi() const; 1.16 + int is_diamond_phi(bool check_control_only = false) const; 1.17 virtual int Opcode() const; 1.18 virtual bool pinned() const { return in(0) != 0; } 1.19 virtual const TypePtr *adr_type() const { verify_adr_type(true); return _adr_type; }