From 3b22b1f13ec46cd31c7ef841abb625d2c3408425 Mon Sep 17 00:00:00 2001
From: Ryan Fleury <ryan.j.fleury@gmail.com>
Date: Fri, 19 Jun 2026 12:37:43 -0700
Subject: [PATCH] fix incorrect work happening w/ subsets turned off for psym
 generation

---
 src/lib_rdi_make/rdi_make.c   | 2 +-
 src/rdi_make/rdi_make_local.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/lib_rdi_make/rdi_make.c b/src/lib_rdi_make/rdi_make.c
index 49be12a0..86f9970d 100644
--- a/src/lib_rdi_make/rdi_make.c
+++ b/src/lib_rdi_make/rdi_make.c
@@ -1623,7 +1623,7 @@ RDI_PROC RDI_U32
 rdim_bake_idx_from_idx_run(RDIM_BakeIdxRunMap *map, RDI_U32 *idxes, RDI_U32 count)
 {
   RDI_U32 idx = 0;
-  if(count != 0)
+  if(count != 0 && map->slots_count != 0)
   {
     RDI_U64 hash = rdim_hash_from_idx_run(idxes, count);
     RDI_U64 slot_idx = hash%map->slots_count;
diff --git a/src/rdi_make/rdi_make_local.c b/src/rdi_make/rdi_make_local.c
index 095672d7..258e2531 100644
--- a/src/rdi_make/rdi_make_local.c
+++ b/src/rdi_make/rdi_make_local.c
@@ -1948,7 +1948,12 @@ rdim_bake(Arena *arena, RDIM_BakeParams *params)
     RDI_U64 nodes_count;
   };
   BakedNameMaps *baked_name_maps = 0;
-  ProfScope("bake name maps")
+  if(lane_idx() == 0)
+  {
+    baked_name_maps = push_array(scratch.arena, BakedNameMaps, 1);
+  }
+  lane_sync_u64(&baked_name_maps, 0);
+  if(params->subset_flags & RDIM_SubsetFlag_NameMaps) ProfScope("bake name maps")
   {
     Temp scratch2 = scratch_begin(&scratch.arena, 1);
     
@@ -2022,7 +2027,6 @@ rdim_bake(Arena *arena, RDIM_BakeParams *params)
     // rjf: setup
     ProfScope("setup") if(lane_idx() == 0)
     {
-      baked_name_maps = push_array(scratch.arena, BakedNameMaps, 1);
       baked_name_maps->name_maps_count = RDI_NameMapKind_COUNT;
       baked_name_maps->name_maps = push_array(arena, RDI_NameMap, baked_name_maps->name_maps_count);
       RDI_U32 bucket_off = 0;