bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #40908 - dotdash:pers_lt, r=arielb1

Browse source 
Emit proper lifetime start intrinsics for personality slots

We currently only emit a single call to the lifetime start intrinsic
for the personality slot alloca. This happens because we create that
call at the time that we create the alloca, instead of creating it each
time we start using it. Because LLVM usually removes the alloca before
the lifetime intrinsics are even considered, this didn't cause any
problems yet, but we should fix this anyway.
This commit is contained in:
Corey Farwell 2017-04-05 23:51:39 -04:00 • committed by GitHub
commit a97a9d9d00
2 changed files with 42 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/librustc_trans/mir/block.rs
View file

@ -762,7 +762,6 @@ impl<'a, 'tcx> MirContext<'a, 'tcx> {
let llretty = Type::struct_(ccx, &[Type::i8p(ccx), Type::i32(ccx)], false);
let slot = bcx.alloca(llretty, "personalityslot");
self.llpersonalityslot = Some(slot);
Lifetime::Start.call(bcx, slot);
slot
}
}
@ -794,6 +793,7 @@ impl<'a, 'tcx> MirContext<'a, 'tcx> {
let llretval = bcx.landing_pad(llretty, llpersonality, 1, self.llfn);
bcx.set_cleanup(llretval);
let slot = self.get_personality_slot(&bcx);
Lifetime::Start.call(&bcx, slot);
bcx.store(llretval, slot, None);
bcx.br(target_bb);
bcx.llbb()

41
src/test/codegen/personality_lifetimes.rs Normal file
View file

@ -0,0 +1,41 @@
// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// ignore-msvc
// compile-flags: -O -C no-prepopulate-passes
#![crate_type="lib"]
struct S;
impl Drop for S {
fn drop(&mut self) {
}
}
fn might_unwind() {
}
// CHECK-LABEL: @test
#[no_mangle]
pub fn test() {
let _s = S;
// Check that the personality slot alloca gets a lifetime start in each cleanup block, not just
// in the first one.
// CHECK-LABEL: cleanup:
// CHECK: bitcast{{.*}}personalityslot
// CHECK-NEXT: call void @llvm.lifetime.start
// CHECK-LABEL: cleanup1:
// CHECK: bitcast{{.*}}personalityslot
// CHECK-NEXT: call void @llvm.lifetime.start
might_unwind();
might_unwind();
}