3654

Follow-up to commit 3321: move get_base_type() more thoroughly to layer
55. The notion of a base_type doesn't really make sense before we
introduce type ingredients and shape-shifting containers, and it
simplifies early layers a *lot* even including the cost of that *ugly*
preamble in layer 55 to retrofit all the places.

1 files changed, 3 insertions, 1 deletions

diff --git a/042name.cc b/042name.cc
index 6b6d2a74..1fc2f201 100644
--- a/042name.cc
+++ b/042name.cc
@@ -121,7 +121,9 @@ type_ordinal skip_addresses(type_tree* type) {
   while (type && is_compound_type_starting_with(type, "address"))
     type = type->right;
   if (!type) return -1;  // error handled elsewhere
-  return root_type(type)->value;
+  const type_tree* base_type = type;
+  // Update base_type in skip_addresses
+  return base_type->value;
 }
 
 int find_element_name(const type_ordinal t, const string& name, const string& recipe_name) {