Skip to content

Fix leaks from panics in destructors #125923

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

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix leaks from panics in destructors #125923

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a4e6b77
Extend handling of moved_locals in mir building to some unwind paths
matthewjasper May 31, 2024
1bcdc2e
Use record_operands_moved more in mir building
matthewjasper May 31, 2024
f547dc8
Avoid leaking values when panicking in certain cases
matthewjasper May 31, 2024
8b4edef
Fix performance issue with `record_operands_moved`
matthewjasper Jun 5, 2024
3e0db6a
Work around opaque types hiding needs_drop
matthewjasper Jun 24, 2024
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
4 changes: 4 additions & 0 deletions compiler/rustc_mir_build/src/build/scope.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ use rustc_index::{IndexSlice, IndexVec};
use rustc_middle::middle::region;
use rustc_middle::mir::*;
use rustc_middle::thir::{ExprId, LintLevel};
use rustc_middle::ty::TypeVisitableExt;
use rustc_middle::{bug, span_bug};
use rustc_session::lint::Level;
use rustc_span::{Span, DUMMY_SP};
Expand Down Expand Up @@ -1141,6 +1142,9 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
{
return;
}
// Opaque type may not have been scheduled if its underlying
// type does not need drop.
None if self.local_decls[local].ty.has_opaque_types() => return,

This comment was marked as outdated.

Sign in to view

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so the affected code is

fn if_no_else(c: bool) -> impl Sized {
    if c {}
}

where the opaque type gets unified with () and () does not need drop while impl Sized does? 🤔 we probably never emit drop for the return value of an if without an else block or sth?

_ => bug!(
"found wrong drop, expected value drop of {:?}, found {:?}",
local,
Expand Down
22 changes: 22 additions & 0 deletions tests/ui/impl-trait/rpit/non-drop-type.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
//@ check-pass

fn if_else(c: bool) -> impl Sized {
if c { () } else { () }
}

fn if_no_else(c: bool) -> impl Sized {
if c {}
}

fn matches(c: bool) -> impl Sized {
match c {
true => (),
_ => (),
}
}

fn tuple_tuple(c: bool) -> (impl Sized,) {
if c { ((),) } else { ((),) }
}

fn main() {}