Review feedback.

runtime/src/main/cpp/Memory.cpp

@@ -1982,35 +1982,10 @@ OBJ_GETTER(AdoptStablePointer, KNativePtr pointer) {
   MEMORY_LOG("adopting stable pointer %p, rc=%d\n", \
      ref, (ref && ref->container()) ? ref->container()->refCount() : -1)
   UpdateReturnRef(OBJ_RESULT, ref);
-  if (ref != nullptr) {
-    auto* container = ref->container();
-    // Effectively adoption is like allocation, so for the normal objects - do the same thing.
-    if (container != nullptr && container->tag() == CONTAINER_TAG_NORMAL) {
-      IncrementRC</* Atomic = */ false>(container);
-      EnqueueDecrementRC</* CanCollect = */ true>(container);
-    }
-  }
   DisposeStablePointer(pointer);
   return ref;
 }
 
-void ObjHolder::hold() {
-  if (obj_ != nullptr) {
-    MEMORY_LOG("Holding %p, rc=%d\n", obj_, obj_->container() ? obj_->container()->refCount() : -1)
-    AddHeapRef(obj_);
-  }
-}
-
-void* ObjHolder::transferHeld() {
-  auto* result = obj_;
-  if (result != nullptr) {
-    auto* container = result->container();
-    MEMORY_LOG("Transferring %p, rc=%d\n", result, container ? container->refCount() : -1)
-    clear();
-  }
-  return result;
-}
-
 #if USE_GC
 bool hasExternalRefs(ContainerHeader* start, ContainerHeaderSet* visited) {
   ContainerHeaderDeque toVisit;

runtime/src/main/cpp/Memory.h

@@ -544,10 +544,6 @@ class ObjHolder {
 
    void clear() { ::ZeroStackRef(&obj_); }
 
-
-   void hold();
-   void* transferHeld();
-
  private:
    ObjHeader** frame() { return reinterpret_cast<ObjHeader**>(&frame_); }
 

runtime/src/main/cpp/Worker.cpp

@@ -62,11 +62,13 @@ enum {
 THREAD_LOCAL_VARIABLE KInt g_currentWorkerId = 0;
 
 KNativePtr transfer(ObjHolder* holder, KInt mode) {
-  holder->hold();
+  void* result = CreateStablePointer(holder->obj());
   if (!ClearSubgraphReferences(holder->obj(), mode == CHECKED)) {
+    DisposeStablePointer(result);
     ThrowWorkerInvalidState();
   }
-  return holder->transferHeld();
+  holder->clear();
+  return result;
 }
 
 class Locker {