Handle context for const patterns correctly
This commit is contained in:
parent
26f48b4cba
commit
7832ebbd4f
@ -144,11 +144,17 @@ impl<'tcx> UnsafetyVisitor<'_, 'tcx> {
|
|||||||
let hir_context = self.tcx.local_def_id_to_hir_id(def);
|
let hir_context = self.tcx.local_def_id_to_hir_id(def);
|
||||||
let safety_context = mem::replace(&mut self.safety_context, SafetyContext::Safe);
|
let safety_context = mem::replace(&mut self.safety_context, SafetyContext::Safe);
|
||||||
let mut inner_visitor = UnsafetyVisitor {
|
let mut inner_visitor = UnsafetyVisitor {
|
||||||
|
tcx: self.tcx,
|
||||||
thir: inner_thir,
|
thir: inner_thir,
|
||||||
hir_context,
|
hir_context,
|
||||||
safety_context,
|
safety_context,
|
||||||
|
body_target_features: self.body_target_features,
|
||||||
|
assignment_info: self.assignment_info,
|
||||||
|
in_union_destructure: false,
|
||||||
|
param_env: self.param_env,
|
||||||
|
inside_adt: false,
|
||||||
warnings: self.warnings,
|
warnings: self.warnings,
|
||||||
..*self
|
suggest_unsafe_block: self.suggest_unsafe_block,
|
||||||
};
|
};
|
||||||
inner_visitor.visit_expr(&inner_thir[expr]);
|
inner_visitor.visit_expr(&inner_thir[expr]);
|
||||||
// Unsafe blocks can be used in the inner body, make sure to take it into account
|
// Unsafe blocks can be used in the inner body, make sure to take it into account
|
||||||
|
24
tests/ui/unsafe/const_pat_in_layout_restricted.rs
Normal file
24
tests/ui/unsafe/const_pat_in_layout_restricted.rs
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
// Check that ref mut patterns within a const pattern don't get considered
|
||||||
|
// unsafe because they're within a pattern for a layout constrained stuct.
|
||||||
|
// check-pass
|
||||||
|
|
||||||
|
#![allow(incomplete_features)]
|
||||||
|
#![feature(rustc_attrs)]
|
||||||
|
#![feature(inline_const_pat)]
|
||||||
|
|
||||||
|
#[rustc_layout_scalar_valid_range_start(3)]
|
||||||
|
struct Gt2(i32);
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
match unsafe { Gt2(5) } {
|
||||||
|
Gt2(
|
||||||
|
const {
|
||||||
|
|| match () {
|
||||||
|
ref mut y => (),
|
||||||
|
};
|
||||||
|
4
|
||||||
|
},
|
||||||
|
) => (),
|
||||||
|
_ => (),
|
||||||
|
}
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user