Final touches.

runtime/src/main/cpp/Memory.cpp

@@ -824,6 +824,10 @@ void dumpObject(ObjHeader* ref, int indent) {
 }
 
 void dumpContainerContent(ContainerHeader* container) {
+  if (container->refCount() <= 0) {
+    MEMORY_LOG("%p has non-positive RC, likely a memory bug\n", container)
+    return;
+  }
   if (isAggregatingFrozenContainer(container)) {
     MEMORY_LOG("%s aggregating container %p with %d objects rc=%d\n",
                colorNames[container->color()], container, container->objectCount(), container->refCount());
@@ -1630,7 +1634,7 @@ OBJ_GETTER(AllocInstance, const TypeInfo* type_info) {
   ContainerHeader* header = container.header();
   // We cannot collect until reference will be stored into the stack slot.
   if (header->tag() == CONTAINER_TAG_NORMAL) {
-    IncrementRC<false>(header);
+    IncrementRC</* Atomic = */ false>(header);
     EnqueueDecrementRC</* CanCollect = */ true>(header);
   }
   RETURN_OBJ(container.GetPlace());
@@ -1643,7 +1647,7 @@ OBJ_GETTER(AllocArrayInstance, const TypeInfo* type_info, int32_t elements) {
   ContainerHeader* header = container.header();
   // We cannot collect until reference will be stored into the stack slot.
   if (header->tag() == CONTAINER_TAG_NORMAL) {
-    IncrementRC<false>(header);
+    IncrementRC</* Atomic = */ false>(header);
     EnqueueDecrementRC</* CanCollect = */ true>(header);
   }
   RETURN_OBJ(container.GetPlace()->obj());
@@ -1978,10 +1982,24 @@ 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::transfer() {
+  auto* result = obj_;
+  obj_ = nullptr;
+  return CreateStablePointer(result);
+}
+
 #if USE_GC
 bool hasExternalRefs(ContainerHeader* start, ContainerHeaderSet* visited) {
   ContainerHeaderDeque toVisit;
@@ -2029,12 +2047,9 @@ bool ClearSubgraphReferences(ObjHeader* root, bool checked) {
         released->decRefCount<false>();
       }
     }
-    container->decRefCount<false>();
     MarkGray<false>(container);
     auto bad = hasExternalRefs(container, &visited);
     ScanBlack<false>(container);
-    // Restore original RC.
-    container->incRefCount<false>();
     for (auto it = state->toRelease->begin(); it != state->toRelease->end(); ++it) {
        auto released = *it;
        if (!isMarkedAsRemoved(released) && released->tag() == CONTAINER_TAG_NORMAL) {

runtime/src/main/cpp/Memory.h

@@ -544,11 +544,7 @@ class ObjHolder {
 
    void clear() { ::ZeroStackRef(&obj_); }
 
-   void* transfer() {
-     auto* result = obj_;
-     obj_ = nullptr;
-     return result;
-   }
+   void* transfer();
 
  private:
    ObjHeader** frame() { return reinterpret_cast<ObjHeader**>(&frame_); }