Circuit diagrams: Group loops

source/compiler/qsc/src/interpret.rs

@@ -848,7 +848,7 @@ impl Interpreter {
         self.circuit_tracer
             .as_ref()
             .expect("to call get_circuit, the interpreter should be initialized with circuit tracing enabled")
-            .snapshot(self.compiler.package_store())
+            .snapshot(&(self.compiler.package_store(), &self.fir_store))
     }
 
     /// Performs QIR codegen using the given entry expression on a new instance of the environment
@@ -1022,7 +1022,7 @@ impl Interpreter {
                 }
             }
         }
-        let circuit = tracer.finish(self.compiler.package_store());
+        let circuit = tracer.finish(&(self.compiler.package_store(), &self.fir_store));
         Ok(circuit)
     }
 

source/compiler/qsc/src/interpret/debug.rs

@@ -49,7 +49,7 @@ pub(crate) fn format_call_stack(
         write!(trace, "{}", call.name.name).expect("writing to string should succeed");
 
         let name = get_item_file_name(store, frame.id);
-        let pos = get_position(frame, store);
+        let pos = get_position(&frame, store);
         write!(
             trace,
             " in {}:{}:{}",
@@ -99,7 +99,7 @@ fn get_ns_name(item: &Item) -> Option<Rc<str>> {
 }
 
 /// Converts the [`Span`] of [`Frame`] into a [`Position`].
-fn get_position(frame: Frame, store: &PackageStore) -> Position {
+fn get_position(frame: &Frame, store: &PackageStore) -> Position {
     let filename = get_item_file_name(store, frame.id).expect("file should exist");
     let package_id = map_fir_package_to_hir(frame.id.package);
     let unit = store.get(package_id).expect("package should exist");