src/hotspot/share/prims/jvm.cpp

*** 1360,11 ***
  
  class ScopedValueBindingsResolver {
  public:
    InstanceKlass* Carrier_klass;
    ScopedValueBindingsResolver(JavaThread* THREAD) {
!     Klass *k = SystemDictionary::resolve_or_fail(vmSymbols::jdk_incubator_concurrent_ScopedValue_Carrier(), true, THREAD);
      Carrier_klass = InstanceKlass::cast(k);
    }
  };
  
  JVM_ENTRY(jobject, JVM_FindScopedValueBindings(JNIEnv *env, jclass cls))
--- 1360,11 ---
  
  class ScopedValueBindingsResolver {
  public:
    InstanceKlass* Carrier_klass;
    ScopedValueBindingsResolver(JavaThread* THREAD) {
!     Klass *k = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_ScopedValue_Carrier(), true, THREAD);
      Carrier_klass = InstanceKlass::cast(k);
    }
  };
  
  JVM_ENTRY(jobject, JVM_FindScopedValueBindings(JNIEnv *env, jclass cls))

*** 1393,11 ***
      }
  
      if (loc != -1) {
        javaVFrame *frame = vfst.asJavaVFrame();
        StackValueCollection* locals = frame->locals();
!       StackValue* head_sv = locals->at(loc); // jdk/incubator/concurrent/ScopedValue$Snapshot
        Handle result = head_sv->get_obj();
        assert(!head_sv->obj_is_scalar_replaced(), "found scalar-replaced object");
        if (result() != nullptr) {
          return JNIHandles::make_local(THREAD, result());
        }
--- 1393,11 ---
      }
  
      if (loc != -1) {
        javaVFrame *frame = vfst.asJavaVFrame();
        StackValueCollection* locals = frame->locals();
!       StackValue* head_sv = locals->at(loc); // java/lang/ScopedValue$Snapshot
        Handle result = head_sv->get_obj();
        assert(!head_sv->obj_is_scalar_replaced(), "found scalar-replaced object");
        if (result() != nullptr) {
          return JNIHandles::make_local(THREAD, result());
        }