Bug fix: Include intermediates from receives in machine parts

Author: georgwiese

executor/src/witgen/machines/machine_extractor.rs

@@ -19,6 +19,7 @@ use crate::witgen::machines::dynamic_machine::DynamicMachine;
 use crate::witgen::machines::second_stage_machine::SecondStageMachine;
 use crate::witgen::machines::Connection;
 use crate::witgen::machines::{write_once_memory::WriteOnceMemory, MachineParts};
+use powdr_ast::analyzed::AlgebraicExpression;
 
 use powdr_ast::analyzed::{
     self, AlgebraicExpression as Expression, PolyID, PolynomialReference, Reference,
@@ -138,11 +139,6 @@ impl<'a, T: FieldElement> MachineExtractor<'a, T> {
 
             publics.add_all(machine_identities.as_slice()).unwrap();
 
-            let machine_intermediates = intermediates_in_identities(
-                &machine_identities,
-                &self.fixed.intermediate_definitions,
-            );
-
             // Connections that call into the current machine
             let machine_connections = all_connections
                 .iter()
@@ -157,6 +153,14 @@ impl<'a, T: FieldElement> MachineExtractor<'a, T> {
                 .collect::<BTreeMap<_, _>>();
             assert!(machine_connections.contains_key(&connection.id));
 
+            let machine_intermediates = intermediates_in_expressions(
+                machine_identities
+                    .iter()
+                    .flat_map(|i| i.all_children())
+                    .chain(machine_receives.values().flat_map(|r| r.all_children())),
+                &self.fixed.intermediate_definitions,
+            );
+
             let prover_functions = prover_functions
                 .iter()
                 .copied()
@@ -240,8 +244,10 @@ impl<'a, T: FieldElement> MachineExtractor<'a, T> {
             .difference(&multiplicity_columns)
             .cloned()
             .collect::<HashSet<_>>();
-        let main_intermediates =
-            intermediates_in_identities(&base_identities, &self.fixed.intermediate_definitions);
+        let main_intermediates = intermediates_in_expressions(
+            base_identities.iter().flat_map(|i| i.all_children()),
+            &self.fixed.intermediate_definitions,
+        );
 
         log::trace!(
             "\nThe base machine contains the following witnesses:\n{}\n identities:\n{}\n and prover functions:\n{}",
@@ -498,13 +504,11 @@ fn try_as_intermediate_ref<T: FieldElement>(expr: &Expression<T>) -> Option<(Pol
 
 /// Returns all intermediate columns referenced in the identities as a map to their name.
 /// Follows intermediate references recursively.
-fn intermediates_in_identities<T: FieldElement>(
-    identities: &[&Identity<T>],
+fn intermediates_in_expressions<'a, T: FieldElement>(
+    expressions: impl Iterator<Item = &'a AlgebraicExpression<T>>,
     intermediate_definitions: &BTreeMap<AlgebraicReferenceThin, Expression<T>>,
 ) -> HashMap<PolyID, String> {
-    let mut queue = identities
-        .iter()
-        .flat_map(|id| id.all_children())
+    let mut queue = expressions
         .filter_map(try_as_intermediate_ref)
         .collect::<BTreeSet<_>>();
     let mut intermediates = HashMap::new();