nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-10 02:56:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

dataflow_const_prop: do not eval a ptr address in SwitchInt

Browse Source
This commit is contained in:
DianQK 2024-12-09 20:25:41 +08:00
parent 1b3fb31675
commit d0986f45e0
No known key found for this signature in database
3 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compiler/rustc_mir_transform/src/dataflow_const_prop.rs
View File

@ -534,8 +534,13 @@ impl<'a, 'tcx> ConstAnalysis<'a, 'tcx> {
// This allows the set of visited edges to grow monotonically with the lattice.
FlatSet::Bottom => TerminatorEdges::None,
FlatSet::Elem(scalar) => {
let choice = scalar.assert_scalar_int().to_bits_unchecked();
TerminatorEdges::Single(targets.target_for_value(choice))
if let Ok(scalar_int) = scalar.try_to_scalar_int() {
TerminatorEdges::Single(
targets.target_for_value(scalar_int.to_bits_unchecked()),
)
} else {
TerminatorEdges::SwitchInt { discr, targets }
}
}
FlatSet::Top => TerminatorEdges::SwitchInt { discr, targets },
}

16
tests/crashes/131227.rs
View File

@ -1,16 +0,0 @@
//@ known-bug: #131227
//@ compile-flags: -Zmir-opt-level=3
static mut G: () = ();
fn myfunc() -> i32 {
let var = &raw mut G;
if var.is_null() {
return 0;
}
0
}
fn main() {
myfunc();
}

19
tests/ui/dataflow_const_prop/ptr-in-switch-int-issue-131227.rs Normal file
View File

@ -0,0 +1,19 @@
//! Issue: <https://github.com/rust-lang/rust/issues/131227>
//! Test that constant propagation in SwitchInt does not crash
//! when encountering a ptr-to-int transmute.
//@ check-pass
//@ compile-flags: -Zmir-enable-passes=+InstSimplify-before-inline,+DataflowConstProp
#![crate_type = "lib"]
static mut G: i32 = 0;
pub fn myfunc() -> i32 {
let var = &raw mut G;
let u: usize = unsafe { std::mem::transmute(var) };
match u {
0 => 0,
_ => 1,
}
}