Comment in src/tools/miri/src/alloc_addresses/mod.rs

Strophox · RalfJung · web-flow · commit 724b0e4e9883 · 2024-11-29T11:09:05.000+01:00
Co-authored-by: Ralf Jung &lt;post@ralfj.de&gt;
diff --git a/src/tools/miri/src/alloc_addresses/mod.rs b/src/tools/miri/src/alloc_addresses/mod.rs
@@ -300,6 +300,8 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
         }
         trace!("Exposing allocation id {alloc_id:?}");
         global_state.exposed.insert(alloc_id);
+        // Release the global state before we call `expose_tag`, which may call `get_alloc_info_extra`,
+        // which may need access to the global state.
         drop(global_state);
         if this.machine.borrow_tracker.is_some() {
             this.expose_tag(alloc_id, tag)?;

Original file line number	Diff line number	Diff line change
`@@ -300,6 +300,8 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {`
`300`	`300`	`}`
`301`	`301`	`trace!("Exposing allocation id {alloc_id:?}");`
`302`	`302`	`global_state.exposed.insert(alloc_id);`
	`303`	+ // Release the global state before we call `expose_tag`, which may call `get_alloc_info_extra`,
	`304`	`+ // which may need access to the global state.`
`303`	`305`	`drop(global_state);`
`304`	`306`	`if this.machine.borrow_tracker.is_some() {`
`305`	`307`	`this.expose_tag(alloc_id, tag)?;`