Merge branch 'trunk' into rename-map-to-dict

2025-09-27 22:09:09 +00:00 · 2020-12-11 23:39:10 -05:00 · 2020-12-11 23:39:10 -05:00 · cd6e6e6e4f
commit cd6e6e6e4f
parent f2f6562127 3d827f40f4
18 changed files with 12162 additions and 135 deletions
--- a/compiler/mono/src/layout.rs
+++ b/compiler/mono/src/layout.rs
@ -260,10 +260,17 @@ impl<'a> ClosureLayout<'a> {
            Layout::Union(tags) => {
                // NOTE it's very important that this Union consists of Closure tags
                // and is not an unpacked 1-element record
+
+                let tag_id = self
+                    .captured
+                    .iter()
+                    .position(|(tn, _)| *tn == TagName::Closure(original))
+                    .unwrap() as _;
+
                let expr = Expr::Tag {
                    tag_layout: Layout::Union(tags),
                    tag_name: TagName::Closure(original),
-                    tag_id: 0,
+                    tag_id,
                    union_size: tags.len() as u8,
                    arguments: symbols,
                };