fix(debugger): Update the debugger to handle the new Brillig debug metadata format

acvm-repo/acvm/src/pwg/brillig.rs

@@ -32,7 +32,7 @@ pub struct BrilligSolver<'b, F, B: BlackBoxFunctionSolver<F>> {
     /// This id references which Brillig function within the main ACIR program we are solving.
     /// This is used for appropriately resolving errors as the ACIR program artifacts
     /// set up their Brillig debug metadata by function id.
-    function_id: BrilligFunctionId,
+    pub function_id: BrilligFunctionId,
 }
 
 impl<'b, B: BlackBoxFunctionSolver<F>, F: AcirField> BrilligSolver<'b, F, B> {

compiler/noirc_driver/src/debug.rs

@@ -18,7 +18,7 @@ pub(crate) fn filter_relevant_files(
     debug_symbols: &[DebugInfo],
     file_manager: &FileManager,
 ) -> BTreeMap<FileId, DebugFile> {
-    let files_with_debug_symbols: BTreeSet<FileId> = debug_symbols
+    let mut files_with_debug_symbols: BTreeSet<FileId> = debug_symbols
         .iter()
         .flat_map(|function_symbols| {
             function_symbols
@@ -28,6 +28,21 @@ pub(crate) fn filter_relevant_files(
         })
         .collect();
 
+    let files_with_brillig_debug_symbols: BTreeSet<FileId> = debug_symbols
+        .iter()
+        .flat_map(|function_symbols| {
+            let brillig_location_maps =
+                function_symbols.brillig_locations.values().flat_map(|brillig_location_map| {
+                    brillig_location_map
+                        .values()
+                        .flat_map(|call_stack| call_stack.iter().map(|location| location.file))
+                });
+            brillig_location_maps
+        })
+        .collect();
+
+    files_with_debug_symbols.extend(files_with_brillig_debug_symbols);
+
     let mut file_map = BTreeMap::new();
 
     for file_id in files_with_debug_symbols {