Auto merge of #84549 - tmiasko:static-initializer, r=varkor

Reachable statics have reachable initializers

Static initializer can read other statics. Initializers are evaluated at
compile time, and so their content could become inlined into another
crate. Ensure that initializers of reachable statics are also reachable.

Previously, when an item incorrectly considered to be unreachable was
reached from another crate an attempt would be made to codegen it. The
attempt could fail with an ICE (in the case MIR wasn't available to do
so) in some circumstances the attempt could also succeed resulting in
a local codegen of non-local items, including static ones.

Fixes #84455.
This commit is contained in:
bors 2021-05-16 15:11:48 +00:00
commit f8e1e92380
4 changed files with 26 additions and 6 deletions

View File

@ -250,7 +250,7 @@ fn propagate_node(&mut self, node: &Node<'tcx>, search_item: LocalDefId) {
// Reachable constants will be inlined into other crates
// unconditionally, so we need to make sure that their
// contents are also reachable.
hir::ItemKind::Const(_, init) => {
hir::ItemKind::Const(_, init) | hir::ItemKind::Static(_, _, init) => {
self.visit_nested_body(init);
}
@ -261,7 +261,6 @@ fn propagate_node(&mut self, node: &Node<'tcx>, search_item: LocalDefId) {
| hir::ItemKind::Use(..)
| hir::ItemKind::OpaqueTy(..)
| hir::ItemKind::TyAlias(..)
| hir::ItemKind::Static(..)
| hir::ItemKind::Mod(..)
| hir::ItemKind::ForeignMod { .. }
| hir::ItemKind::Impl { .. }

View File

@ -58,7 +58,6 @@ mod private {
pub static mut L: u8 = 0;
};
// The surrounding item should not accidentally become external
fn x() {
// CHECK: @M = local_unnamed_addr constant
#[no_mangle]
@ -76,6 +75,3 @@ fn x() {
#[no_mangle]
pub static mut P: u8 = 0;
}
// CHECK-LABEL: ; external_no_mangle_statics::x
// CHECK-NEXT: ; Function Attrs:
// CHECK-NEXT: define internal

View File

@ -0,0 +1,10 @@
pub static V: &u32 = &X;
pub static F: fn() = f;
static X: u32 = 42;
pub fn v() -> *const u32 {
V
}
fn f() {}

View File

@ -0,0 +1,15 @@
// run-pass
// aux-build:static_init_aux.rs
extern crate static_init_aux as aux;
static V: &u32 = aux::V;
static F: fn() = aux::F;
fn v() -> *const u32 {
V
}
fn main() {
assert_eq!(aux::v(), crate::v());
F();
}