src/hotspot/share/opto/type.hpp

*** 2506,11 ***
  // For object size computation:
  #define AddXNode     AddLNode
  #define RShiftXNode  RShiftLNode
  // For card marks and hashcodes
  #define URShiftXNode URShiftLNode
! // For shenandoahSupport
  #define LoadXNode    LoadLNode
  #define StoreXNode   StoreLNode
  // Opcodes
  #define Op_LShiftX   Op_LShiftL
  #define Op_AndX      Op_AndL
--- 2506,11 ---
  // For object size computation:
  #define AddXNode     AddLNode
  #define RShiftXNode  RShiftLNode
  // For card marks and hashcodes
  #define URShiftXNode URShiftLNode
! // For pointer-sized accesses
  #define LoadXNode    LoadLNode
  #define StoreXNode   StoreLNode
  // Opcodes
  #define Op_LShiftX   Op_LShiftL
  #define Op_AndX      Op_AndL

*** 2552,11 ***
  // For object size computation:
  #define AddXNode     AddINode
  #define RShiftXNode  RShiftINode
  // For card marks and hashcodes
  #define URShiftXNode URShiftINode
! // For shenandoahSupport
  #define LoadXNode    LoadINode
  #define StoreXNode   StoreINode
  // Opcodes
  #define Op_LShiftX   Op_LShiftI
  #define Op_AndX      Op_AndI
--- 2552,11 ---
  // For object size computation:
  #define AddXNode     AddINode
  #define RShiftXNode  RShiftINode
  // For card marks and hashcodes
  #define URShiftXNode URShiftINode
! // For pointer-sized accesses
  #define LoadXNode    LoadINode
  #define StoreXNode   StoreINode
  // Opcodes
  #define Op_LShiftX   Op_LShiftI
  #define Op_AndX      Op_AndI