Reproduce issue

Author: oli-obk

compiler/rustc_hir_analysis/src/lib.rs

@@ -201,6 +201,15 @@ pub fn check_crate(tcx: TyCtxt<'_>) {
         }
     });
 
+    // Make sure we actually have a value for static items, as they aren't cached in incremental.
+    // While we could just wait for codegen to invoke this, the definitions freeze below will cause
+    // that to ICE, because evaluating statics can create more items.
+    tcx.hir().par_body_owners(|item_def_id| {
+        if let DefKind::Static { .. } = tcx.def_kind(item_def_id) {
+            let _ = tcx.eval_static_initializer(item_def_id);
+        }
+    });
+
     // Freeze definitions as we don't add new ones at this point. This improves performance by
     // allowing lock-free access to them.
     tcx.untracked().definitions.freeze();

compiler/rustc_middle/src/query/mod.rs

@@ -1065,7 +1065,6 @@ rustc_queries! {
             "evaluating initializer of static `{}`",
             tcx.def_path_str(key)
         }
-        cache_on_disk_if { key.is_local() }
         separate_provide_extern
         feedable
     }

tests/incremental/static_cycle/feed_nested.rs

@@ -0,0 +1,28 @@
+//@ revisions:rpass1 rpass2
+
+//! Test that the following order of instructions will not create duplicate
+//! `DefId`s for the nested static items.
+// ensure(eval_static_initializer(FOO))
+// -> try_mark_green(eval_static_initializer(FOO))
+// -> green
+// -> replay side effects
+// -> create some definitions.
+//
+// get(eval_static_initializer(FOO))
+// -> graph in place
+// -> replay
+// -> eval_static_initializer.compute
+// -> how do we skip re-creating the same definitions ?
+
+#![feature(const_mut_refs)]
+#![cfg_attr(rpass2, warn(dead_code))]
+
+pub static mut FOO: &mut i32 = &mut 42;
+
+pub static mut BAR: &mut i32 = unsafe { FOO };
+
+fn main() {
+    unsafe {
+        assert_eq!(BAR as *mut i32, FOO as *mut i32);
+    }
+}