src/os/windows/vm/os_windows.cpp

*** 407,418 ****
    return NULL;
  }
  
  LONG WINAPI topLevelExceptionFilter(struct _EXCEPTION_POINTERS* exceptionInfo);
  
! // Thread start routine for all new Java threads
! static unsigned __stdcall java_start(Thread* thread) {
    // Try to randomize the cache line index of hot stack frames.
    // This helps when threads of the same stack traces evict each other's
    // cache lines. The threads can be either from the same JVM instance, or
    // from different JVM instances. The benefit is especially true for
    // processors with hyperthreading technology.
--- 407,418 ----
    return NULL;
  }
  
  LONG WINAPI topLevelExceptionFilter(struct _EXCEPTION_POINTERS* exceptionInfo);
  
! // Thread start routine for all newly created threads
! static unsigned __stdcall thread_native_entry(Thread* thread) {
    // Try to randomize the cache line index of hot stack frames.
    // This helps when threads of the same stack traces evict each other's
    // cache lines. The threads can be either from the same JVM instance, or
    // from different JVM instances. The benefit is especially true for
    // processors with hyperthreading technology.
*** 457,466 ****
--- 457,475 ----
    // which frees the CodeHeap containing the Atomic::add code
    if (thread != VMThread::vm_thread() && VMThread::vm_thread() != NULL) {
      Atomic::dec_ptr((intptr_t*)&os::win32::_os_thread_count);
    }
  
+   // If a thread has not deleted itself ("delete this") as part of its
+   // termination sequence, we have to ensure thread-local-storage is
+   // cleared before we actually terminate. No threads should ever be
+   // deleted asynchronously with respect to their termination.
+   if (Thread::current_or_null_safe() != NULL) {
+     assert(Thread::current_or_null_safe() == thread, "current thread is wrong");
+     thread->clear_thread_current();
+   }
+ 
    // Thread must not return from exit_process_or_thread(), but if it does,
    // let it proceed to exit normally
    return (unsigned)os::win32::exit_process_or_thread(os::win32::EPT_THREAD, res);
  }
  
*** 629,639 ****
  
    const unsigned initflag = CREATE_SUSPENDED | STACK_SIZE_PARAM_IS_A_RESERVATION;
    HANDLE thread_handle =
      (HANDLE)_beginthreadex(NULL,
                             (unsigned)stack_size,
!                            (unsigned (__stdcall *)(void*)) java_start,
                             thread,
                             initflag,
                             &thread_id);
  
    char buf[64];
--- 638,648 ----
  
    const unsigned initflag = CREATE_SUSPENDED | STACK_SIZE_PARAM_IS_A_RESERVATION;
    HANDLE thread_handle =
      (HANDLE)_beginthreadex(NULL,
                             (unsigned)stack_size,
!                            (unsigned (__stdcall *)(void*)) thread_native_entry,
                             thread,
                             initflag,
                             &thread_id);
  
    char buf[64];
*** 668,677 ****
--- 677,692 ----
  
  
  // Free Win32 resources related to the OSThread
  void os::free_thread(OSThread* osthread) {
    assert(osthread != NULL, "osthread not set");
+ 
+   // We are told to free resources of the argument thread,
+   // but we can only really operate on the current thread.
+   assert(Thread::current()->osthread() == osthread,
+          "os::free_thread but not current thread");
+ 
    CloseHandle(osthread->thread_handle());
    CloseHandle(osthread->interrupt_event());
    delete osthread;
  }