nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-10-30 22:12:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #67621 - matthewjasper:correct-static-type, r=oli-obk

Browse Source 
Use the correct type for static qualifs

Closes #67609
This commit is contained in:
Oliver Scherer 2019-12-28 00:36:08 +01:00 committed by GitHub
commit b88ce0ed4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/librustc_mir/transform/check_consts/qualifs.rs
View File

@ -1,6 +1,5 @@
//! A copy of the `Qualif` trait in `qualify_consts.rs` that is suitable for the new validator.
use rustc::hir::def_id::DefId;
use rustc::mir::*;
use rustc::ty::{self, Ty};
use syntax_pos::DUMMY_SP;
@ -33,12 +32,6 @@ pub trait Qualif {
/// of the type.
fn in_any_value_of_ty(_cx: &ConstCx<'_, 'tcx>, _ty: Ty<'tcx>) -> bool;
fn in_static(cx: &ConstCx<'_, 'tcx>, def_id: DefId) -> bool {
// `mir_const_qualif` does return the qualifs in the final value of a `static`, so we could
// use value-based qualification here, but we shouldn't do this without a good reason.
Self::in_any_value_of_ty(cx, cx.tcx.type_of(def_id))
}
fn in_projection_structurally(
cx: &ConstCx<'_, 'tcx>,
per_local: &impl Fn(Local) -> bool,
@ -101,8 +94,14 @@ pub trait Qualif {
}
Operand::Constant(ref constant) => {
if let Some(static_) = constant.check_static_ptr(cx.tcx) {
Self::in_static(cx, static_)
if constant.check_static_ptr(cx.tcx).is_some() {
// `mir_const_qualif` does return the qualifs in the final value of a `static`,
// so we could use value-based qualification here, but we shouldn't do this
// without a good reason.
//
// Note: this uses `constant.literal.ty` which is a reference or pointer to the
// type of the actual `static` item.
Self::in_any_value_of_ty(cx, constant.literal.ty)
} else if let ty::ConstKind::Unevaluated(def_id, _) = constant.literal.val {
// Don't peek inside trait associated constants.
if cx.tcx.trait_of_item(def_id).is_some() {

14
src/test/ui/consts/const-eval/promote-static.rs Normal file
View File

@ -0,0 +1,14 @@
// regression test for #67609.
// check-pass
static NONE: Option<String> = None;
static NONE_REF_REF: &&Option<String> = {
let x = &&NONE;
x
};
fn main() {
println!("{:?}", NONE_REF_REF);
}