9d672671e2
This eliminates an ICE in trans where the scope for a particular borrow was a statement ID, but the code in trans that does cleanups wasn't finding the block with that scope. As per #3860 preserve looks at a node ID to see if it's for a statement -- if it is, it uses the enclosing scope instead when updating the map that trans looks at later. I added a comment noting that this is not the best fix (since it may cause boxes to be frozen for longer than necessary) and referring to #3511. r=nmatsakis
24 lines
720 B
Rust
24 lines
720 B
Rust
// Copyright 2012 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.
|
|
|
|
struct Foo { x: int }
|
|
|
|
impl Foo {
|
|
fn stuff(&mut self) -> &self/mut Foo {
|
|
return self;
|
|
}
|
|
}
|
|
|
|
fn main() {
|
|
let mut x = @mut Foo { x: 3 };
|
|
// Neither of the next two lines should cause an error
|
|
let _ = x.stuff();
|
|
x.stuff();
|
|
} |