src/hotspot/share/opto/cfgnode.hpp

*** 99,11 ***
    virtual const Type* bottom_type() const { return Type::CONTROL; }
    virtual const Type* Value(PhaseGVN* phase) const;
    virtual Node* Identity(PhaseGVN* phase);
    virtual Node* Ideal(PhaseGVN* phase, bool can_reshape);
    virtual const RegMask &out_RegMask() const;
-   bool try_clean_mem_phi(PhaseGVN* phase);
    bool optimize_trichotomy(PhaseIterGVN* igvn);
  };
  
  //------------------------------JProjNode--------------------------------------
  // jump projection for node that produces multiple control-flow paths
--- 99,10 ---

*** 215,10 ***
--- 214,13 ---
             inst_id()     == id     &&
             inst_index()  == index  &&
             inst_offset() == offset &&
             type()->higher_equal(tp);
    }
+   Node* try_clean_mem_phi(PhaseGVN *phase);
+ 
+   InlineTypeBaseNode* push_inline_types_through(PhaseGVN* phase, bool can_reshape, ciInlineKlass* vk, bool is_init);
  
    virtual const Type* Value(PhaseGVN* phase) const;
    virtual Node* Identity(PhaseGVN* phase);
    virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
    virtual const RegMask &out_RegMask() const;

*** 402,10 ***
--- 404,12 ---
    // Takes the type of val and filters it through the test represented
    // by if_proj and returns a more refined type if one is produced.
    // Returns NULL is it couldn't improve the type.
    static const TypeInt* filtered_int_type(PhaseGVN* phase, Node* val, Node* if_proj);
  
+   bool is_flat_array_check(PhaseTransform* phase, Node** array = NULL);
+ 
  #ifndef PRODUCT
    virtual void dump_spec(outputStream *st) const;
    virtual void related(GrowableArray <Node *> *in_rel, GrowableArray <Node *> *out_rel, bool compact) const;
  #endif
  };