Add MemoryExtra to find_foreign_static

Author: pvdrz

src/librustc_mir/const_eval.rs

@@ -410,6 +410,7 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for CompileTimeInterpreter<'mir,
     }
 
     fn find_foreign_static(
+        _memory_extra: &Self::MemoryExtra,
         _tcx: TyCtxt<'tcx>,
         _def_id: DefId,
     ) -> InterpResult<'tcx, Cow<'tcx, Allocation<Self::PointerTag>>> {

src/librustc_mir/interpret/machine.rs

@@ -164,6 +164,7 @@ pub trait Machine<'mir, 'tcx>: Sized {
     ///
     /// This allocation will then be fed to `tag_allocation` to initialize the "extra" state.
     fn find_foreign_static(
+        memory_extra: &Self::MemoryExtra,
         tcx: TyCtxt<'tcx>,
         def_id: DefId,
     ) -> InterpResult<'tcx, Cow<'tcx, Allocation>>;

src/librustc_mir/interpret/memory.rs

@@ -437,7 +437,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> Memory<'mir, 'tcx, M> {
                 // We got a "lazy" static that has not been computed yet.
                 if tcx.is_foreign_item(def_id) {
                     trace!("static_alloc: foreign item {:?}", def_id);
-                    M::find_foreign_static(tcx.tcx, def_id)?
+                    M::find_foreign_static(memory_extra, tcx.tcx, def_id)?
                 } else {
                     trace!("static_alloc: Need to compute {:?}", def_id);
                     let instance = Instance::mono(tcx.tcx, def_id);