*** old/src/os/windows/vm/os_windows.cpp	Wed Aug 16 10:56:24 2017
--- new/src/os/windows/vm/os_windows.cpp	Wed Aug 16 10:56:24 2017

*** 3589,3614 ****
--- 3589,3598 ----
    } // Otherwise leave the interrupted state alone
  
    return interrupted;
  }
  
  // Get's a pc (hint) for a running thread. Currently used only for profiling.
  ExtendedPC os::get_thread_pc(Thread* thread) {
    CONTEXT context;
    context.ContextFlags = CONTEXT_CONTROL;
    HANDLE handle = thread->osthread()->thread_handle();
    if (GetThreadContext(handle, &context)) {
  #ifdef _M_AMD64
      return ExtendedPC((address) context.Rip);
  #else
      return ExtendedPC((address) context.Eip);
  #endif
    } else {
      return ExtendedPC(NULL);
    }
  }
  
  // GetCurrentThreadId() returns DWORD
  intx os::current_thread_id()  { return GetCurrentThreadId(); }
  
  static int _initial_pid = 0;