feat: merge-train/avm (#22842)

AztecBot · web-flow · commit f71a2e487853 · 2026-04-29T14:43:41.000Z
See [merge-train-readme.md](https://github.com/AztecProtocol/aztec-packages/blob/next/.github/workflows/merge-train-readme.md). This is a merge-train.
diff --git a/barretenberg/cpp/src/barretenberg/vm2/tracegen/trace_container.cpp b/barretenberg/cpp/src/barretenberg/vm2/tracegen/trace_container.cpp
@@ -132,7 +132,7 @@ void TraceContainer::clear_column(Column col)
     auto& column_data = (*trace)[static_cast<size_t>(col)];
     std::unique_lock lock(column_data.mutex);
     column_data.rows.clear();
-    column_data.max_row_number = 0;
+    column_data.max_row_number = -1;
     column_data.row_number_dirty = false;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ void TraceContainer::clear_column(Column col)`
`132`	`132`	`auto& column_data = (*trace)[static_cast<size_t>(col)];`
`133`	`133`	`std::unique_lock lock(column_data.mutex);`
`134`	`134`	`column_data.rows.clear();`
`135`		`- column_data.max_row_number = 0;`
	`135`	`+ column_data.max_row_number = -1;`
`136`	`136`	`column_data.row_number_dirty = false;`
`137`	`137`	`}`
`138`	`138`