Skip to content

Emit lifetime end markers in unwinding codepaths #15975

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

Merged
merged 1 commit into from
Jul 26, 2014
Merged

Emit lifetime end markers in unwinding codepaths #15975

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 21 additions & 8 deletions src/librustc/middle/trans/cleanup.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ pub struct CachedEarlyExit {
}

pub trait Cleanup {
fn must_unwind(&self) -> bool;
fn clean_on_unwind(&self) -> bool;
fn trans<'a>(&self, bcx: &'a Block<'a>) -> &'a Block<'a>;
}
Expand Down Expand Up @@ -252,7 +253,7 @@ impl<'a> CleanupMethods<'a> for FunctionContext<'a> {
if !ty::type_needs_drop(self.ccx.tcx(), ty) { return; }
let drop = box DropValue {
is_immediate: false,
on_unwind: ty::type_needs_unwind_cleanup(self.ccx.tcx(), ty),
must_unwind: ty::type_needs_unwind_cleanup(self.ccx.tcx(), ty),
val: val,
ty: ty,
zero: false
Expand All @@ -278,7 +279,7 @@ impl<'a> CleanupMethods<'a> for FunctionContext<'a> {
if !ty::type_needs_drop(self.ccx.tcx(), ty) { return; }
let drop = box DropValue {
is_immediate: false,
on_unwind: ty::type_needs_unwind_cleanup(self.ccx.tcx(), ty),
must_unwind: ty::type_needs_unwind_cleanup(self.ccx.tcx(), ty),
val: val,
ty: ty,
zero: true
Expand All @@ -304,7 +305,7 @@ impl<'a> CleanupMethods<'a> for FunctionContext<'a> {
if !ty::type_needs_drop(self.ccx.tcx(), ty) { return; }
let drop = box DropValue {
is_immediate: true,
on_unwind: ty::type_needs_unwind_cleanup(self.ccx.tcx(), ty),
must_unwind: ty::type_needs_unwind_cleanup(self.ccx.tcx(), ty),
val: val,
ty: ty,
zero: false
Expand Down Expand Up @@ -793,10 +794,10 @@ impl<'a> CleanupScope<'a> {
}

fn needs_invoke(&self) -> bool {
/*! True if this scope has cleanups for use during unwinding */
/*! True if this scope has cleanups that need unwinding */

self.cached_landing_pad.is_some() ||
self.cleanups.iter().any(|c| c.clean_on_unwind())
self.cleanups.iter().any(|c| c.must_unwind())
}

fn block_name(&self, prefix: &str) -> String {
Expand Down Expand Up @@ -864,15 +865,19 @@ impl EarlyExitLabel {

pub struct DropValue {
is_immediate: bool,
on_unwind: bool,
must_unwind: bool,
val: ValueRef,
ty: ty::t,
zero: bool
}

impl Cleanup for DropValue {
fn must_unwind(&self) -> bool {
self.must_unwind
}

fn clean_on_unwind(&self) -> bool {
self.on_unwind
self.must_unwind
}

fn trans<'a>(&self, bcx: &'a Block<'a>) -> &'a Block<'a> {
Expand Down Expand Up @@ -900,6 +905,10 @@ pub struct FreeValue {
}

impl Cleanup for FreeValue {
fn must_unwind(&self) -> bool {
true
}

fn clean_on_unwind(&self) -> bool {
true
}
Expand All @@ -921,10 +930,14 @@ pub struct LifetimeEnd {
}

impl Cleanup for LifetimeEnd {
fn clean_on_unwind(&self) -> bool {
fn must_unwind(&self) -> bool {
false
}

fn clean_on_unwind(&self) -> bool {
true
}

fn trans<'a>(&self, bcx: &'a Block<'a>) -> &'a Block<'a> {
base::call_lifetime_end(bcx, self.ptr);
bcx
Expand Down