src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.cpp

rev 50536 : [mq]: rename_on_root

*** 36,48 ****
  }
  
  void BarrierSetAssembler::load_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
                                    const Address& addr, Register dst, Register tmp1, Register tmp2, Label *L_handle_null) {
    bool on_heap  = (decorators & IN_HEAP) != 0;
!   bool on_root  = (decorators & IN_NATIVE) != 0;
    bool not_null = (decorators & OOP_NOT_NULL) != 0;
!   assert(on_heap || on_root, "where?");
  
    switch (type) {
    case T_ARRAY:
    case T_OBJECT: {
      if (UseCompressedOops && on_heap) {
--- 36,48 ----
  }
  
  void BarrierSetAssembler::load_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
                                    const Address& addr, Register dst, Register tmp1, Register tmp2, Label *L_handle_null) {
    bool on_heap  = (decorators & IN_HEAP) != 0;
!   bool in_native = (decorators & IN_NATIVE) != 0;
    bool not_null = (decorators & OOP_NOT_NULL) != 0;
!   assert(on_heap || in_native, "where?");
  
    switch (type) {
    case T_ARRAY:
    case T_OBJECT: {
      if (UseCompressedOops && on_heap) {
*** 66,78 ****
  }
  
  void BarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
                                     const Address& addr, Register val, Register tmp1, Register tmp2, Register tmp3) {
    bool on_heap  = (decorators & IN_HEAP) != 0;
!   bool on_root  = (decorators & IN_NATIVE) != 0;
    bool not_null = (decorators & OOP_NOT_NULL) != 0;
!   assert(on_heap || on_root, "where?");
    assert_different_registers(val, tmp1, tmp2);
  
    switch (type) {
    case T_ARRAY:
    case T_OBJECT: {
--- 66,78 ----
  }
  
  void BarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
                                     const Address& addr, Register val, Register tmp1, Register tmp2, Register tmp3) {
    bool on_heap  = (decorators & IN_HEAP) != 0;
!   bool in_native = (decorators & IN_NATIVE) != 0;
    bool not_null = (decorators & OOP_NOT_NULL) != 0;
!   assert(on_heap || in_native, "where?");
    assert_different_registers(val, tmp1, tmp2);
  
    switch (type) {
    case T_ARRAY:
    case T_OBJECT: {