rt: Make the logic that moves environments between tasks update the GC alloc chain correctly

1 files changed, 10 insertions, 4 deletions

diff --git a/src/rt/rust_cc.cpp b/src/rt/rust_cc.cpp
index 9d6c4992b17..c53ec1aa51c 100644
--- a/src/rt/rust_cc.cpp
+++ b/src/rt/rust_cc.cpp
@@ -178,16 +178,22 @@ irc::compute_ircs(rust_task *task, irc_map &ircs) {
         shape::arena arena;
         shape::type_param *params =
             shape::type_param::from_tydesc_and_data(tydesc, p, arena);
-        irc irc(task, true, tydesc->shape, params, tydesc->shape_tables,
-                p + sizeof(uintptr_t), ircs);
-        irc.walk();
 
 #if 0
+        shape::print print(task, true, tydesc->shape, params,
+                           tydesc->shape_tables);
+        print.walk();
+
         shape::log log(task, true, tydesc->shape, params,
-                       tydesc->shape_tables, p, std::cerr);
+                       tydesc->shape_tables, p + sizeof(uintptr_t),
+                       std::cerr);
         log.walk();
 #endif
 
+        irc irc(task, true, tydesc->shape, params, tydesc->shape_tables,
+                p + sizeof(uintptr_t), ircs);
+        irc.walk();
+
         ++begin;
     }
 }