rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Update to still be correct without drop tracking

Browse Source
This commit is contained in:
Eric Holk
2022-06-10 11:44:53 -07:00
parent 89d35060b9
commit c42c77bc7b
3 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/rustc_typeck/src/check/generator_interior.rs
View File

@@ -457,7 +457,7 @@ impl<'a, 'tcx> Visitor<'tcx> for InteriorVisitor<'a, 'tcx> {
} }
#[derive(Default)] #[derive(Default)]
pub struct SuspendCheckData<'a, 'tcx> { struct SuspendCheckData<'a, 'tcx> {
expr: Option<&'tcx Expr<'tcx>>, expr: Option<&'tcx Expr<'tcx>>,
source_span: Span, source_span: Span,
yield_span: Span, yield_span: Span,
@@ -472,7 +472,7 @@ pub struct SuspendCheckData<'a, 'tcx> {
// //
// Note that this technique was chosen over things like a `Suspend` marker trait // Note that this technique was chosen over things like a `Suspend` marker trait
// as it is simpler and has precedent in the compiler // as it is simpler and has precedent in the compiler
pub fn check_must_not_suspend_ty<'tcx>( fn check_must_not_suspend_ty<'tcx>(
fcx: &FnCtxt<'_, 'tcx>, fcx: &FnCtxt<'_, 'tcx>,
ty: Ty<'tcx>, ty: Ty<'tcx>,
hir_id: HirId, hir_id: HirId,
@@ -582,7 +582,9 @@ pub fn check_must_not_suspend_ty<'tcx>(
}, },
) )
} }
ty::Ref(_region, ty, _mutability) => { // If drop tracking is enabled, we want to look through references, since the referrent
// may not be considered live across the await point.
ty::Ref(_region, ty, _mutability) if fcx.sess().opts.debugging_opts.drop_tracking => {
let descr_pre = &format!("{}reference{} to ", data.descr_pre, plural_suffix); let descr_pre = &format!("{}reference{} to ", data.descr_pre, plural_suffix);
check_must_not_suspend_ty(fcx, ty, hir_id, SuspendCheckData { descr_pre, ..data }) check_must_not_suspend_ty(fcx, ty, hir_id, SuspendCheckData { descr_pre, ..data })
} }

27
src/test/ui/lint/must_not_suspend/ref-drop-tracking.stderr Normal file
View File

@@ -0,0 +1,27 @@
error: reference to `Umm` held across a suspend point, but should not be
--> $DIR/ref-drop-tracking.rs:19:13
|
LL | let guard = &mut self.u;
| ^^^^^
LL |
LL | other().await;
| ------ the value is held across this suspend point
|
note: the lint level is defined here
--> $DIR/ref-drop-tracking.rs:4:9
|
LL | #![deny(must_not_suspend)]
| ^^^^^^^^^^^^^^^^
note: You gotta use Umm's, ya know?
--> $DIR/ref-drop-tracking.rs:19:13
|
LL | let guard = &mut self.u;
| ^^^^^
help: consider using a block (`{ ... }`) to shrink the value's scope, ending before the suspend point
--> $DIR/ref-drop-tracking.rs:19:13
|
LL | let guard = &mut self.u;
| ^^^^^
error: aborting due to previous error

12
src/test/ui/lint/must_not_suspend/ref.stderr
View File

@@ -1,5 +1,5 @@
error: reference to `Umm` held across a suspend point, but should not be error: `Umm` held across a suspend point, but should not be
--> $DIR/ref.rs:18:13 --> $DIR/ref.rs:18:26
| |
LL | let guard = &mut self.u; LL | let guard = &mut self.u;
| ^^^^^^ | ^^^^^^
@@ -13,15 +13,15 @@ note: the lint level is defined here
LL | #![deny(must_not_suspend)] LL | #![deny(must_not_suspend)]
| ^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^
note: You gotta use Umm's, ya know? note: You gotta use Umm's, ya know?
--> $DIR/ref.rs:18:13 --> $DIR/ref.rs:18:26
| |
LL | let guard = &mut self.u; LL | let guard = &mut self.u;
| ^^^^^ | ^^^^^^
help: consider using a block (`{ ... }`) to shrink the value's scope, ending before the suspend point help: consider using a block (`{ ... }`) to shrink the value's scope, ending before the suspend point
--> $DIR/ref.rs:18:13 --> $DIR/ref.rs:18:26
| |
LL | let guard = &mut self.u; LL | let guard = &mut self.u;
| ^^^^^ | ^^^^^^
error: aborting due to previous error error: aborting due to previous error