Latest version of scope locals

src/hotspot/share/classfile/javaClasses.cpp

@@ -2096,6 +2096,8 @@ int java_lang_Thread::_interrupted_offset;
 int java_lang_Thread::_tid_offset;
 int java_lang_Thread::_continuation_offset;
 int java_lang_Thread::_park_blocker_offset;
+int java_lang_Thread::_noninheritableScopeLocalBindings_offset;
+int java_lang_Thread::_inheritableScopeLocalBindings_offset;
 
 #define THREAD_FIELDS_DO(macro) \
   macro(_holder_offset,        k, "holder", thread_fieldholder_signature, false); \
@@ -2108,6 +2110,8 @@ int java_lang_Thread::_park_blocker_offset;
   macro(_tid_offset,           k, "tid", long_signature, false); \
   macro(_park_blocker_offset,  k, "parkBlocker", object_signature, false); \
   macro(_continuation_offset,  k, "cont", continuation_signature, false); \
+  macro(_noninheritableScopeLocalBindings_offset, k, "noninheritableScopeLocalBindings", scopeLocalSnapshot_name, false); \
+  macro(_inheritableScopeLocalBindings_offset,    k, "inheritableScopeLocalBindings", scopeLocalSnapshot_name, false); \
 
 void java_lang_Thread::compute_offsets() {
   assert(_holder_offset == 0, "offsets should be initialized only once");
@@ -2138,6 +2142,11 @@ void java_lang_Thread::set_jvmti_thread_state(oop java_thread, JvmtiThreadState*
   java_thread->address_field_put(_jvmti_thread_state_offset, (address)state);
 }
 
+void java_lang_Thread::clear_scopeLocalBindings(oop java_thread) {
+  java_thread->obj_field_put(_noninheritableScopeLocalBindings_offset, NULL);
+  java_thread->obj_field_put(_inheritableScopeLocalBindings_offset, NULL);
+}
+
 oop java_lang_Thread::holder(oop java_thread) {
     return java_thread->obj_field(_holder_offset);
 }

src/hotspot/share/classfile/javaClasses.hpp

@@ -384,6 +384,8 @@ class java_lang_Thread : AllStatic {
   static int _tid_offset;
   static int _continuation_offset;
   static int _park_blocker_offset;
+  static int _noninheritableScopeLocalBindings_offset;
+  static int _inheritableScopeLocalBindings_offset;
 
   static void compute_offsets();
 
@@ -433,6 +435,9 @@ class java_lang_Thread : AllStatic {
   static JvmtiThreadState* jvmti_thread_state(oop java_thread);
   static void set_jvmti_thread_state(oop java_thread, JvmtiThreadState* state);
 
+  // Clear all scope local bindings on error
+  static void clear_scopeLocalBindings(oop java_thread);
+
   // Blocker object responsible for thread parking
   static oop park_blocker(oop java_thread);
 

src/hotspot/share/classfile/vmSymbols.hpp

@@ -525,6 +525,7 @@
   template(data_cache_line_flush_size_name,           "DATA_CACHE_LINE_FLUSH_SIZE")               \
   template(during_unsafe_access_name,                 "during_unsafe_access")                     \
   template(scoped_cache_shift_name,                   "SCOPED_CACHE_SHIFT")                       \
+  template(scopeLocalSnapshot_name,                   "Ljava/lang/ScopeLocal$Snapshot;")          \
                                                                                                   \
   /* name symbols needed by intrinsics */                                                         \
   VM_INTRINSICS_DO(VM_INTRINSIC_IGNORE, VM_SYMBOL_IGNORE, template, VM_SYMBOL_IGNORE, VM_ALIAS_IGNORE) \

src/hotspot/share/oops/instanceStackChunkKlass.inline.hpp

@@ -32,6 +32,7 @@
 #include "gc/shared/barrierSetNMethod.hpp"
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/gc_globals.hpp"
+#include "logging/log.hpp"
 #include "memory/iterator.inline.hpp"
 #include "oops/instanceKlass.inline.hpp"
 #include "oops/instanceStackChunkKlass.hpp"

src/hotspot/share/opto/library_call.cpp

@@ -3109,8 +3109,8 @@ Node* LibraryCallKit::scopeLocalCache_helper() {
 
   Node* thread = _gvn.transform(new ThreadLocalNode());
   Node* p = basic_plus_adr(top()/*!oop*/, thread, in_bytes(JavaThread::scopeLocalCache_offset()));
-  return _gvn.transform(make_load(NULL, p, p->bottom_type()->is_ptr(),
-                                  T_ADDRESS, MemNode::unordered));
+  return _gvn.transform(LoadNode::make(_gvn, NULL, immutable_memory(), p, p->bottom_type()->is_ptr(),
+        TypeRawPtr::NOTNULL, T_ADDRESS, MemNode::unordered));
 }
 
 //------------------------inline_native_scopeLocalCache------------------

src/hotspot/share/runtime/deoptimization.cpp

@@ -418,6 +418,11 @@ Deoptimization::UnrollBlock* Deoptimization::fetch_unroll_info_helper(JavaThread
   vframeArray* array = create_vframeArray(current, deoptee, &map, chunk, realloc_failures);
 #if COMPILER2_OR_JVMCI
   if (realloc_failures) {
+    // FIXME: This very crudely destroys all ScopeLocal bindings. This
+    // is better than a bound value escaping, but far from ideal.
+    oop java_thread = current->threadObj();
+    current->set_scopeLocalCache(NULL);
+    java_lang_Thread::clear_scopeLocalBindings(java_thread);
     pop_frames_failed_reallocs(current, array);
   }
 #endif

src/hotspot/share/runtime/thread.cpp

@@ -1823,6 +1823,12 @@ void JavaThread::check_and_handle_async_exceptions(bool check_unsafe_error) {
       // We cannot call Exceptions::_throw(...) here because we cannot block
       set_pending_exception(_pending_async_exception, __FILE__, __LINE__);
 
+      // Clear any scope-local bindings on ThreadDeath
+      set_scopeLocalCache(NULL);
+      oop threadOop = threadObj();
+      assert(threadOop != NULL, "must be");
+      java_lang_Thread::clear_scopeLocalBindings(threadOop);
+
       LogTarget(Info, exceptions) lt;
       if (lt.is_enabled()) {
         ResourceMark rm;