Skip to content

feat: ensure SMIR export records function item types #104

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

Draft
Stevengre wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

feat: ensure SMIR export records function item types #104

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 14 additions & 3 deletions src/printer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,14 +530,20 @@ impl Visitor for TyCollector<'_> {
self.resolved.insert(*ty);
let instance =
Instance::resolve_closure(def, args, stable_mir::ty::ClosureKind::Fn).unwrap();
self.visit_instance(instance)
let control = self.visit_instance(instance);
let maybe_layout_shape = ty.layout().ok().map(|layout| layout.shape());
self.types.insert(*ty, (ty.kind(), maybe_layout_shape));
control
}
// Break on CoroutineWitnesses, because they aren't expected when getting the layout
TyKind::RigidTy(RigidTy::CoroutineWitness(..)) => ControlFlow::Break(()),
TyKind::RigidTy(RigidTy::FnDef(def, ref args)) => {
self.resolved.insert(*ty);
let instance = Instance::resolve(def, args).unwrap();
self.visit_instance(instance)
let control = self.visit_instance(instance);
let maybe_layout_shape = ty.layout().ok().map(|layout| layout.shape());
self.types.insert(*ty, (ty.kind(), maybe_layout_shape));
control
}
TyKind::RigidTy(RigidTy::FnPtr(binder_stable)) => {
self.resolved.insert(*ty);
Expand All @@ -553,7 +559,10 @@ impl Visitor for TyCollector<'_> {
let mut inputs_outputs: Vec<stable_mir::ty::Ty> =
sig_stable.args.iter().map(|arg_abi| arg_abi.ty).collect();
inputs_outputs.push(sig_stable.ret.ty);
inputs_outputs.super_visit(self)
let control = inputs_outputs.super_visit(self);
let maybe_layout_shape = ty.layout().ok().map(|layout| layout.shape());
self.types.insert(*ty, (ty.kind(), maybe_layout_shape));
control
}
// The visitor won't collect field types for ADTs, therefore doing it explicitly
TyKind::RigidTy(RigidTy::Adt(adt_def, args)) => {
Expand Down Expand Up @@ -900,6 +909,8 @@ impl MirVisitor for InternedValueCollector<'_, '_> {
}
ConstantKind::Unevaluated(_) | ConstantKind::Param(_) | ConstantKind::ZeroSized => {}
}
// Ensure the type of the constant itself is recorded, even for ZSTs.
let _ = self.ty_visitor.visit_ty(&constant.ty());
self.super_mir_const(constant, loc);
}

Expand Down
Loading