From a1736a4b5d8698c998d81d66336118875d151f2c Mon Sep 17 00:00:00 2001
From: Jan Rochel <jan.rochel@cea.fr>
Date: Fri, 24 Mar 2023 11:17:44 +0100
Subject: [PATCH] [alias] less verbosity
---
src/plugins/alias/Alias.ml | 2 +-
src/plugins/alias/abstract_state.ml | 12 ++++++------
src/plugins/alias/analysis.ml | 4 ++--
.../alias/tests/basic/oracle/assignment1.res.oracle | 3 ---
.../alias/tests/basic/oracle/assignment2.res.oracle | 3 ---
.../alias/tests/basic/oracle/assignment3.res.oracle | 3 ---
.../alias/tests/basic/oracle/assignment4.res.oracle | 3 ---
.../alias/tests/basic/oracle/assignment5.res.oracle | 3 ---
.../alias/tests/basic/oracle/cast1.res.oracle | 3 ---
.../alias/tests/basic/oracle/conditional1.res.oracle | 3 ---
.../alias/tests/basic/oracle/conditional2.res.oracle | 3 ---
.../alias/tests/basic/oracle/function1.res.oracle | 3 ---
.../alias/tests/basic/oracle/function2.res.oracle | 3 ---
.../alias/tests/basic/oracle/function3.res.oracle | 3 ---
.../alias/tests/basic/oracle/function4.res.oracle | 3 ---
.../alias/tests/basic/oracle/function5.res.oracle | 3 ---
.../alias/tests/basic/oracle/if_then1.res.oracle | 3 ---
.../alias/tests/basic/oracle/switch1.res.oracle | 3 ---
.../alias/tests/basic/oracle/switch2.res.oracle | 3 ---
.../alias/tests/basic/oracle/while_for1.res.oracle | 3 ---
.../alias/tests/basic/oracle/while_for2.res.oracle | 3 ---
.../alias/tests/basic/oracle/while_for3.res.oracle | 3 ---
.../alias/tests/offsets/oracle/array1.res.oracle | 3 ---
.../alias/tests/offsets/oracle/array2.res.oracle | 3 ---
.../alias/tests/offsets/oracle/collapse1.res.oracle | 3 ---
.../alias/tests/offsets/oracle/collapse2.res.oracle | 3 ---
.../alias/tests/offsets/oracle/collapse3.res.oracle | 3 ---
.../alias/tests/offsets/oracle/nested1.res.oracle | 3 ---
.../alias/tests/offsets/oracle/nested2.res.oracle | 3 ---
.../alias/tests/offsets/oracle/structure1.res.oracle | 3 ---
.../alias/tests/offsets/oracle/structure2.res.oracle | 3 ---
.../alias/tests/offsets/oracle/structure3.res.oracle | 3 ---
.../alias/tests/offsets/oracle/structure4.res.oracle | 3 ---
.../tests/real_world/oracle/example1.res.oracle | 3 ---
34 files changed, 9 insertions(+), 102 deletions(-)
diff --git a/src/plugins/alias/Alias.ml b/src/plugins/alias/Alias.ml
index 052631fc80f..0d38459c28a 100644
--- a/src/plugins/alias/Alias.ml
+++ b/src/plugins/alias/Alias.ml
@@ -29,7 +29,7 @@ let main () =
if Options.Enabled.get() then
begin
Analysis.compute ();
- Options.feedback "Analysis complete";
+ Options.debug "Analysis complete";
end
let () =
diff --git a/src/plugins/alias/abstract_state.ml b/src/plugins/alias/abstract_state.ml
index 28bb0a783bc..cba0e935397 100644
--- a/src/plugins/alias/abstract_state.ml
+++ b/src/plugins/alias/abstract_state.ml
@@ -325,9 +325,9 @@ let find_all_aliases (lv1: Lval.t) (x: t) : LSet.t =
with
Not_found -> (LSet.empty,o)
in
- Options.debug "decompose_lval %a : [@[<hov 2>" Lval.pp_debug lv1;
- List.iter (fun (x, o) -> Options.debug " (%a,%a) " Lval.pp_debug x Offset.pretty o) list_of_lval_to_be_searched;
- Options.debug "@]]@.";
+ Options.debug ~level:5 "decompose_lval %a : [@[<hov 2>" Lval.pp_debug lv1;
+ List.iter (fun (x, o) -> Options.debug ~level:5 " (%a,%a) " Lval.pp_debug x Offset.pretty o) list_of_lval_to_be_searched;
+ Options.debug ~level:5 "@]]@.";
let list_of_aliases : (LSet.t*offset) list =
List.map f_map list_of_lval_to_be_searched
in
@@ -353,7 +353,7 @@ let create_vertex_simple (lv:Lval.t) (x:t) : V.t * t =
(* find all the alias of lv (because of offset) *)
let set_of_aliases : LSet.t = find_all_aliases lv x in
(* add all these aliases *)
- Options.debug "all_aliases of %a : %a @." Lval.pp_debug lv LSet.pp_debug set_of_aliases;
+ Options.debug ~level:5 "all_aliases of %a : %a @." Lval.pp_debug lv LSet.pp_debug set_of_aliases;
let new_lmap =
LSet.fold
(fun lv acc -> assert (not (LLMap.mem lv x.lmap)); LLMap.add lv new_v acc)
@@ -411,7 +411,7 @@ let diff_offset (lv1:Lval.t) (lv2:Lval.t) =
in the graph. If it is present, there will be bugs *)
let rec create_vertex_lval (blv:Lval.t) (x:t) : V.t * t =
assert (not (LLMap.mem blv x.lmap));
- Options.debug "creating a vertex for %a@." Lval.pp_debug blv;
+ Options.debug ~level:4 "creating a vertex for %a@." Lval.pp_debug blv;
match blv with
BNone -> Options.fatal "this should not happen"
| BLval lv ->
@@ -485,7 +485,7 @@ and find_or_create_vertex (lv:Lval.t) (x:t) : V.t * t =
map_predecessors
VSet.empty
in
- Options.debug "found aliases of %a : %a@." Lval.pp_debug lv VSet.pretty vset_res;
+ Options.debug ~level:5 "found aliases of %a : %a@." Lval.pp_debug lv VSet.pretty vset_res;
if VSet.is_empty vset_res
then create_vertex_lval lv x
else
diff --git a/src/plugins/alias/analysis.ml b/src/plugins/alias/analysis.ml
index ddea391372b..e760bcad1d2 100644
--- a/src/plugins/alias/analysis.ml
+++ b/src/plugins/alias/analysis.ml
@@ -257,9 +257,9 @@ let is_computed () = !computed_flag
let compute () =
Ast.compute();
- Options.feedback "Parsing done";
+ Options.debug "Parsing done";
Globals.Functions.iter doFunction;
- Options.feedback "Functions done";
+ Options.debug "Functions done";
computed_flag := true;
let print_stmt_table_elt fmt k v :unit =
let print_key = Stmt.pretty in
diff --git a/src/plugins/alias/tests/basic/oracle/assignment1.res.oracle b/src/plugins/alias/tests/basic/oracle/assignment1.res.oracle
index a2d498488d7..533a4a28360 100644
--- a/src/plugins/alias/tests/basic/oracle/assignment1.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/assignment1.res.oracle
@@ -1,8 +1,6 @@
[kernel] Parsing assignment1.c (with preprocessing)
-[alias] Parsing done
[alias] May-aliases at the end of function main:
{a, b, c, d} are aliased
-[alias] Functions done
Before statement int *a = (int *)0; :
Before statement int *b = (int *)0; :
@@ -25,4 +23,3 @@ Before statement __retres = 0; :
Before statement return __retres; :
{a, b, c, d} are aliased
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/assignment2.res.oracle b/src/plugins/alias/tests/basic/oracle/assignment2.res.oracle
index 470af4db7c9..543c44ff607 100644
--- a/src/plugins/alias/tests/basic/oracle/assignment2.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/assignment2.res.oracle
@@ -1,9 +1,7 @@
[kernel] Parsing assignment2.c (with preprocessing)
-[alias] Parsing done
[alias] May-aliases at the end of function main:
{a, c} are aliased
{*a, *c, b, d} are aliased
-[alias] Functions done
Before statement int **a = (int **)0; :
Before statement int *b = (int *)0; :
@@ -29,4 +27,3 @@ Before statement return __retres; :
{a, c} are aliased
{*a, *c, b, d} are aliased
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/assignment3.res.oracle b/src/plugins/alias/tests/basic/oracle/assignment3.res.oracle
index f702226fd42..421f8d8a689 100644
--- a/src/plugins/alias/tests/basic/oracle/assignment3.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/assignment3.res.oracle
@@ -1,8 +1,6 @@
[kernel] Parsing assignment3.c (with preprocessing)
-[alias] Parsing done
[alias] May-aliases at the end of function main:
{a, c, &b} are aliased
-[alias] Functions done
Before statement int *a = (int *)0; :
Before statement int b = 0; :
@@ -20,4 +18,3 @@ Before statement __retres = 0; :
Before statement return __retres; :
{a, c, &b} are aliased
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/assignment4.res.oracle b/src/plugins/alias/tests/basic/oracle/assignment4.res.oracle
index fffaee8da83..dfd7442f4ea 100644
--- a/src/plugins/alias/tests/basic/oracle/assignment4.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/assignment4.res.oracle
@@ -1,8 +1,6 @@
[kernel] Parsing assignment4.c (with preprocessing)
-[alias] Parsing done
[alias] May-aliases at the end of function main:
{*a, *c, b, d} are aliased
-[alias] Functions done
Before statement int **a = (int **)0; :
Before statement int *b = (int *)0; :
@@ -26,4 +24,3 @@ Before statement __retres = 0; :
Before statement return __retres; :
{*a, *c, b, d} are aliased
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/assignment5.res.oracle b/src/plugins/alias/tests/basic/oracle/assignment5.res.oracle
index 2601fde8f11..f0db22941a9 100644
--- a/src/plugins/alias/tests/basic/oracle/assignment5.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/assignment5.res.oracle
@@ -1,9 +1,7 @@
[kernel] Parsing assignment5.c (with preprocessing)
-[alias] Parsing done
[alias] May-aliases at the end of function main:
{*a, *a, b} are aliased
{*b, *(*a), c, d} are aliased
-[alias] Functions done
Before statement int ***a = (int ***)0; :
Before statement int **b = (int **)0; :
@@ -29,4 +27,3 @@ Before statement return __retres; :
{*a, *a, b} are aliased
{*b, *(*a), c, d} are aliased
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/cast1.res.oracle b/src/plugins/alias/tests/basic/oracle/cast1.res.oracle
index 7f20dad76ea..9a17da89ca8 100644
--- a/src/plugins/alias/tests/basic/oracle/cast1.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/cast1.res.oracle
@@ -1,9 +1,7 @@
[kernel] Parsing cast1.c (with preprocessing)
-[alias] Parsing done
[alias] May-aliases at the end of function main:
{a, c} are aliased
{b, d} are aliased
-[alias] Functions done
Before statement int *a = (int *)0; :
Before statement int *b = (int *)0; :
@@ -25,4 +23,3 @@ Before statement return __retres; :
{a, c} are aliased
{b, d} are aliased
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/conditional1.res.oracle b/src/plugins/alias/tests/basic/oracle/conditional1.res.oracle
index b121f3c8bc6..bcc4b83a354 100644
--- a/src/plugins/alias/tests/basic/oracle/conditional1.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/conditional1.res.oracle
@@ -1,8 +1,6 @@
[kernel] Parsing conditional1.c (with preprocessing)
-[alias] Parsing done
[alias] May-aliases at the end of function main:
{a, b, c} are aliased
-[alias] Functions done
Before statement int *a = (int *)0; :
Before statement int *b = (int *)0; :
@@ -24,4 +22,3 @@ Before statement __retres = 0; :
Before statement return __retres; :
{a, b, c} are aliased
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/conditional2.res.oracle b/src/plugins/alias/tests/basic/oracle/conditional2.res.oracle
index 14f533b75da..1e6ad30b528 100644
--- a/src/plugins/alias/tests/basic/oracle/conditional2.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/conditional2.res.oracle
@@ -1,10 +1,8 @@
[kernel] Parsing conditional2.c (with preprocessing)
-[alias] Parsing done
[alias] May-aliases at the end of function main:
{d, &e} are aliased
{a, b, &c} are aliased
{c, &d} are aliased
-[alias] Functions done
Before statement b = & c; :
Before statement c = & d; :
@@ -39,4 +37,3 @@ Before statement return __retres; :
{a, b, &c} are aliased
{c, &d} are aliased
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/function1.res.oracle b/src/plugins/alias/tests/basic/oracle/function1.res.oracle
index b966a827705..18e2d97de5d 100644
--- a/src/plugins/alias/tests/basic/oracle/function1.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/function1.res.oracle
@@ -1,9 +1,7 @@
[kernel] Parsing function1.c (with preprocessing)
-[alias] Parsing done
[alias] May-aliases at the end of function main:
{a, b} are aliased
{c, d} are aliased
-[alias] Functions done
Before statement int *z = (int *)0; :
Before statement return __retres; :
@@ -40,4 +38,3 @@ Before statement __retres = 0; :
Before statement return; :
{x, y, z} are aliased
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/function2.res.oracle b/src/plugins/alias/tests/basic/oracle/function2.res.oracle
index 9d067849518..9f7ebeed03b 100644
--- a/src/plugins/alias/tests/basic/oracle/function2.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/function2.res.oracle
@@ -1,7 +1,5 @@
[kernel] Parsing function2.c (with preprocessing)
-[alias] Parsing done
[alias] May-aliases at the end of function main:
-[alias] Functions done
Before statement int *res = (int *)0; :
Before statement int *res = (int *)0; :
@@ -22,4 +20,3 @@ Before statement __retres = 0; :
Before statement return __retres; :
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/function3.res.oracle b/src/plugins/alias/tests/basic/oracle/function3.res.oracle
index f5dc137623b..45664b0859c 100644
--- a/src/plugins/alias/tests/basic/oracle/function3.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/function3.res.oracle
@@ -1,9 +1,7 @@
[kernel] Parsing function3.c (with preprocessing)
-[alias] Parsing done
[alias] May-aliases at the end of function main:
{a, b} are aliased
{c, d} are aliased
-[alias] Functions done
Before statement return __retres; :
{x, y, tmp} are aliased
@@ -54,4 +52,3 @@ Before statement __retres = 0; :
{a, b} are aliased
{c, d} are aliased
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/function4.res.oracle b/src/plugins/alias/tests/basic/oracle/function4.res.oracle
index 438d840cc15..ea46094333a 100644
--- a/src/plugins/alias/tests/basic/oracle/function4.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/function4.res.oracle
@@ -1,8 +1,6 @@
[kernel] Parsing function4.c (with preprocessing)
-[alias] Parsing done
[alias] May-aliases at the end of function main:
{a, b, &c} are aliased
-[alias] Functions done
Before statement return x; :
Before statement int *a = (int *)0; :
@@ -22,4 +20,3 @@ Before statement __retres = 0; :
Before statement return __retres; :
{a, b, &c} are aliased
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/function5.res.oracle b/src/plugins/alias/tests/basic/oracle/function5.res.oracle
index c9b2c736806..d2eb8570932 100644
--- a/src/plugins/alias/tests/basic/oracle/function5.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/function5.res.oracle
@@ -1,8 +1,6 @@
[kernel] Parsing function5.c (with preprocessing)
-[alias] Parsing done
[alias] May-aliases at the end of function main:
{a, b, c} are aliased
-[alias] Functions done
Before statement goto return_label; :
{x, __retres} are aliased
@@ -47,4 +45,3 @@ Before statement __retres = 0; :
Before statement __retres = x;
goto return_label; :
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/if_then1.res.oracle b/src/plugins/alias/tests/basic/oracle/if_then1.res.oracle
index e62a38d3a86..9409d446e82 100644
--- a/src/plugins/alias/tests/basic/oracle/if_then1.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/if_then1.res.oracle
@@ -1,10 +1,8 @@
[kernel] Parsing if_then1.c (with preprocessing)
-[alias] Parsing done
[alias] May-aliases at the end of function main:
{x, z} are aliased
{b, c, &y} are aliased
{a, y, &x, &z} are aliased
-[alias] Functions done
Before statement a = & x; :
Before statement b = & y; :
@@ -37,4 +35,3 @@ Before statement return __retres; :
{b, c, &y} are aliased
{a, y, &x, &z} are aliased
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/switch1.res.oracle b/src/plugins/alias/tests/basic/oracle/switch1.res.oracle
index 4f9262a665a..e028f12d8d3 100644
--- a/src/plugins/alias/tests/basic/oracle/switch1.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/switch1.res.oracle
@@ -1,8 +1,6 @@
[kernel] Parsing switch1.c (with preprocessing)
-[alias] Parsing done
[alias] May-aliases at the end of function main:
{a, b, d} are aliased
-[alias] Functions done
Before statement int *a = (int *)0; :
Before statement int *b = (int *)0; :
@@ -36,4 +34,3 @@ Before statement __retres = 0; :
Before statement return __retres; :
{a, b, d} are aliased
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/switch2.res.oracle b/src/plugins/alias/tests/basic/oracle/switch2.res.oracle
index 0ce3e6954a1..6fcd78115e6 100644
--- a/src/plugins/alias/tests/basic/oracle/switch2.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/switch2.res.oracle
@@ -1,8 +1,6 @@
[kernel] Parsing switch2.c (with preprocessing)
-[alias] Parsing done
[alias] May-aliases at the end of function main:
{a, b, c, d} are aliased
-[alias] Functions done
Before statement int *a = (int *)0; :
Before statement int *b = (int *)0; :
@@ -39,4 +37,3 @@ Before statement __retres = 0; :
Before statement return __retres; :
{a, b, c, d} are aliased
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/while_for1.res.oracle b/src/plugins/alias/tests/basic/oracle/while_for1.res.oracle
index 15cfb49f55a..cc8081857b0 100644
--- a/src/plugins/alias/tests/basic/oracle/while_for1.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/while_for1.res.oracle
@@ -1,7 +1,5 @@
[kernel] Parsing while_for1.c (with preprocessing)
-[alias] Parsing done
[alias] May-aliases at the end of function main:
-[alias] Functions done
Before statement int *s = (int *)0; :
Before statement {
@@ -33,4 +31,3 @@ Before statement __retres = 0; :
Before statement return __retres; :
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/while_for2.res.oracle b/src/plugins/alias/tests/basic/oracle/while_for2.res.oracle
index 4a539c05ec9..597bc30773b 100644
--- a/src/plugins/alias/tests/basic/oracle/while_for2.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/while_for2.res.oracle
@@ -1,8 +1,6 @@
[kernel] Parsing while_for2.c (with preprocessing)
-[alias] Parsing done
[alias] May-aliases at the end of function main:
{a, b} are aliased
-[alias] Functions done
Before statement return __retres; :
{a, b} are aliased
@@ -43,4 +41,3 @@ Before statement break; :
Before statement __retres = 0; :
{a, b} are aliased
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/while_for3.res.oracle b/src/plugins/alias/tests/basic/oracle/while_for3.res.oracle
index e2132b316f1..6cd62dca862 100644
--- a/src/plugins/alias/tests/basic/oracle/while_for3.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/while_for3.res.oracle
@@ -1,8 +1,6 @@
[kernel] Parsing while_for3.c (with preprocessing)
-[alias] Parsing done
[alias] May-aliases at the end of function main:
{a, b} are aliased
-[alias] Functions done
Before statement __retres = 0; :
{a, b} are aliased
@@ -59,4 +57,3 @@ Before statement goto __Cont; :
Before statement __Cont: i ++; :
{a, b} are aliased
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/offsets/oracle/array1.res.oracle b/src/plugins/alias/tests/offsets/oracle/array1.res.oracle
index c88b8e636db..a53c74c0848 100644
--- a/src/plugins/alias/tests/offsets/oracle/array1.res.oracle
+++ b/src/plugins/alias/tests/offsets/oracle/array1.res.oracle
@@ -1,8 +1,6 @@
[kernel] Parsing array1.c (with preprocessing)
-[alias] Parsing done
[alias] May-aliases at the end of function main:
{x, y, &tab[0]} are aliased
-[alias] Functions done
Before statement tab[0] = 0; :
Before statement tab[1] = 1; :
@@ -23,4 +21,3 @@ Before statement __retres = 0; :
Before statement return __retres; :
{x, y, &tab[0]} are aliased
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/offsets/oracle/array2.res.oracle b/src/plugins/alias/tests/offsets/oracle/array2.res.oracle
index c1f8c3abacb..8ad1a4522ed 100644
--- a/src/plugins/alias/tests/offsets/oracle/array2.res.oracle
+++ b/src/plugins/alias/tests/offsets/oracle/array2.res.oracle
@@ -1,8 +1,6 @@
[kernel] Parsing array2.c (with preprocessing)
-[alias] Parsing done
[alias] May-aliases at the end of function main:
{*x, &mat[0]} are aliased
-[alias] Functions done
Before statement mat[0][0] = 0; :
Before statement mat[0][1] = 1; :
@@ -18,4 +16,3 @@ Before statement __retres = 0; :
Before statement return __retres; :
{*x, &mat[0]} are aliased
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/offsets/oracle/collapse1.res.oracle b/src/plugins/alias/tests/offsets/oracle/collapse1.res.oracle
index 7a2421da4db..5d116c4ee27 100644
--- a/src/plugins/alias/tests/offsets/oracle/collapse1.res.oracle
+++ b/src/plugins/alias/tests/offsets/oracle/collapse1.res.oracle
@@ -1,7 +1,5 @@
[kernel] Parsing collapse1.c (with preprocessing)
-[alias] Parsing done
[alias] May-aliases at the end of function main:
-[alias] Functions done
Before statement tab[0] = 0; :
Before statement tab[1] = 1; :
@@ -37,4 +35,3 @@ Before statement __retres = 0; :
Before statement return __retres; :
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/offsets/oracle/collapse2.res.oracle b/src/plugins/alias/tests/offsets/oracle/collapse2.res.oracle
index f83ede7d7ff..ca058b7df28 100644
--- a/src/plugins/alias/tests/offsets/oracle/collapse2.res.oracle
+++ b/src/plugins/alias/tests/offsets/oracle/collapse2.res.oracle
@@ -1,7 +1,5 @@
[kernel] Parsing collapse2.c (with preprocessing)
-[alias] Parsing done
[alias] May-aliases at the end of function main:
-[alias] Functions done
Before statement mat[0][0] = 0; :
Before statement mat[0][1] = 1; :
@@ -18,4 +16,3 @@ Before statement __retres = 0; :
Before statement return __retres; :
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/offsets/oracle/collapse3.res.oracle b/src/plugins/alias/tests/offsets/oracle/collapse3.res.oracle
index 5b2cacca08b..e81f32e44cf 100644
--- a/src/plugins/alias/tests/offsets/oracle/collapse3.res.oracle
+++ b/src/plugins/alias/tests/offsets/oracle/collapse3.res.oracle
@@ -1,7 +1,5 @@
[kernel] Parsing collapse3.c (with preprocessing)
-[alias] Parsing done
[alias] May-aliases at the end of function main:
-[alias] Functions done
Before statement mat[0][0] = 0; :
Before statement mat[0][1] = 1; :
@@ -18,4 +16,3 @@ Before statement __retres = 0; :
Before statement return __retres; :
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/offsets/oracle/nested1.res.oracle b/src/plugins/alias/tests/offsets/oracle/nested1.res.oracle
index b330ac17432..017747ec5d8 100644
--- a/src/plugins/alias/tests/offsets/oracle/nested1.res.oracle
+++ b/src/plugins/alias/tests/offsets/oracle/nested1.res.oracle
@@ -1,5 +1,4 @@
[kernel] Parsing nested1.c (with preprocessing)
-[alias] Parsing done
[alias] Skipping st_2_t *z1 = malloc(sizeof(st_2_t)); (doInstr not implemented)
[alias] Skipping st_2_t *z2 = malloc(sizeof(st_2_t)); (doInstr not implemented)
[alias] Skipping st_3_t *t = malloc(sizeof(st_3_t)); (doInstr not implemented)
@@ -11,7 +10,6 @@
{z2->c, b} are aliased
{t->t, z1} are aliased
{z1->c, t->d, a} are aliased
-[alias] Functions done
Before statement t->t = (struct struct_2_t *)z1; :
{x1, x2} are aliased
{z1->s, z2->s, tab_y[0], &x1, &x2} are aliased
@@ -93,4 +91,3 @@ Before statement z2->c = b; :
{z1->s, z2->s, tab_y[0], &x1, &x2} are aliased
{z1->c, a} are aliased
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/offsets/oracle/nested2.res.oracle b/src/plugins/alias/tests/offsets/oracle/nested2.res.oracle
index f888665076e..66cc7842c1c 100644
--- a/src/plugins/alias/tests/offsets/oracle/nested2.res.oracle
+++ b/src/plugins/alias/tests/offsets/oracle/nested2.res.oracle
@@ -1,5 +1,4 @@
[kernel] Parsing nested2.c (with preprocessing)
-[alias] Parsing done
[alias] Skipping st_2_t *z1 = malloc(sizeof(st_2_t)); (doInstr not implemented)
[alias] Skipping st_3_t *t = malloc(sizeof(st_3_t)); (doInstr not implemented)
[alias] Skipping int *a = malloc(sizeof(int)); (doInstr not implemented)
@@ -8,7 +7,6 @@
{z1->s[0], &x2} are aliased
{t->t, z1} are aliased
{z1->c, t->d, a} are aliased
-[alias] Functions done
Before statement st_1_t x1 = {.a = 0, .b = 1}; :
Before statement st_1_t x2 = {.a = 2, .b = 3}; :
@@ -53,4 +51,3 @@ Before statement return __retres; :
{t->t, z1} are aliased
{z1->c, t->d, a} are aliased
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/offsets/oracle/structure1.res.oracle b/src/plugins/alias/tests/offsets/oracle/structure1.res.oracle
index ca319a8beee..96f68bb686c 100644
--- a/src/plugins/alias/tests/offsets/oracle/structure1.res.oracle
+++ b/src/plugins/alias/tests/offsets/oracle/structure1.res.oracle
@@ -1,9 +1,7 @@
[kernel] Parsing structure1.c (with preprocessing)
-[alias] Parsing done
[alias] May-aliases at the end of function main:
{p_x, p_y, &x, &y} are aliased
{x, y} are aliased
-[alias] Functions done
Before statement st_1_t x = {.a = 0, .b = 1}; :
Before statement st_2_t y = {.a = 3, .c = 4}; :
@@ -29,4 +27,3 @@ Before statement return __retres; :
{p_x, p_y, &x, &y} are aliased
{x, y} are aliased
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/offsets/oracle/structure2.res.oracle b/src/plugins/alias/tests/offsets/oracle/structure2.res.oracle
index ccaebfa88b7..65466195ddf 100644
--- a/src/plugins/alias/tests/offsets/oracle/structure2.res.oracle
+++ b/src/plugins/alias/tests/offsets/oracle/structure2.res.oracle
@@ -1,9 +1,7 @@
[kernel] Parsing structure2.c (with preprocessing)
-[alias] Parsing done
[alias] May-aliases at the end of function main:
{y, &x1} are aliased
{y.s, &x1.s, &x2} are aliased
-[alias] Functions done
Before statement st_1_t x1 = {.a = 0, .b = 1}; :
Before statement st_1_t x2 = {.a = 1, .b = 2}; :
@@ -21,4 +19,3 @@ Before statement return __retres; :
{y, &x1} are aliased
{y.s, &x1.s, &x2} are aliased
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/offsets/oracle/structure3.res.oracle b/src/plugins/alias/tests/offsets/oracle/structure3.res.oracle
index b43ca1fc940..5be7e1782b3 100644
--- a/src/plugins/alias/tests/offsets/oracle/structure3.res.oracle
+++ b/src/plugins/alias/tests/offsets/oracle/structure3.res.oracle
@@ -1,5 +1,4 @@
[kernel] Parsing structure3.c (with preprocessing)
-[alias] Parsing done
[alias] May-aliases at the end of function main:
{y1, &x1} are aliased
{y2, &x2} are aliased
@@ -7,7 +6,6 @@
{z.t, &y1.t, &y2} are aliased
{y1.c, &x1.c} are aliased
{z.d, &y1.d} are aliased
-[alias] Functions done
Before statement st_1_t x1 = {.a = 0, .b = 1}; :
Before statement st_1_t x2 = {.a = 1, .b = 2}; :
@@ -48,4 +46,3 @@ Before statement return __retres; :
{y1.c, &x1.c} are aliased
{z.d, &y1.d} are aliased
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/offsets/oracle/structure4.res.oracle b/src/plugins/alias/tests/offsets/oracle/structure4.res.oracle
index 07ffb81fe8c..fc5f7adb87d 100644
--- a/src/plugins/alias/tests/offsets/oracle/structure4.res.oracle
+++ b/src/plugins/alias/tests/offsets/oracle/structure4.res.oracle
@@ -1,10 +1,8 @@
[kernel] Parsing structure4.c (with preprocessing)
-[alias] Parsing done
[alias] Skipping st_1_t *y1 = malloc(sizeof(st_1_t)); (doInstr not implemented)
[alias] Skipping st_2_t *z = malloc(sizeof(st_2_t)); (doInstr not implemented)
[alias] May-aliases at the end of function main:
{z->s, y1, &x1} are aliased
-[alias] Functions done
Before statement st_1_t x1 = {.a = 0, .b = 1}; :
Before statement st_1_t x2 = {.a = 1, .b = 2}; :
@@ -27,4 +25,3 @@ Before statement __retres = 0; :
Before statement return __retres; :
{z->s, y1, &x1} are aliased
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/real_world/oracle/example1.res.oracle b/src/plugins/alias/tests/real_world/oracle/example1.res.oracle
index 5ef36f75ea9..bacef4e293a 100644
--- a/src/plugins/alias/tests/real_world/oracle/example1.res.oracle
+++ b/src/plugins/alias/tests/real_world/oracle/example1.res.oracle
@@ -1,12 +1,10 @@
[kernel] Parsing example1.c (with preprocessing)
-[alias] Parsing done
[alias] Warning: a function with no return is employed in an assignment
[alias] Warning: a function with no return is employed in an assignment
[alias] Warning: a function with no return is employed in an assignment
[alias] Warning: Analysis is continuing but will not be sound
[alias] Warning: Analysis is continuing but will not be sound
[alias] May-aliases at the end of function main:
-[alias] Functions done
Before statement b->t1[i] = a->t1[i]; :
Before statement idx = 0; :
@@ -226,4 +224,3 @@ Before statement b->t1[i] = a->t1[i];
Before statement odata = tmp->t2[*(tmp->n2)]; :
{x, tmp} are aliased
-[alias] Analysis complete
--
GitLab