1.1 --- a/src/share/vm/opto/callnode.hpp Wed Nov 16 01:39:50 2011 -0800 1.2 +++ b/src/share/vm/opto/callnode.hpp Wed Nov 16 09:13:57 2011 -0800 1.3 @@ -440,6 +440,10 @@ 1.4 // states of the scalarized object fields are collected. 1.5 uint _n_fields; // Number of non-static fields of the scalarized object. 1.6 DEBUG_ONLY(AllocateNode* _alloc;) 1.7 + 1.8 + virtual uint hash() const ; // { return NO_HASH; } 1.9 + virtual uint cmp( const Node &n ) const; 1.10 + 1.11 public: 1.12 SafePointScalarObjectNode(const TypeOopPtr* tp, 1.13 #ifdef ASSERT 1.14 @@ -454,15 +458,10 @@ 1.15 1.16 uint first_index() const { return _first_index; } 1.17 uint n_fields() const { return _n_fields; } 1.18 - DEBUG_ONLY(AllocateNode* alloc() const { return _alloc; }) 1.19 1.20 - // SafePointScalarObject should be always pinned to the control edge 1.21 - // of the SafePoint node for which it was generated. 1.22 - virtual bool pinned() const; // { return true; } 1.23 - 1.24 - // SafePointScalarObject depends on the SafePoint node 1.25 - // for which it was generated. 1.26 - virtual bool depends_only_on_test() const; // { return false; } 1.27 +#ifdef ASSERT 1.28 + AllocateNode* alloc() const { return _alloc; } 1.29 +#endif 1.30 1.31 virtual uint size_of() const { return sizeof(*this); } 1.32 1.33 @@ -880,6 +879,7 @@ 1.34 1.35 bool is_coarsened() { return _coarsened; } 1.36 void set_coarsened() { _coarsened = true; } 1.37 + void clear_coarsened() { _coarsened = false; } 1.38 1.39 // locking does not modify its arguments 1.40 virtual bool may_modify(const TypePtr *addr_t, PhaseTransform *phase){ return false;}