Use square brackets to match on func. name

model-checking · Apr 22, 2024 · e010665 · e010665
1 parent 12216ec
commit e010665
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/kani-compiler/src/codegen_cprover_gotoc/codegen/statement.rs b/kani-compiler/src/codegen_cprover_gotoc/codegen/statement.rs
@@ -115,7 +115,7 @@ impl<'tcx> GotocCtx<'tcx> {
 
                 let fun = self.current_fn().readable_name();
                 let instance = self.current_fn().instance_stable();
-                let cov_info = format!("{cov:?} ({fun})");
+                let cov_info = format!("{cov:?} [{fun}]");
                 // NOTE: This helps see the coverage info we're processing
                 // println!("COVERAGE: {:?} {:?} {:?}", cov, fun, stmt.span);
                 let cov_span = coverage_opaque_span(self.tcx, cov.clone(), instance);

diff --git a/kani-driver/src/call_cbmc.rs b/kani-driver/src/call_cbmc.rs
@@ -419,7 +419,7 @@ fn coverage_results_from_properties(properties: &[Property]) -> Option<CoverageR
         static RE: OnceLock<Regex> = OnceLock::new();
         RE.get_or_init(|| {
             Regex::new(
-                r#"^CounterIncrement\((?<counter_num>[0-9]+)\) \((?<func_name>[^)]+)\) - (?<span>.+)"#,
+                r#"^CounterIncrement\((?<counter_num>[0-9]+)\) \[(?<func_name>[^\]]+)\] - (?<span>.+)"#,
             )
             .unwrap()
         })
@@ -429,7 +429,7 @@ fn coverage_results_from_properties(properties: &[Property]) -> Option<CoverageR
         static RE: OnceLock<Regex> = OnceLock::new();
         RE.get_or_init(|| {
             Regex::new(
-                r#"^ExpressionUsed\((?<expr_num>[0-9]+)\) \((?<func_name>[^)]+)\) - (?<span>.+)"#,
+                r#"^ExpressionUsed\((?<expr_num>[0-9]+)\) \[(?<func_name>[^\]]+)\] - (?<span>.+)"#,
             )
             .unwrap()
         })