src/hotspot/share/opto/machnode.hpp

@@ -49,10 +49,11 @@
  class MachProjNode;
  class MachPrologNode;
  class MachReturnNode;
  class MachSafePointNode;
  class MachSpillCopyNode;
+ class MachVEPNode;
  class Matcher;
  class PhaseRegAlloc;
  class RegMask;
  class State;
  

@@ -490,17 +491,46 @@
    int  constant_offset() const { return ((MachConstantNode*) this)->constant_offset(); }
    // Unchecked version to avoid assertions in debug output.
    int  constant_offset_unchecked() const;
  };
  
+ //------------------------------MachVEPNode-----------------------------------
+ // Machine Inline Type Entry Point Node
+ class MachVEPNode : public MachIdealNode {
+ public:
+   Label* _verified_entry;
+ 
+   MachVEPNode(Label* verified_entry, bool verified, bool receiver_only) :
+     _verified_entry(verified_entry),
+     _verified(verified),
+     _receiver_only(receiver_only) {
+     init_class_id(Class_MachVEP);
+   }
+   virtual bool cmp(const Node &n) const {
+     return (_verified_entry == ((MachVEPNode&)n)._verified_entry) &&
+            (_verified == ((MachVEPNode&)n)._verified) &&
+            (_receiver_only == ((MachVEPNode&)n)._receiver_only) &&
+            MachIdealNode::cmp(n);
+   }
+   virtual uint size_of() const { return sizeof(*this); }
+   virtual void emit(C2_MacroAssembler *masm, PhaseRegAlloc* ra_) const;
+ 
+ #ifndef PRODUCT
+   virtual const char* Name() const { return "InlineType Entry-Point"; }
+   virtual void format(PhaseRegAlloc*, outputStream* st) const;
+ #endif
+ private:
+   bool   _verified;
+   bool   _receiver_only;
+ };
+ 
  //------------------------------MachUEPNode-----------------------------------
  // Machine Unvalidated Entry Point Node
  class MachUEPNode : public MachIdealNode {
  public:
    MachUEPNode( ) {}
    virtual void emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const;
-   virtual uint size(PhaseRegAlloc *ra_) const;
  
  #ifndef PRODUCT
    virtual const char *Name() const { return "Unvalidated-Entry-Point"; }
    virtual void format( PhaseRegAlloc *, outputStream *st ) const;
  #endif

@@ -508,13 +538,20 @@
  
  //------------------------------MachPrologNode--------------------------------
  // Machine function Prolog Node
  class MachPrologNode : public MachIdealNode {
  public:
-   MachPrologNode( ) {}
+   Label* _verified_entry;
+ 
+   MachPrologNode(Label* verified_entry) : _verified_entry(verified_entry) {
+     init_class_id(Class_MachProlog);
+   }
+   virtual bool cmp(const Node &n) const {
+     return (_verified_entry == ((MachPrologNode&)n)._verified_entry) && MachIdealNode::cmp(n);
+   }
+   virtual uint size_of() const { return sizeof(*this); }
    virtual void emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const;
-   virtual uint size(PhaseRegAlloc *ra_) const;
    virtual int reloc() const;
  
  #ifndef PRODUCT
    virtual const char *Name() const { return "Prolog"; }
    virtual void format( PhaseRegAlloc *, outputStream *st ) const;

@@ -525,11 +562,10 @@
  // Machine function Epilog Node
  class MachEpilogNode : public MachIdealNode {
  public:
    MachEpilogNode(bool do_poll = false) : _do_polling(do_poll) {}
    virtual void emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const;
-   virtual uint size(PhaseRegAlloc *ra_) const;
    virtual int reloc() const;
    virtual const Pipeline *pipeline() const;
  
  private:
    bool _do_polling;

@@ -915,14 +951,15 @@
    virtual bool  pinned() const { return false; }
    virtual const Type* Value(PhaseGVN* phase) const;
    virtual const RegMask &in_RegMask(uint) const;
    virtual int ret_addr_offset() { return 0; }
  
-   NOT_LP64(bool return_value_is_used() const;)
+   bool return_value_is_used() const;
  
    // Similar to cousin class CallNode::returns_pointer
    bool returns_pointer() const;
+   bool returns_scalarized() const;
  
    bool guaranteed_safepoint() const { return _guaranteed_safepoint; }
  
  #ifndef PRODUCT
    virtual void dump_spec(outputStream *st) const;