Skip to content

Commit

Permalink
Remove delay_span_bug() in check_aliasability
Browse files Browse the repository at this point in the history
This path was considered to be unreachable. However,
`&mut` could potentially live inside `static`.
For example, `static TAB: [&mut [u8]; 0] = [];`.
  • Loading branch information
topecongiro committed Feb 4, 2018
1 parent 0f9c784 commit 3d114c7
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 12 deletions.
12 changes: 1 addition & 11 deletions src/librustc_borrowck/borrowck/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1113,22 +1113,12 @@ impl<'a, 'tcx> BorrowckCtxt<'a, 'tcx> {
};

match cause {
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. `static mut X` is not checked
// for aliasability violations.
span_bug!(span, "aliasability violation for static mut `{}`", prefix)
}
mc::AliasableBorrowed => {}
mc::AliasableStatic | mc::AliasableBorrowed => {}
};
let blame = cmt.immutability_blame();
let mut err = match blame {
Expand Down
17 changes: 17 additions & 0 deletions src/test/compile-fail/issue-42344.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// Copyright 2018 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.

static TAB: [&mut [u8]; 0] = [];

pub unsafe fn test() {
TAB[0].iter_mut(); //~ ERROR cannot borrow data mutably in a `&` reference [E0389]
}

pub fn main() {}
3 changes: 2 additions & 1 deletion src/test/compile-fail/issue-46604.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@ fn write<T: AsRef<[u8]>>(buffer: T) { }

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

0 comments on commit 3d114c7

Please sign in to comment.