use asm-cleanup

Author: shepmaster

orchestrator/Cargo.lock

@@ -5,6 +5,7 @@ edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
+asm-cleanup = { path = "../ui/asm-cleanup" }
 bincode = { version = "1.3", default-features = false }
 futures = { version = "0.3.28", default-features = false, features = ["executor"] }
 modify-cargo-toml = { path = "../compiler/base/modify-cargo-toml", default-features = false }

orchestrator/Cargo.toml

@@ -132,6 +132,9 @@ impl Container {
                     String::new()
                 };
 
+                // TODO: This is synchronous...
+                let code = request.postprocess_result(code);
+
                 Ok(CompileResponse { success, code })
             }
         });

orchestrator/src/coordinator.rs

@@ -141,6 +141,20 @@ impl CompileRequest {
             cwd: None,
         }
     }
+
+    pub(crate) fn postprocess_result(&self, mut code: String) -> String {
+        if let CompileTarget::Assembly(_, demangle, process) = self.target {
+            if demangle == DemangleAssembly::Demangle {
+                code = asm_cleanup::demangle_asm(&code);
+            }
+
+            if process == ProcessAssembly::Filter {
+                code = asm_cleanup::filter_asm(&code);
+            }
+        }
+
+        code
+    }
 }
 
 #[derive(Debug, Clone)]