*** old/src/share/vm/opto/macro.hpp	Tue Jul 28 15:53:13 2015
--- new/src/share/vm/opto/macro.hpp	Tue Jul 28 15:53:12 2015

*** 83,94 ****
--- 83,94 ----
    void expand_allocate_array(AllocateArrayNode *alloc);
    void expand_allocate_common(AllocateNode* alloc,
                                Node* length,
                                const TypeFunc* slow_call_type,
                                address slow_call_address);
!   Node *value_from_mem(Node *mem, Node *ctl, BasicType ft, const Type *ftype, const TypeOopPtr *adr_t, AllocateNode *alloc);
!   Node *value_from_mem_phi(Node *mem, BasicType ft, const Type *ftype, const TypeOopPtr *adr_t, AllocateNode *alloc, Node_Stack *value_phis, int level);
  
    bool eliminate_boxing_node(CallStaticJavaNode *boxing);
    bool eliminate_allocate_node(AllocateNode *alloc);
    bool can_eliminate_allocation(AllocateNode *alloc, GrowableArray <SafePointNode *>& safepoints);
    bool scalar_replacement(AllocateNode *alloc, GrowableArray <SafePointNode *>& safepoints_done);

*** 198,207 ****
--- 198,209 ----
    Node* prefetch_allocation(Node* i_o,
                              Node*& needgc_false, Node*& contended_phi_rawmem,
                              Node* old_eden_top, Node* new_eden_top,
                              Node* length);
  
+   Node* handle_arraycopy(ArrayCopyNode* ac, intptr_t offset, Node* ctl, BasicType ft, const Type *ftype, AllocateNode *alloc);
+ 
  public:
    PhaseMacroExpand(PhaseIterGVN &igvn) : Phase(Macro_Expand), _igvn(igvn), _has_locks(false) {
      _igvn.set_delay_transform(true);
    }
    void eliminate_macro_nodes();