src/hotspot/share/opto/type.hpp

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 1026,1035 ****
--- 1026,1037 ----
  
    virtual const Type *cast_to_exactness(bool klass_is_exact) const;
  
    virtual const TypeOopPtr *cast_to_instance_id(int instance_id) const;
  
+   virtual const TypeOopPtr *cast_to_nonconst() const;
+ 
    // corresponding pointer to klass, for a given instance
    const TypeKlassPtr* as_klass_type() const;
  
    virtual const TypePtr *add_offset( intptr_t offset ) const;
  
*** 1108,1117 ****
--- 1110,1121 ----
  
    virtual const Type *cast_to_exactness(bool klass_is_exact) const;
  
    virtual const TypeOopPtr *cast_to_instance_id(int instance_id) const;
  
+   virtual const TypeOopPtr *cast_to_nonconst() const;
+ 
    virtual const TypePtr *add_offset( intptr_t offset ) const;
  
    // Speculative type helper methods.
    virtual const Type* remove_speculative() const;
    virtual const TypePtr* with_inline_depth(int depth) const;
*** 1191,1200 ****
--- 1195,1206 ----
  
    virtual const Type *cast_to_exactness(bool klass_is_exact) const;
  
    virtual const TypeOopPtr *cast_to_instance_id(int instance_id) const;
  
+   virtual const TypeOopPtr *cast_to_nonconst() const;
+ 
    virtual const TypeAryPtr* cast_to_size(const TypeInt* size) const;
    virtual const TypeInt* narrow_size_type(const TypeInt* size) const;
  
    virtual bool empty(void) const;        // TRUE if type is vacuous
    virtual const TypePtr *add_offset( intptr_t offset ) const;
*** 1768,1777 ****
--- 1774,1785 ----
  // For card marks and hashcodes
  #define URShiftXNode URShiftLNode
  // UseOptoBiasInlining
  #define XorXNode     XorLNode
  #define StoreXConditionalNode StoreLConditionalNode
+ #define LoadXNode    LoadLNode
+ #define StoreXNode   StoreLNode
  // Opcodes
  #define Op_LShiftX   Op_LShiftL
  #define Op_AndX      Op_AndL
  #define Op_AddX      Op_AddL
  #define Op_SubX      Op_SubL
*** 1813,1822 ****
--- 1821,1832 ----
  // For card marks and hashcodes
  #define URShiftXNode URShiftINode
  // UseOptoBiasInlining
  #define XorXNode     XorINode
  #define StoreXConditionalNode StoreIConditionalNode
+ #define LoadXNode    LoadINode
+ #define StoreXNode   StoreINode
  // Opcodes
  #define Op_LShiftX   Op_LShiftI
  #define Op_AndX      Op_AndI
  #define Op_AddX      Op_AddI
  #define Op_SubX      Op_SubI