--- old/src/hotspot/share/runtime/thread.inline.hpp	Tue Nov 21 15:20:44 2017
+++ new/src/hotspot/share/runtime/thread.inline.hpp	Tue Nov 21 15:20:43 2017
@@ -192,12 +192,12 @@
   return l_terminated == _thread_exiting || check_is_terminated(l_terminated);
 }
 
-inline bool JavaThread::is_terminated() {
+inline bool JavaThread::is_terminated() const {
   // Use load-acquire so that setting of _terminated by
   // JavaThread::exit() is seen more quickly.
   TerminatedTypes l_terminated = (TerminatedTypes)
       OrderAccess::load_acquire((volatile jint *) &_terminated);
-  return check_is_terminated(_terminated);
+  return check_is_terminated(l_terminated);
 }
 
 inline void JavaThread::set_terminated(TerminatedTypes t) {
@@ -229,9 +229,9 @@
   Atomic::inc(&_smr_deleted_thread_cnt);
 }
 
-inline void Threads::update_smr_deleted_thread_time_max(jint new_value) {
+inline void Threads::update_smr_deleted_thread_time_max(uint new_value) {
   while (true) {
-    jint cur_value = _smr_deleted_thread_time_max;
+    uint cur_value = _smr_deleted_thread_time_max;
     if (new_value <= cur_value) {
       // No need to update max value so we're done.
       break;
@@ -243,7 +243,7 @@
   }
 }
 
-inline void Threads::add_smr_deleted_thread_times(jint add_value) {
+inline void Threads::add_smr_deleted_thread_times(uint add_value) {
   Atomic::add(add_value, &_smr_deleted_thread_times);
 }
 
@@ -251,9 +251,9 @@
   Atomic::inc(&_smr_tlh_cnt);
 }
 
-inline void Threads::update_smr_tlh_time_max(jint new_value) {
+inline void Threads::update_smr_tlh_time_max(uint new_value) {
   while (true) {
-    jint cur_value = _smr_tlh_time_max;
+    uint cur_value = _smr_tlh_time_max;
     if (new_value <= cur_value) {
       // No need to update max value so we're done.
       break;
@@ -265,7 +265,7 @@
   }
 }
 
-inline void Threads::add_smr_tlh_times(jint add_value) {
+inline void Threads::add_smr_tlh_times(uint add_value) {
   Atomic::add(add_value, &_smr_tlh_times);
 }