Merge "Don't write output during tests"
diff --git a/cc/sanitize.go b/cc/sanitize.go
index 18d6c16..7d7bd09 100644
--- a/cc/sanitize.go
+++ b/cc/sanitize.go
@@ -186,6 +186,12 @@
 		s.Diag.Cfi = nil
 	}
 
+	// Also disable CFI if ASAN is enabled.
+	if Bool(s.Address) {
+		s.Cfi = nil
+		s.Diag.Cfi = nil
+	}
+
 	if ctx.staticBinary() {
 		s.Address = nil
 		s.Coverage = nil