Move the untracked cstore and source_span into a struct

compiler/rustc_resolve/src/effective_visibilities.rs

@@ -107,7 +107,10 @@ impl<'r, 'a> EffectiveVisibilitiesVisitor<'r, 'a> {
                 r.effective_visibilities.update_eff_vis(
                     r.local_def_id(node_id),
                     eff_vis,
-                    ResolverTree(&r.definitions, &r.cstore),
+                    ResolverTree(
+                        &r.definitions,
+                        &r.untracked.cstore.as_any().downcast_ref().unwrap(),
+                    ),
                 )
             }
         }