acquire messages may refer to immutable objects not in the objectmap

doublec · Mar 12, 2016 · 5ca1846 · 5ca1846
1 parent 9aca1e0
commit 5ca1846
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/libponyrt/gc/gc.c b/src/libponyrt/gc/gc.c
@@ -450,8 +450,10 @@ bool ponyint_gc_acquire(gc_t* gc, actorref_t* aref)
 
   while((obj = ponyint_objectmap_next(map, &i)) != NULL)
   {
-    // Add to our RC.
-    object_t* obj_local = ponyint_objectmap_getobject(&gc->local, obj->address);
+    // Add to our RC. The object may not be in our object map, if it was
+    // reached through another immutable reference.
+    object_t* obj_local = ponyint_objectmap_getorput(&gc->local, obj->address,
+      gc->mark);
     obj_local->rc += obj->rc;
 
     // Mark as immutable if necessary.