src/share/vm/opto/machnode.hpp

rev 10719 : [backport] Fix up superfluous changes against upstream

*** 294,304 ****
    // which serves as node bottom.
    // If the offset is not statically determined, set it to Type::OffsetBot.
    // This method is free to ignore stack slots if that helps.
    #define TYPE_PTR_SENTINAL  ((const TypePtr*)-1)
    // Passing TYPE_PTR_SENTINAL as adr_type asks for computation of the adr_type if possible
!   Node* get_base_and_disp(intptr_t &offset, const TypePtr* &adr_type) const;
  
    // Helper for get_base_and_disp: find the base and index input nodes.
    // Returns the MachOper as determined by memory_operand(), for use, if
    // needed by the caller. If (MachOper *)-1 is returned, base and index
    // are set to NodeSentinel. If (MachOper *) NULL is returned, base and
--- 294,304 ----
    // which serves as node bottom.
    // If the offset is not statically determined, set it to Type::OffsetBot.
    // This method is free to ignore stack slots if that helps.
    #define TYPE_PTR_SENTINAL  ((const TypePtr*)-1)
    // Passing TYPE_PTR_SENTINAL as adr_type asks for computation of the adr_type if possible
!   const Node* get_base_and_disp(intptr_t &offset, const TypePtr* &adr_type) const;
  
    // Helper for get_base_and_disp: find the base and index input nodes.
    // Returns the MachOper as determined by memory_operand(), for use, if
    // needed by the caller. If (MachOper *)-1 is returned, base and index
    // are set to NodeSentinel. If (MachOper *) NULL is returned, base and