Merge

Author: AlanBateman

src/hotspot/share/classfile/javaClasses.cpp

@@ -2376,7 +2376,7 @@ void java_lang_Throwable::fill_in_stack_trace(Handle throwable, Handle contScope
       assert (contScope.is_null() || cont != NULL, "must be");
       if (cont != NULL && Continuation::is_continuation_entry_frame(fr, &map)) {
         oop scope = java_lang_Continuation::scope(cont);
-        if (contScope.not_null() && oopDesc::equals(scope, contScope())) {
+        if (contScope.not_null() && (scope == contScope())) {
           is_last = true;
         } else {
           // if (!Continuation::is_frame_in_continuation(fr, cont)) {

src/hotspot/share/prims/stackwalk.cpp

@@ -136,7 +136,7 @@ void LiveFrameStream::next() {
 
     *(_cont.raw_value()) = java_lang_Continuation::parent(cont);
 
-    if (_cont_scope.not_null() && oopDesc::equals(scope, _cont_scope())) {
+    if (_cont_scope.not_null() && (scope == _cont_scope())) {
       assert (Continuation::is_frame_in_continuation(_jvf->fr(), cont), "must be");
       _jvf = NULL;
       return;

src/hotspot/share/runtime/continuation.cpp

@@ -2657,7 +2657,7 @@ static freeze_result is_pinned0(JavaThread* thread, oop cont_scope, bool safepoi
     f = f.frame_sender<ContinuationCodeBlobLookup>(&map);
     if (!Continuation::is_frame_in_continuation(f, cont)) {
       oop scope = java_lang_Continuation::scope(cont);
-      if (oopDesc::equals(scope, cont_scope))
+      if (scope == cont_scope)
         break;
       cont = java_lang_Continuation::parent(cont);
       if (cont == (oop) NULL)
@@ -2677,7 +2677,7 @@ int Continuation::try_force_yield(JavaThread* thread, const oop cont) {
   oop scope = NULL;
   oop innermost = get_continuation(thread);
   for (oop c = innermost; c != NULL; c = java_lang_Continuation::parent(c)) {
-    if (oopDesc::equals(c, cont)) {
+    if (c == cont) {
       scope = java_lang_Continuation::scope(c);
       break;
     }
@@ -2688,7 +2688,7 @@ int Continuation::try_force_yield(JavaThread* thread, const oop cont) {
   if (thread->_cont_yield) {
     return -2; // during yield
   }
-  if (!oopDesc::equals(innermost, cont)) { // we have nested continuations
+  if (!(innermost == cont)) { // we have nested continuations
     // make sure none of the continuations in the hierarchy are pinned
     freeze_result res_pinned = is_pinned0(thread, java_lang_Continuation::scope(cont), true);
     if (res_pinned != freeze_ok)
@@ -3594,7 +3594,7 @@ bool Continuation::is_scope_bottom(oop cont_scope, const frame& f, const Registe
 
   oop sc = continuation_scope(cont);
   assert(sc != NULL, "");
-  return oopDesc::equals(sc, cont_scope);
+  return sc == cont_scope;
 }
 
 // TODO: delete? consider other is_scope_bottom or something
@@ -4018,7 +4018,7 @@ inline void ContMirror::allocate_stacks(int size, int oops, int frames) {
 
   // This first assertion isn't important, as we'll overwrite the Java-computed ones, but it's just to test that the Java computation is OK.
   assert(_sp == java_lang_Continuation::sp(_cont) && _fp == java_lang_Continuation::fp(_cont) && _pc == java_lang_Continuation::pc(_cont), "");
-  assert (oopDesc::equals(_stack, java_lang_Continuation::stack(_cont)), "");
+  assert (_stack == java_lang_Continuation::stack(_cont), "");
   assert (_stack->base(basicElementType) == _hstack, "");
   assert (to_bytes(_stack_length) >= size && to_bytes(_sp) >= size, "stack_length: %d sp: %d size: %d", to_bytes(_stack_length), _sp, size);
   assert (to_bytes(_ref_sp) >= oops, "oops: %d ref_sp: %d refStack length: %d", oops, _ref_sp, _ref_stack->length());

src/hotspot/share/runtime/vframe.cpp

@@ -511,7 +511,7 @@ vframeStream::vframeStream(JavaThread* thread, Handle continuation_scope, bool s
   }
   _cont = Handle(Thread::current(), cont);
 
-  assert (_reg_map.cont() == (oop)NULL || oopDesc::equals(_cont(), _reg_map.cont()), 
+  assert (_reg_map.cont() == (oop)NULL || (_cont() == _reg_map.cont()), 
     "map.cont: " INTPTR_FORMAT " vframeStream: " INTPTR_FORMAT, 
     p2i((oopDesc*)_reg_map.cont()), p2i((oopDesc*)_cont()));
 }
@@ -533,7 +533,7 @@ vframeStream::vframeStream(Handle continuation)
     _frame = _frame.sender(&_reg_map);
   }
 
-  assert (_reg_map.cont() == (oop)NULL || oopDesc::equals(_cont(), _reg_map.cont()), 
+  assert (_reg_map.cont() == (oop)NULL || (_cont() == _reg_map.cont()), 
     "map.cont: " INTPTR_FORMAT " vframeStream: " INTPTR_FORMAT, 
     p2i((oopDesc*)_reg_map.cont()), p2i((oopDesc*)_cont()));
 }

src/hotspot/share/runtime/vframe.inline.hpp

@@ -62,7 +62,7 @@ inline void vframeStreamCommon::next() {
 
       // *(_cont.raw_value()) = java_lang_Continuation::parent(_cont());
 
-      if (_continuation_scope.not_null() && oopDesc::equals(scope, _continuation_scope())) {
+      if (_continuation_scope.not_null() && (scope == _continuation_scope())) {
         assert (Continuation::is_frame_in_continuation(_frame, cont), "");
         _mode = at_end_mode;
         break;
@@ -74,7 +74,7 @@ inline void vframeStreamCommon::next() {
 
     if (cont_entry) {
       *(_cont.raw_value()) = java_lang_Continuation::parent(cont);
-      assert (_reg_map.cont() == (oop)NULL || oopDesc::equals(_cont(), _reg_map.cont()), 
+      assert (_reg_map.cont() == (oop)NULL || (_cont() == _reg_map.cont()),
         "map.cont: " INTPTR_FORMAT " vframeStream: " INTPTR_FORMAT, 
         p2i((oopDesc*)_reg_map.cont()), p2i((oopDesc*)_cont()));
     }

src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java

@@ -423,8 +423,8 @@ public void initialize(HotSpotProviders providers, OptionValues options) {
         }
 
         if (c.continuationThaw != 0) {
-            registerForeignCall(CONTINUATION_DO_CONTINUE, c.continuationThaw, JavaCall, DESTROYS_REGISTERS, SAFEPOINT, NOT_REEXECUTABLE, any());
-            registerForeignCall(CONTINUATION_YIELD, c.continuationDoYield, JavaCall, DESTROYS_REGISTERS, SAFEPOINT, NOT_REEXECUTABLE, any());
+            registerForeignCall(CONTINUATION_DO_CONTINUE, c.continuationThaw, JavaCall, SAFEPOINT, NOT_REEXECUTABLE, any());
+            registerForeignCall(CONTINUATION_YIELD, c.continuationDoYield, JavaCall, SAFEPOINT, NOT_REEXECUTABLE, any());
         }