diff options
| -rw-r--r-- | compiler/rustc_typeck/src/check/upvar.rs | 5 | ||||
| -rw-r--r-- | src/test/ui/closures/2229_closure_analysis/run_pass/issue-88372.rs | 19 |
2 files changed, 24 insertions, 0 deletions
diff --git a/compiler/rustc_typeck/src/check/upvar.rs b/compiler/rustc_typeck/src/check/upvar.rs index ae6bebcf727..bb8d2ecdcf0 100644 --- a/compiler/rustc_typeck/src/check/upvar.rs +++ b/compiler/rustc_typeck/src/check/upvar.rs @@ -400,6 +400,11 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> { }; capture_info.capture_kind = capture_kind; + let capture_info = if let Some(existing) = processed.get(&place) { + determine_capture_info(*existing, capture_info) + } else { + capture_info + }; processed.insert(place, capture_info); } diff --git a/src/test/ui/closures/2229_closure_analysis/run_pass/issue-88372.rs b/src/test/ui/closures/2229_closure_analysis/run_pass/issue-88372.rs new file mode 100644 index 00000000000..25fbb6cb906 --- /dev/null +++ b/src/test/ui/closures/2229_closure_analysis/run_pass/issue-88372.rs @@ -0,0 +1,19 @@ +// edition:2021 +// run-pass + + +fn solve<F>(validate: F) -> Option<u64> +where + F: Fn(&mut [i8; 1]), +{ + let mut position: [i8; 1] = [1]; + Some(0).map(|_| { + validate(&mut position); + let [_x] = position; + 0 + }) +} + +fn main() { + solve(|_| ()); +} |