src/cpu/s390/vm/frame_s390.cpp

rev 12273 : 8169317: [s390] Various minor bug fixes and adaptions.

*** 154,164 ****
      tty->print_cr("patch_pc at address  " PTR_FORMAT " [" PTR_FORMAT " -> " PTR_FORMAT "] ",
                    p2i(&((address*) _sp)[-1]), p2i(((address*) _sp)[-1]), p2i(pc));
    }
    own_abi()->return_pc = (uint64_t)pc;
    _cb = CodeCache::find_blob(pc);
!   address original_pc = nmethod::get_deopt_original_pc(this);
    if (original_pc != NULL) {
      assert(original_pc == _pc, "expected original to be stored before patching");
      _deopt_state = is_deoptimized;
      // Leave _pc as is.
    } else {
--- 154,164 ----
      tty->print_cr("patch_pc at address  " PTR_FORMAT " [" PTR_FORMAT " -> " PTR_FORMAT "] ",
                    p2i(&((address*) _sp)[-1]), p2i(((address*) _sp)[-1]), p2i(pc));
    }
    own_abi()->return_pc = (uint64_t)pc;
    _cb = CodeCache::find_blob(pc);
!   address original_pc = CompiledMethod::get_deopt_original_pc(this);
    if (original_pc != NULL) {
      assert(original_pc == _pc, "expected original to be stored before patching");
      _deopt_state = is_deoptimized;
      // Leave _pc as is.
    } else {