Skip to content

Commit

Permalink
Auto merge of #52673 - oli-obk:mutable_promoted, r=nagisa,cramertj,es…
Browse files Browse the repository at this point in the history
…tebank

Try to fix an ICE

might fix #52671
  • Loading branch information
bors committed Jul 26, 2018
2 parents 45b48b9 + 01d4cd5 commit 419e60e
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 2 deletions.
8 changes: 6 additions & 2 deletions src/librustc_mir/borrow_check/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1864,8 +1864,12 @@ impl<'cx, 'gcx, 'tcx> MirBorrowckCtxt<'cx, 'gcx, 'tcx> {
}),
}
}
// promoteds may never be mutated
Place::Promoted(_) => bug!("encountered mutable promoted"),
// The rules for promotion are made by `qualify_consts`, there wouldn't even be a
// `Place::Promoted` if the promotion weren't 100% legal. So we just forward this
Place::Promoted(_) => Ok(RootPlace {
place,
is_local_mutation_allowed,
}),
Place::Static(ref static_) => {
if self.tcx.is_static(static_.def_id) != Some(hir::Mutability::MutMutable) {
Err(place)
Expand Down
17 changes: 17 additions & 0 deletions src/test/ui/const-eval/promote_mutable_zst_mir_borrowck.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.

// compile-pass

#![feature(nll)]

pub fn main() {
let y: &'static mut [u8; 0] = &mut [];
}

0 comments on commit 419e60e

Please sign in to comment.