Skip to content

fix(rustlantis): validate place projections against LocalDecls #1263

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
nihalpasham merged 2 commits into from
Sep 18, 2026
Merged

fix(rustlantis): validate place projections against LocalDecls #1263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eea1582
fix(rustlantis): drop the removed box_patterns feature gate
sachinsharma3191 Sep 13, 2026
21d460f
fix(rustlantis): validate place projections against LocalDecls
sachinsharma3191 Sep 13, 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
6 changes: 3 additions & 3 deletions crates/fuzzer/rustlantis/generate/src/generation/intrinsics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ impl CoreIntrinsic for ArithOffset {
.into_weighted(&ctx.pt)?;
let ptr = ctx
.make_choice_weighted(ptrs.into_iter(), weights, |ppath| {
Ok(ppath.to_place(&ctx.pt))
Ok(ppath.to_place(&ctx.pt, ctx.current_decls()))
})
.ok()?;

Expand All @@ -84,7 +84,7 @@ impl CoreIntrinsic for ArithOffset {
}
_ => PlaceSelector::for_known_val(ctx.tcx.clone())
.of_ty(TyCtxt::ISIZE)
.into_iter_place(&ctx.pt)
.into_iter_place(&ctx.pt, ctx.current_decls())
.choose(&mut *rng)
.map(Operand::Copy)
.unwrap_or_else(|| {
Expand Down Expand Up @@ -162,7 +162,7 @@ impl CoreIntrinsic for Transmute {
.into_weighted(&ctx.pt)?;
let src = ctx
.make_choice_weighted(srcs.into_iter(), weights, |ppath| {
Ok(ppath.to_place(&ctx.pt))
Ok(ppath.to_place(&ctx.pt, ctx.current_decls()))
})
.ok()?;
if src.ty(ctx.current_decls(), &ctx.tcx).is_copy(&ctx.tcx) {
Expand Down
42 changes: 29 additions & 13 deletions crates/fuzzer/rustlantis/generate/src/generation/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,13 @@ impl GenerationCtx {
.ok_or(SelectionError::Exhausted)?;
self.make_choice_weighted(ppath.into_iter(), weights, |ppath| {
if self.pt.ty(ppath.target_index()).is_copy(&self.tcx) {
Ok(Operand::Copy(ppath.to_place(&self.pt)))
Ok(Operand::Copy(
ppath.to_place(&self.pt, self.current_decls()),
))
} else {
Ok(Operand::Move(ppath.to_place(&self.pt)))
Ok(Operand::Move(
ppath.to_place(&self.pt, self.current_decls()),
))
}
})?
};
Expand Down Expand Up @@ -166,7 +170,7 @@ impl GenerationCtx {
.into_weighted(&self.pt)
.ok_or(SelectionError::Exhausted)?;
let r = self.make_choice_weighted(ppath.into_iter(), weights, |ppath| {
Ok(Operand::Copy(ppath.to_place(&self.pt)))
Ok(Operand::Copy(ppath.to_place(&self.pt, self.current_decls())))
});
let r = r.unwrap_or_else(|_| {
Operand::Constant(
Expand Down Expand Up @@ -328,7 +332,10 @@ impl GenerationCtx {
.into_weighted(&self.pt)
.ok_or(SelectionError::Exhausted)?;
self.make_choice_weighted(candidates.into_iter(), weights, |ppath| {
Ok(Rvalue::AddressOf(*mutability, ppath.to_place(&self.pt)))
Ok(Rvalue::AddressOf(
*mutability,
ppath.to_place(&self.pt, self.current_decls()),
))
})
}

Expand All @@ -343,13 +350,20 @@ impl GenerationCtx {
.except(lhs);
if let Some(_) = self.pt.pointee(lhs.to_place_index(&self.pt).unwrap()) {
// The MIR linter doesn't like it if we do x = &(*x)
selector = selector.except(lhs.clone().project(ProjectionElem::Deref));
selector = selector.except(
lhs.clone()
.project(ProjectionElem::Deref, self.current_decls(), &self.tcx)
.expect("a reference-typed place can be dereferenced"),
);
}
let (candidates, weights) = selector
.into_weighted(&self.pt)
.ok_or(SelectionError::Exhausted)?;
self.make_choice_weighted(candidates.into_iter(), weights, |ppath| {
Ok(Rvalue::Ref(*mutability, ppath.to_place(&self.pt)))
Ok(Rvalue::Ref(
*mutability,
ppath.to_place(&self.pt, self.current_decls()),
))
})
}

Expand Down Expand Up @@ -436,7 +450,7 @@ impl GenerationCtx {
.ok_or(SelectionError::Exhausted)?;

self.make_choice_weighted(lhs_choices.into_iter(), weights, |ppath| {
let lhs = ppath.to_place(&self.pt);
let lhs = ppath.to_place(&self.pt, self.current_decls());
trace!(
"generating an assignment statement with lhs {}: {}",
lhs.serialize_place(&self.tcx),
Expand Down Expand Up @@ -489,7 +503,7 @@ impl GenerationCtx {
#[allow(dead_code)]
fn generate_deinit(&self) -> Result<Statement> {
let place = PlaceSelector::for_operand(self.tcx.clone())
.into_iter_place(&self.pt)
.into_iter_place(&self.pt, self.current_decls())
.choose(&mut *self.rng.borrow_mut())
.ok_or(SelectionError::Exhausted)?;
Ok(Statement::Deinit(place))
Expand All @@ -508,7 +522,7 @@ impl GenerationCtx {
.ok_or(SelectionError::Exhausted)?;

self.make_choice_weighted(choices.into_iter(), weights, |ppath| {
let place = ppath.to_place(&self.pt);
let place = ppath.to_place(&self.pt, self.current_decls());
trace!(
"generating a set discriminant statement with place {}",
place.serialize_place(&self.tcx),
Expand Down Expand Up @@ -658,7 +672,7 @@ impl GenerationCtx {
let (place, place_val) =
self.make_choice_weighted(places.into_iter(), weights, |ppath| {
let val = self.pt.known_val(ppath.target_index()).expect("has_value");
Ok((ppath.to_place(&self.pt), *val))
Ok((ppath.to_place(&self.pt, self.current_decls()), *val))
})?;

return Ok(TerminatorParams::SwitchInt {
Expand Down Expand Up @@ -720,7 +734,7 @@ impl GenerationCtx {

let return_place =
self.make_choice_weighted(return_places.into_iter(), weights, |ppath| {
Result::Ok(ppath.to_place(&self.pt))
Result::Ok(ppath.to_place(&self.pt, self.current_decls()))
})?;

// TODO: if return place has a ref, don't generate 0 argument as this can never be valid
Expand All @@ -737,7 +751,7 @@ impl GenerationCtx {
.into_weighted(&self.pt)
.ok_or(SelectionError::Exhausted)?;
let arg = self.make_choice_weighted(places.into_iter(), weights, |ppath| {
let place = ppath.to_place(&self.pt);
let place = ppath.to_place(&self.pt, self.current_decls());
let pidx = ppath.target_index();
let ty = self.pt.ty(pidx);

Expand Down Expand Up @@ -802,7 +816,9 @@ impl GenerationCtx {
let return_place = self.make_choice_weighted(
return_places.into_iter(),
weights,
|ppath: crate::pgraph::PlacePath| Result::Ok(ppath.to_place(&self.pt)),
|ppath: crate::pgraph::PlacePath| {
Result::Ok(ppath.to_place(&self.pt, self.current_decls()))
},
)?;

let (callee, args) = self.choose_intrinsic(&return_place)?;
Expand Down
Loading
Loading