*** old/src/share/vm/opto/macro.hpp	Mon Mar 24 16:31:59 2014
--- new/src/share/vm/opto/macro.hpp	Mon Mar 24 16:31:59 2014

*** 74,83 ****
--- 74,85 ----
    ProjNode *_catchallcatchproj;
    ProjNode *_memproj_fallthrough;
    ProjNode *_memproj_catchall;
    ProjNode *_resproj;
  
+   // Additional data collected during macro expansion
+   bool _has_locks;
  
    void expand_allocate(AllocateNode *alloc);
    void expand_allocate_array(AllocateArrayNode *alloc);
    void expand_allocate_common(AllocateNode* alloc,
                                Node* length,

*** 116,126 ****
--- 118,128 ----
                              Node*& needgc_false, Node*& contended_phi_rawmem,
                              Node* old_eden_top, Node* new_eden_top,
                              Node* length);
  
  public:
!   PhaseMacroExpand(PhaseIterGVN &igvn) : Phase(Macro_Expand), _igvn(igvn), _has_locks(false) {
      _igvn.set_delay_transform(true);
    }
    void eliminate_macro_nodes();
    bool expand_macro_nodes();