Skip to content

feat(ast): add a dummy node_id field to all visitable AST types. #5775

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

Closed
rzvxa wants to merge 5 commits into from
Closed

feat(ast): add a dummy node_id field to all visitable AST types. #5775

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ea1c733
fix(ast_tools): fix miscalculation of enum layouts.
rzvxa Sep 14, 2024
ada0292
feat(ast): add a dummy `node_id` field to all visitable AST types.
rzvxa Sep 14, 2024
4226ba5
chore: cleanup.
rzvxa Sep 14, 2024
00ce823
update docs.
rzvxa Sep 14, 2024
f5344f9
chore: cleanup
rzvxa Sep 16, 2024
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
Next Next commit
fix(ast_tools): fix miscalculation of enum layouts.
  • Loading branch information
@rzvxa
rzvxa committed Sep 14, 2024
commit ea1c733b844a16b4b5755d66420a6fc73d17d428
15 changes: 10 additions & 5 deletions tasks/ast_tools/src/passes/calc_layout.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,14 @@ fn calc_enum_layout(ty: &mut Enum, ctx: &EarlyCtx) -> Result<PlatformLayout> {
acc
}

let with_tag = |mut acc: KnownLayout| -> KnownLayout {
acc.consume_niches(ty.item.variants.len() as u128, true);
acc
let with_tag = |layout: KnownLayout| -> Result<KnownLayout> {
let niches = layout.niches();
let layout = std::alloc::Layout::from_size_align(layout.size(), layout.align())
.normalize()?
.pad_to_align();
let mut layout = KnownLayout::new(layout.size(), layout.align(), niches);
layout.consume_niches(ty.item.variants.len() as u128, true);
Ok(layout)
};

let layouts = collect_variant_layouts(ty, ctx)?;
Expand All @@ -137,8 +142,8 @@ fn calc_enum_layout(ty: &mut Enum, ctx: &EarlyCtx) -> Result<PlatformLayout> {
.collect::<Option<_>>()
.expect("already checked.");

let x32 = with_tag(layouts_x32.into_iter().fold(KnownLayout::default(), fold_layout));
let x64 = with_tag(layouts_x64.into_iter().fold(KnownLayout::default(), fold_layout));
let x32 = with_tag(layouts_x32.into_iter().fold(KnownLayout::default(), fold_layout))?;
let x64 = with_tag(layouts_x64.into_iter().fold(KnownLayout::default(), fold_layout))?;
Ok(PlatformLayout(Layout::from(x64), Layout::from(x32)))
}

Expand Down