src/hotspot/cpu/x86/relocInfo_x86.cpp

rev 47591 : Add Thread Local handshakes and thread local polling

*** 1,7 ****
  /*
!  * Copyright (c) 1998, 2013, 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) 1998, 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.
*** 27,36 ****
--- 27,37 ----
  #include "code/relocInfo.hpp"
  #include "nativeInst_x86.hpp"
  #include "oops/klass.inline.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/safepoint.hpp"
+ #include "runtime/safepointMechanism.hpp"
  
  
  void Relocation::pd_set_data_value(address x, intptr_t o, bool verify_only) {
  #ifdef AMD64
    x += o;
*** 181,193 ****
--- 182,197 ----
  void poll_Relocation::fix_relocation_after_move(const CodeBuffer* src, CodeBuffer* dest) {
  #ifdef _LP64
    typedef Assembler::WhichOperand WhichOperand;
    WhichOperand which = (WhichOperand) format();
  #if !INCLUDE_JVMCI
+   if (SafepointMechanism::uses_global_page_poll()) {
      assert((which == Assembler::disp32_operand) == !Assembler::is_polling_page_far(), "format not set correctly");
+   }
  #endif
    if (which == Assembler::disp32_operand) {
+     assert(SafepointMechanism::uses_global_page_poll(), "should only have generated such a poll if global polling enabled");
      address orig_addr = old_addr_for(addr(), src, dest);
      NativeInstruction* oni = nativeInstruction_at(orig_addr);
      int32_t* orig_disp = (int32_t*) Assembler::locate_operand(orig_addr, which);
      // This poll_addr is incorrect by the size of the instruction it is irrelevant
      intptr_t poll_addr = (intptr_t)oni + *orig_disp;