src/hotspot/share/opto/macro.hpp

*** 83,92 ****
--- 83,93 ----
                                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);
+   Node* value_type_from_mem(Node* mem, Node* ctl, ciValueKlass* vk, const TypeAryPtr* adr_type, int offset, AllocateNode* alloc);
  
    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);
*** 96,105 ****
--- 97,107 ----
    void mark_eliminated_box(Node* box, Node* obj);
    void mark_eliminated_locking_nodes(AbstractLockNode *alock);
    bool eliminate_locking_node(AbstractLockNode *alock);
    void expand_lock_node(LockNode *lock);
    void expand_unlock_node(UnlockNode *unlock);
+   void expand_mh_intrinsic_return(CallStaticJavaNode* call);
  
    // More helper methods modeled after GraphKit for array copy
    void insert_mem_bar(Node** ctrl, Node** mem, int opcode, Node* precedent = NULL);
    Node* array_element_address(Node* ary, Node* idx, BasicType elembt);
    Node* ConvI2L(Node* offset);
*** 113,127 ****
--- 115,134 ----
                         Node* parm6 = NULL, Node* parm7 = NULL);
  
    // helper methods modeled after LibraryCallKit for array copy
    Node* generate_guard(Node** ctrl, Node* test, RegionNode* region, float true_prob);
    Node* generate_slow_guard(Node** ctrl, Node* test, RegionNode* region);
+   Node* generate_fair_guard(Node** ctrl, Node* test, RegionNode* region);
    void generate_negative_guard(Node** ctrl, Node* index, RegionNode* region);
    void generate_limit_guard(Node** ctrl, Node* offset, Node* subseq_length, Node* array_length, RegionNode* region);
  
    // More helper methods for array copy
    Node* generate_nonpositive_guard(Node** ctrl, Node* index, bool never_negative);
+   Node* generate_flattened_array_guard(Node** ctrl, Node* mem, Node* obj, RegionNode* region);
+   Node* generate_object_array_guard(Node** ctrl, Node* mem, Node* obj, RegionNode* region);
+   Node* generate_array_guard(Node** ctrl, Node* mem, Node* obj, RegionNode* region, jint lh_con);
+ 
    void finish_arraycopy_call(Node* call, Node** ctrl, MergeMemNode** mem, const TypePtr* adr_type);
    address basictype2arraycopy(BasicType t,
                                Node* src_offset,
                                Node* dest_offset,
                                bool disjoint_bases,
*** 133,148 ****
--- 140,158 ----
                             const TypePtr* adr_type,
                             BasicType basic_elem_type,
                             Node* src,  Node* src_offset,
                             Node* dest, Node* dest_offset,
                             Node* copy_length,
+                            Node* dest_length,
                             bool disjoint_bases = false,
                             bool length_never_negative = false,
                             RegionNode* slow_region = NULL);
    void generate_clear_array(Node* ctrl, MergeMemNode* merge_mem,
                              const TypePtr* adr_type,
                              Node* dest,
+                             Node* val,
+                             Node* raw_val,
                              BasicType basic_elem_type,
                              Node* slice_idx,
                              Node* slice_len,
                              Node* dest_size);
    bool generate_block_arraycopy(Node** ctrl, MergeMemNode** mem, Node* io,
*** 174,184 ****
                                      BasicType basic_elem_type,
                                      bool disjoint_bases,
                                      Node* src,  Node* src_offset,
                                      Node* dest, Node* dest_offset,
                                      Node* copy_length, bool dest_uninitialized);
! 
    void expand_arraycopy_node(ArrayCopyNode *ac);
  
    int replace_input(Node *use, Node *oldref, Node *newref);
    void copy_call_debug_info(CallNode *oldcall, CallNode * newcall);
    Node* opt_bits_test(Node* ctrl, Node* region, int edge, Node* word, int mask, int bits, bool return_fast_path = false);
--- 184,196 ----
                                      BasicType basic_elem_type,
                                      bool disjoint_bases,
                                      Node* src,  Node* src_offset,
                                      Node* dest, Node* dest_offset,
                                      Node* copy_length, bool dest_uninitialized);
!   const TypePtr* adjust_parameters_for_vt(const TypeAryPtr* top_dest, Node*& src_offset,
!                                           Node*& dest_offset, Node*& length, BasicType& dest_elem,
!                                           Node*& dest_length);
    void expand_arraycopy_node(ArrayCopyNode *ac);
  
    int replace_input(Node *use, Node *oldref, Node *newref);
    void copy_call_debug_info(CallNode *oldcall, CallNode * newcall);
    Node* opt_bits_test(Node* ctrl, Node* region, int edge, Node* word, int mask, int bits, bool return_fast_path = false);
*** 193,202 ****
--- 205,216 ----
                            Node* klass_node, Node* length,
                            Node* size_in_bytes);
  
    Node* make_arraycopy_load(ArrayCopyNode* ac, intptr_t offset, Node* ctl, Node* mem, BasicType ft, const Type *ftype, AllocateNode *alloc);
  
+   bool can_try_zeroing_elimination(AllocateArrayNode* alloc, Node* src, Node* dest) const;
+ 
  public:
    PhaseMacroExpand(PhaseIterGVN &igvn) : Phase(Macro_Expand), _igvn(igvn), _has_locks(false) {
      _igvn.set_delay_transform(true);
    }
    void eliminate_macro_nodes();