Skip to content

Type-ref roots 1-3: clear the six-module shared histogram (post-7097) #7153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
briansrls merged 3 commits into from
Jul 24, 2026
Merged

Type-ref roots 1-3: clear the six-module shared histogram (post-7097) #7153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a126257
WIP: Type-ref roots 1-3: clear the six-module shared histogram (post-…
Jul 24, 2026
91b81f5
WIP: Type-ref roots 1-3: clear the six-module shared histogram (post-…
Jul 24, 2026
7193971
fix: unique_strings pipeline emit in field-import harvest
Jul 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 44 additions & 12 deletions src/v1/05_emit_rust.dag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1984,22 +1984,57 @@ fn build_module_export_sets(modules: List<TypedModule>) -> Map<String, Map<Strin
)
}

fn emit_inferred_type_leaf_name(n: Node, source_indices: Map<String, NewlineIndex>) -> String {
match n.inferred {
Present { value: Resolved { node: rt } } =>
let is_optional = rt.return_cardinality == CardOptional
if is_optional {
authored_name_at(source_indices: source_indices, node: with_required_cardinality(n: rt))
} else { authored_name_at(source_indices: source_indices, node: rt) }
_ => ""
}
}

fn record_lit_ref_names(n: Node, source_indices: Map<String, NewlineIndex>) -> List<String> {
match n.expr_data {
ExprRecordLit { parent_enum: pe } =>
let tn_list = match record_lit_type_name_at(texpr: n, source_indices: source_indices) {
Present { value: t } => if t != "" { [t] } else { [] }
Absent => []
Absent =>
let inferred = emit_inferred_type_leaf_name(n: n, source_indices: source_indices)
if inferred != "" { [inferred] } else { [] }
}
let pe_list = match pe {
Present { value: p } => if p != "" { [p] } else { [] }
Absent => []
}
concat(tn_list, pe_list)
unique_strings(items: concat(tn_list, pe_list))
_ => []
}
}

fn collect_items_field_import_surface_names(items: List<Node>, type_summaries: Map<String, TypeSummary>, variant_to_enum: Map<String, String>, source_indices: Map<String, NewlineIndex>) -> List<String> {
unique_strings(items: items |> flat_map(item =>
collect_item_emit_surface_names(item: item, source_indices: source_indices, variant_to_enum: variant_to_enum, type_summaries: type_summaries)
|> flat_map(type_name =>
match map_get(type_summaries, type_name) {
Present { value: summary } =>
summary.field_import_surface_names |> filter(field_type =>
field_type != "" && match map_get(type_summaries, field_type) {
Present { value: ft } =>
match ft.repr {
StructRepr => true
_ => false
}
Absent => false
}
)
Absent => []
}
)
))
}

fn collect_value_ref_names(n: Node, source_indices: Map<String, NewlineIndex>) -> List<String> {
let self_name = match n.expr_data {
ExprVar { binding_kind: bk } =>
Expand Down Expand Up @@ -2052,14 +2087,7 @@ fn collect_item_type_surface_names(item: Node, source_indices: Map<String, Newli
}

fn emit_scrutinee_type_name(scrutinee: Node, source_indices: Map<String, NewlineIndex>) -> String {
match scrutinee.inferred {
Present { value: Resolved { node: rt } } =>
let is_optional = rt.return_cardinality == CardOptional
if is_optional {
authored_name_at(source_indices: source_indices, node: with_required_cardinality(n: rt))
} else { authored_name_at(source_indices: source_indices, node: rt) }
_ => ""
}
emit_inferred_type_leaf_name(n: scrutinee, source_indices: source_indices)
}

fn collect_match_pattern_parent_enums(expr: Node, source_indices: Map<String, NewlineIndex>, variant_to_enum: Map<String, String>, type_summaries: Map<String, TypeSummary>) -> List<String> {
Expand All @@ -2084,11 +2112,14 @@ fn collect_value_emit_type_surface_names(n: Node, source_indices: Map<String, Ne
ExprRecordLit { parent_enum: _ } => record_lit_ref_names(n: n, source_indices: source_indices)
ExprMatch => collect_match_pattern_parent_enums(expr: n, source_indices: source_indices, variant_to_enum: variant_to_enum, type_summaries: type_summaries)
_ =>
let from_inferred = emit_inferred_type_leaf_name(n: n, source_indices: source_indices)
let from_inferred_list = if from_inferred != "" { [from_inferred] } else { [] }
let nm = authored_name_at(source_indices: source_indices, node: n)
match map_get(variant_to_enum, nm) {
let from_variant = match map_get(variant_to_enum, nm) {
Present { value: parent } => if parent != "" { [parent] } else { [] }
Absent => []
}
unique_strings(items: concat(from_inferred_list, from_variant))
}
let child_names = concat(
concat(
Expand Down Expand Up @@ -2142,7 +2173,8 @@ fn reference_derived_use_lines(items: List<Node>, unlisted_type_names: List<Stri
{
let value_names = unique_strings(items: items |> flat_map(item => collect_value_ref_names(n: item, source_indices: source_indices)))
let type_surface_names = unique_strings(items: items |> flat_map(item => collect_item_emit_surface_names(item: item, source_indices: source_indices, variant_to_enum: emit_info.variant_to_enum, type_summaries: emit_info.type_summaries)))
let candidates = unique_strings(items: concat(concat(unlisted_type_names, value_names), type_surface_names))
let field_surface_names = collect_items_field_import_surface_names(items: items, type_summaries: emit_info.type_summaries, variant_to_enum: emit_info.variant_to_enum, source_indices: source_indices)
let candidates = unique_strings(items: concat(concat(concat(unlisted_type_names, value_names), type_surface_names), field_surface_names))
let local_decl_names = items |> flat_map(item =>
let nm = authored_name_at(source_indices: source_indices, node: item)
if nm == "" { [] } else { [nm] }
Expand Down
134 changes: 114 additions & 20 deletions src/v1/stage0/src/v1_compiler_emit_rust.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4517,6 +4517,26 @@ pub fn build_module_export_sets(
)
}

pub fn emit_inferred_type_leaf_name(
n: Rc<Node>,
source_indices: Rc<HashMap<String, Rc<NewlineIndex>>>,
) -> String {
match n.inferred.clone().as_deref().cloned() {
Some(InferredNode::Resolved { node: rt, .. }) => {
let is_optional = (rt.return_cardinality.clone() == Cardinality::CardOptional);
if is_optional.clone() {
authored_name_at(
source_indices.clone(),
with_required_cardinality(rt.clone()),
)
} else {
authored_name_at(source_indices.clone(), rt.clone())
}
}
_ => "".to_string(),
}
}

pub fn record_lit_ref_names(
n: Rc<Node>,
source_indices: Rc<HashMap<String, Rc<NewlineIndex>>>,
Expand All @@ -4533,7 +4553,14 @@ pub fn record_lit_ref_names(
Rc::new(vec![])
}
}
None => Rc::new(vec![]),
None => {
let inferred = emit_inferred_type_leaf_name(n.clone(), source_indices.clone());
if (inferred.clone() != "".to_string()) {
Rc::new(vec![inferred.clone()])
} else {
Rc::new(vec![])
}
}
};
let pe_list = match pe.clone() {
Some(p) => {
Expand All @@ -4545,12 +4572,73 @@ pub fn record_lit_ref_names(
}
None => Rc::new(vec![]),
};
v1_rt::concat(tn_list.clone(), pe_list.clone())
unique_strings(v1_rt::concat(tn_list.clone(), pe_list.clone()))
}
_ => Rc::new(vec![]),
}
}

pub fn collect_items_field_import_surface_names(
items: Rc<Vec<Rc<Node>>>,
type_summaries: Rc<HashMap<String, Rc<TypeSummary>>>,
variant_to_enum: Rc<HashMap<String, String>>,
source_indices: Rc<HashMap<String, Rc<NewlineIndex>>>,
) -> Rc<Vec<String>> {
unique_strings(Rc::new({
let mut __result = Vec::new();
for item in items.clone().iter().cloned() {
__result.extend(
(*Rc::new({
let mut __result = Vec::new();
for type_name in collect_item_emit_surface_names(
item.clone(),
source_indices.clone(),
variant_to_enum.clone(),
type_summaries.clone(),
)
.iter()
.cloned()
{
__result.extend(
(*match v1_rt::map_get(&type_summaries, type_name.clone()) {
Some(summary) => Rc::new({
let mut __result = Vec::new();
for field_type in
summary.field_import_surface_names.clone().iter().cloned()
{
if ((field_type.clone() != "".to_string())
&& match v1_rt::map_get(
&type_summaries,
field_type.clone(),
) {
Some(ft) => match (*ft.repr.clone()).clone() {
TypeRepr::StructRepr => true,
_ => false,
},
None => false,
})
{
__result.push(field_type);
}
}
__result
}),
None => Rc::new(vec![]),
})
.iter()
.cloned(),
);
}
__result
}))
.iter()
.cloned(),
);
}
__result
}))
}

pub fn collect_value_ref_names(
n: Rc<Node>,
source_indices: Rc<HashMap<String, Rc<NewlineIndex>>>,
Expand Down Expand Up @@ -4696,20 +4784,7 @@ pub fn emit_scrutinee_type_name(
scrutinee: Rc<Node>,
source_indices: Rc<HashMap<String, Rc<NewlineIndex>>>,
) -> String {
match scrutinee.inferred.clone().as_deref().cloned() {
Some(InferredNode::Resolved { node: rt, .. }) => {
let is_optional = (rt.return_cardinality.clone() == Cardinality::CardOptional);
if is_optional.clone() {
authored_name_at(
source_indices.clone(),
with_required_cardinality(rt.clone()),
)
} else {
authored_name_at(source_indices.clone(), rt.clone())
}
}
_ => "".to_string(),
}
emit_inferred_type_leaf_name(scrutinee.clone(), source_indices.clone())
}

pub fn collect_match_pattern_parent_enums(
Expand Down Expand Up @@ -4775,8 +4850,14 @@ pub fn collect_value_emit_type_surface_names(
type_summaries.clone(),
),
_ => {
let from_inferred = emit_inferred_type_leaf_name(n.clone(), source_indices.clone());
let from_inferred_list = if (from_inferred.clone() != "".to_string()) {
Rc::new(vec![from_inferred.clone()])
} else {
Rc::new(vec![])
};
let nm = authored_name_at(source_indices.clone(), n.clone());
match v1_rt::map_get(&variant_to_enum, nm.clone()) {
let from_variant = match v1_rt::map_get(&variant_to_enum, nm.clone()) {
Some(parent) => {
if (parent.clone() != "".to_string()) {
Rc::new(vec![parent.clone()])
Expand All @@ -4785,7 +4866,11 @@ pub fn collect_value_emit_type_surface_names(
}
}
None => Rc::new(vec![]),
}
};
unique_strings(v1_rt::concat(
from_inferred_list.clone(),
from_variant.clone(),
))
}
};
let child_names = v1_rt::concat(
Expand Down Expand Up @@ -5044,9 +5129,18 @@ pub fn reference_derived_use_lines(
}
__result
}));
let field_surface_names = collect_items_field_import_surface_names(
items.clone(),
emit_info.type_summaries.clone(),
emit_info.variant_to_enum.clone(),
source_indices.clone(),
);
let candidates = unique_strings(v1_rt::concat(
v1_rt::concat(unlisted_type_names.clone(), value_names.clone()),
type_surface_names.clone(),
v1_rt::concat(
v1_rt::concat(unlisted_type_names.clone(), value_names.clone()),
type_surface_names.clone(),
),
field_surface_names.clone(),
));
let local_decl_names = Rc::new({
let mut __result = Vec::new();
Expand Down
Loading