4271 - bugfix unrelated to alloc-ids

2 files changed, 18 insertions, 2 deletions

diff --git a/042name.cc b/042name.cc
index 3078574e..88343495 100644
--- a/042name.cc
+++ b/042name.cc
@@ -40,9 +40,12 @@ void transform_names(const recipe_ordinal r) {
   bool names_used = false;
   bool numeric_locations_used = false;
   map<string, int>& names = Name[r];
-  // store the indices 'used' so far in the map
+  // record the indices 'used' so far in the map
   int& curr_idx = names[""];
-  curr_idx = 2;  // reserve indices 0 and 1 for the chaining slot in a later layer
+  // reserve indices 0 and 1 for the chaining slot in a later layer.
+  // transform_names may get called multiple times in later layers, so
+  // curr_idx may already be set.
+  if (curr_idx < 2) curr_idx = 2;
   for (int i = 0;  i < SIZE(caller.steps);  ++i) {
     instruction& inst = caller.steps.at(i);
     // End transform_names(inst) Special-cases
diff --git a/045closure_name.cc b/045closure_name.cc
index 98bf982c..d1c4859a 100644
--- a/045closure_name.cc
+++ b/045closure_name.cc
@@ -168,3 +168,16 @@ def main [
   3:num/raw <- use-scope 1:space/raw
 ]
 +mem: storing 34 in location 3
+
+:(scenario recursive_transform_names)
+def foo [
+  local-scope
+  x:num <- copy 0
+  return default-space/names:foo
+]
+def main [
+  local-scope
+  0:space/names:foo <- foo
+  x:num/space:1 <- copy 34
+]
+$error: 0