1 files changed, 9 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_gc.c b/erts/emulator/beam/erl_gc.c
index 0d12e658d9..2c219ee87c 100644
--- a/erts/emulator/beam/erl_gc.c
+++ b/erts/emulator/beam/erl_gc.c
@@ -1964,6 +1964,15 @@ setup_rootset(Process *p, Eterm *objv, int nobj, Rootset *rootset)
         ++n;
     }
 
+    // Check if a suspended bif has live working data.
+    // How do we know n is small enough to fit in roots[32?]?
+    if (p->extra_root != NULL) {
+      printf("GC with extra_root 0x%xl\n", p->extra_root);
+        roots[n].v = p->extra_root;
+        roots[n].sz = p->extra_root_sz;
+        ++n;
+    }
+
     ASSERT((is_nil(p->seq_trace_token) ||
 	    is_tuple(follow_moved(p->seq_trace_token)) ||
 	    is_atom(p->seq_trace_token)));