src/cpu/sparc/vm/macroAssembler_sparc.cpp

*** 355,368 ****
  // Calls to C land
  
  #ifdef ASSERT
  // a hook for debugging
  static Thread* reinitialize_thread() {
!   return ThreadLocalStorage::thread();
  }
  #else
! #define reinitialize_thread ThreadLocalStorage::thread
  #endif
  
  #ifdef ASSERT
  address last_get_thread = NULL;
  #endif
--- 355,368 ----
  // Calls to C land
  
  #ifdef ASSERT
  // a hook for debugging
  static Thread* reinitialize_thread() {
!     return Thread::current();
  }
  #else
! #define reinitialize_thread Thread::current
  #endif
  
  #ifdef ASSERT
  address last_get_thread = NULL;
  #endif
*** 388,398 ****
    mov(L5, G4);
    restore(O0, 0, G2_thread);
  }
  
  static Thread* verify_thread_subroutine(Thread* gthread_value) {
!   Thread* correct_value = ThreadLocalStorage::thread();
    guarantee(gthread_value == correct_value, "G2_thread value must be the thread");
    return correct_value;
  }
  
  void MacroAssembler::verify_thread() {
--- 388,398 ----
    mov(L5, G4);
    restore(O0, 0, G2_thread);
  }
  
  static Thread* verify_thread_subroutine(Thread* gthread_value) {
!     Thread* correct_value = Thread::current();
    guarantee(gthread_value == correct_value, "G2_thread value must be the thread");
    return correct_value;
  }
  
  void MacroAssembler::verify_thread() {