< prev index next >

src/hotspot/share/opto/macro.hpp

Print this page
@@ -80,11 +80,11 @@
                                const char* &name,
                                bool dest_uninitialized);
  
  private:
    // projections extracted from a call node
-   CallProjections _callprojs;
+   CallProjections* _callprojs;
  
    // Additional data collected during macro expansion
    bool _has_locks;
  
    void expand_allocate(AllocateNode *alloc);

@@ -95,57 +95,68 @@
                                address slow_call_address);
    void yank_initalize_node(InitializeNode* node);
    void yank_alloc_node(AllocateNode* alloc);
    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* inline_type_from_mem(Node* mem, Node* ctl, ciInlineKlass* 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);
-   void process_users_of_allocation(CallNode *alloc);
+   void process_users_of_allocation(CallNode *alloc, bool inline_alloc = false);
  
    void eliminate_gc_barrier(Node *p2x);
    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 inline_type_guard(Node** ctrl, 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);
  
    // 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_partial_inlining_block(Node** ctrl, MergeMemNode** mem, const TypePtr* adr_type,
                                         RegionNode** exit_block, Node** result_memory, Node* length,
                                         Node* src_start, Node* dst_start, BasicType type);
  
    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* array_lh_test(Node* array, jint mask);
+   Node* generate_flat_array_guard(Node** ctrl, Node* array, RegionNode* region);
+   Node* generate_null_free_array_guard(Node** ctrl, Node* array, RegionNode* region);
+ 
    void finish_arraycopy_call(Node* call, Node** ctrl, MergeMemNode** mem, const TypePtr* adr_type);
    Node* generate_arraycopy(ArrayCopyNode *ac,
                             AllocateArrayNode* alloc,
                             Node** ctrl, MergeMemNode* mem, Node** io,
                             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,

@@ -177,18 +188,20 @@
                                      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_for_flat_array(const TypeAryPtr* top_dest, Node*& src_offset,
+                                        Node*& dest_offset, Node*& length, BasicType& dest_elem,
+                                        Node*& dest_length);
    void expand_arraycopy_node(ArrayCopyNode *ac);
  
    void expand_subtypecheck_node(SubTypeCheckNode *check);
  
+   void expand_flatarraycheck_node(FlatArrayCheckNode* check);
+ 
    int replace_input(Node *use, Node *oldref, Node *newref);
-   void migrate_outs(Node *old, Node *target);
-   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);
    void copy_predefined_input_for_runtime_call(Node * ctrl, CallNode* oldcall, CallNode* call);
    CallNode* make_slow_call(CallNode *oldcall, const TypeFunc* slow_call_type, address slow_call,
                             const char* leaf_name, Node* slow_path, Node* parm0, Node* parm1,
                             Node* parm2);

@@ -198,10 +211,12 @@
                            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();
< prev index next >