Skip to content

Delay panic for aliasing violation for static items. #47105

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.

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
Jan 2, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 13 additions & 8 deletions src/librustc_borrowck/borrowck/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1098,15 +1098,20 @@ impl<'a, 'tcx> BorrowckCtxt<'a, 'tcx> {
};

match cause {
mc::AliasableStatic |
mc::AliasableStatic => {
// This happens when we have an `&mut` or assignment to a
// static. We should have already reported a mutability
// violation first, but may have continued compiling.
self.tcx.sess.delay_span_bug(
span,
&format!("aliasability violation for static `{}`", prefix)
);
return;
}
mc::AliasableStaticMut => {
// This path cannot occur. It happens when we have an
// `&mut` or assignment to a static. But in the case
// of `static X`, we get a mutability violation first,
// and never get here. In the case of `static mut X`,
// that is unsafe and hence the aliasability error is
// ignored.
span_bug!(span, "aliasability violation for static `{}`", prefix)
// This path cannot occur. `static mut X` is not checked
// for aliasability violations.
span_bug!(span, "aliasability violation for static mut `{}`", prefix)
}
mc::AliasableBorrowed => {}
};
Expand Down
21 changes: 21 additions & 0 deletions src/test/compile-fail/issue-46604.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// 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.

// revisions: ast mir
//[mir]compile-flags: -Z borrowck=mir

static buf: &mut [u8] = &mut [1u8,2,3,4,5,7]; //[ast]~ ERROR E0017
//[mir]~^ ERROR E0017
fn write<T: AsRef<[u8]>>(buffer: T) { }

fn main() {
write(&buf);
buf[0]=2; //[mir]~ ERROR E0594
}