From 033480b568eb57e30300bb4191860a7e1a8225d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Loi=CC=88c=20Correnson?= <loic.correnson@cea.fr>
Date: Mon, 11 Jul 2022 13:12:18 +0200
Subject: [PATCH] [wp] update tests oracles with new printing
---
src/plugins/wp/Stats.ml | 3 +-
src/plugins/wp/VCS.ml | 4 +-
src/plugins/wp/VCS.mli | 1 +
src/plugins/wp/register.ml | 81 ++------
.../wp/oracle_qualif/bad_cast_call.res.oracle | 2 +-
.../wp/oracle_qualif/cfg_loop.res.oracle | 30 +--
.../default-stmt-assigns.res.oracle | 2 +-
.../oracle_qualif/exit_post_scope.res.oracle | 4 +-
.../tests/wp/oracle_qualif/sharing.res.oracle | 2 +-
.../stmtcompiler_test.res.oracle | 54 ++---
.../stmtcompiler_test_rela.res.oracle | 2 +-
.../wp/oracle_qualif/wp_behav.0.res.oracle | 38 ++--
.../wp/oracle_qualif/wp_behav.1.res.oracle | 10 +-
.../wp/oracle_qualif/wp_call_pre.res.oracle | 18 +-
.../tests/wp/oracle_qualif/wp_eqb.res.oracle | 2 +-
.../wp/oracle_qualif/wp_strategy.res.oracle | 8 +-
.../wp_acsl/oracle_qualif/arith.0.res.oracle | 48 ++---
.../wp_acsl/oracle_qualif/arith.1.res.oracle | 2 +-
.../oracle_qualif/assign_array.res.oracle | 8 +-
.../assigned_initialized_memtyped.res.oracle | 84 ++++----
.../assigned_initialized_memvar.res.oracle | 52 ++---
...signed_not_initialized_memtyped.res.oracle | 18 +-
...assigned_not_initialized_memvar.res.oracle | 6 +-
.../oracle_qualif/assigns_path.res.oracle | 18 +-
.../oracle_qualif/assigns_range.0.res.oracle | 34 ++--
.../oracle_qualif/assigns_range.1.res.oracle | 12 +-
.../oracle_qualif/assumes_labels.res.oracle | 6 +-
.../wp_acsl/oracle_qualif/axioms.res.oracle | 20 +-
.../oracle_qualif/base_offset.res.oracle | 10 +-
.../wp_acsl/oracle_qualif/bitwise.res.oracle | 112 +++++------
.../wp_acsl/oracle_qualif/bitwise2.res.oracle | 10 +-
.../oracle_qualif/bitwise_idemp.res.oracle | 12 +-
.../oracle_qualif/block_length.res.oracle | 40 ++--
.../wp_acsl/oracle_qualif/boolean.res.oracle | 8 +-
.../wp_acsl/oracle_qualif/checks.res.oracle | 8 +-
.../oracle_qualif/chunk_typing.res.oracle | 78 ++++----
.../chunk_typing_usable.res.oracle | 6 +-
.../oracle_qualif/classify_float.0.res.oracle | 6 +-
.../oracle_qualif/classify_float.1.res.oracle | 6 +-
.../wp_acsl/oracle_qualif/clusters.res.oracle | 30 +--
.../wp_acsl/oracle_qualif/cnf.res.oracle | 86 ++++----
.../wp_acsl/oracle_qualif/ctor.res.oracle | 4 +-
.../oracle_qualif/decreases.0.res.oracle | 54 ++---
.../oracle_qualif/decreases.1.res.oracle | 54 ++---
.../oracle_qualif/div_mod.0.res.oracle | 44 ++---
.../oracle_qualif/div_mod.1.res.oracle | 44 ++---
.../oracle_qualif/div_mod.2.res.oracle | 4 +-
.../wp_acsl/oracle_qualif/e_imply.res.oracle | 84 ++++----
.../wp_acsl/oracle_qualif/equal.res.oracle | 12 +-
.../oracle_qualif/float_compare.0.res.oracle | 38 ++--
.../oracle_qualif/float_compare.1.res.oracle | 38 ++--
.../oracle_qualif/float_const.res.oracle | 16 +-
.../oracle_qualif/funvar_inv.res.oracle | 6 +-
.../garbled_opaque_struct.res.oracle | 2 +-
.../generalized_checks.res.oracle | 42 ++--
.../global_const_dependencies.res.oracle | 2 +-
.../oracle_qualif/gnu_zero_array.res.oracle | 2 +-
.../implicit_enum_cast.res.oracle | 18 +-
.../oracle_qualif/init_label.res.oracle | 8 +-
.../oracle_qualif/init_value.0.res.oracle | 48 ++---
.../oracle_qualif/init_value.1.res.oracle | 36 ++--
.../oracle_qualif/init_value_mem.res.oracle | 4 +-
.../initialized_local_init.res.oracle | 18 +-
.../initialized_memtyped.res.oracle | 58 +++---
.../initialized_memvar.res.oracle | 168 +++++++---------
.../initialized_shift_array.res.oracle | 22 +--
.../wp_acsl/oracle_qualif/intbool.res.oracle | 2 +-
.../oracle_qualif/invalid_pointer.res.oracle | 40 ++--
.../oracle_qualif/issue_A228.res.oracle | 2 +-
.../oracle_qualif/label_escape.0.res.oracle | 2 +-
.../oracle_qualif/label_escape.1.res.oracle | 2 +-
.../oracle_qualif/lemma_dependency.res.oracle | 2 +-
.../wp_acsl/oracle_qualif/logic.res.oracle | 42 ++--
.../oracle_qualif/looplabels.res.oracle | 16 +-
.../memvar_chunk_typing.res.oracle | 2 +-
.../wp_acsl/oracle_qualif/null.res.oracle | 18 +-
.../oracle_qualif/old-assigns.res.oracle | 4 +-
.../oracle_qualif/opaque_struct.res.oracle | 30 +--
.../oracle_qualif/pointer.0.res.oracle | 18 +-
.../oracle_qualif/pointer.1.res.oracle | 18 +-
.../oracle_qualif/post_result.res.oracle | 4 +-
.../oracle_qualif/postassigns.res.oracle | 54 ++---
.../oracle_qualif/postassigns2.res.oracle | 6 +-
.../oracle_qualif/precedence.0.res.oracle | 104 +++++-----
.../oracle_qualif/precedence.1.res.oracle | 74 +++----
.../wp_acsl/oracle_qualif/range.res.oracle | 8 +-
.../wp_acsl/oracle_qualif/reads.0.res.oracle | 14 +-
.../wp_acsl/oracle_qualif/reads.1.res.oracle | 6 +-
.../wp_acsl/oracle_qualif/record.0.res.oracle | 22 +--
.../wp_acsl/oracle_qualif/record.1.res.oracle | 2 +-
.../oracle_qualif/simpl_is_type.res.oracle | 36 ++--
.../wp_acsl/oracle_qualif/sizeof.res.oracle | 4 +-
.../oracle_qualif/sqrt_builtins.0.res.oracle | 4 +-
.../oracle_qualif/sqrt_builtins.1.res.oracle | 4 +-
.../struct_use_case.0.res.oracle | 4 +-
.../struct_use_case.1.res.oracle | 4 +-
.../terminates_call_options.0.res.oracle | 10 +-
.../terminates_call_options.1.res.oracle | 10 +-
.../terminates_formulae.res.oracle | 36 ++--
.../oracle_qualif/terminates_fp.res.oracle | 58 +++---
.../terminates_variant_option.0.res.oracle | 40 ++--
.../terminates_variant_option.1.res.oracle | 40 ++--
.../wp_acsl/oracle_qualif/tset.res.oracle | 8 +-
.../oracle_qualif/type_guard.0.res.oracle | 2 +-
.../oracle_qualif/type_guard.1.res.oracle | 2 +-
.../oracle_qualif/unit_bit_test.res.oracle | 8 +-
.../oracle_qualif/unit_bool.res.oracle | 30 +--
.../user_def_type_guard.0.res.oracle | 2 +-
.../user_def_type_guard.1.res.oracle | 2 +-
.../wp_bts/oracle_qualif/bts0708.res.oracle | 4 +-
.../wp_bts/oracle_qualif/bts0843.res.oracle | 8 +-
.../wp_bts/oracle_qualif/bts779.res.oracle | 4 +-
.../wp_bts/oracle_qualif/bts788.res.oracle | 6 +-
.../wp_bts/oracle_qualif/bts986.res.oracle | 2 +-
.../wp_bts/oracle_qualif/bts_1174.res.oracle | 2 +-
.../wp_bts/oracle_qualif/bts_1176.res.oracle | 2 +-
.../wp_bts/oracle_qualif/bts_1360.res.oracle | 20 +-
.../wp_bts/oracle_qualif/bts_1462.res.oracle | 26 +--
.../wp_bts/oracle_qualif/bts_1586.res.oracle | 8 +-
.../wp_bts/oracle_qualif/bts_1588.res.oracle | 6 +-
.../wp_bts/oracle_qualif/bts_1601.res.oracle | 16 +-
.../oracle_qualif/bts_1828.0.res.oracle | 12 +-
.../oracle_qualif/bts_1828.1.res.oracle | 12 +-
.../wp_bts/oracle_qualif/bts_2040.res.oracle | 2 +-
.../wp_bts/oracle_qualif/bts_2079.res.oracle | 4 +-
.../wp_bts/oracle_qualif/bts_2159.res.oracle | 2 +-
.../wp_bts/oracle_qualif/bts_2471.res.oracle | 2 +-
.../oracle_qualif/ergo_typecheck.res.oracle | 16 +-
.../wp_bts/oracle_qualif/issue-364.res.oracle | 4 +-
.../oracle_qualif/issue-684-exit.res.oracle | 8 +-
.../wp_bts/oracle_qualif/issue_198.res.oracle | 2 +-
.../wp_bts/oracle_qualif/issue_259.res.oracle | 14 +-
.../wp_bts/oracle_qualif/issue_447.res.oracle | 2 +-
.../wp_bts/oracle_qualif/issue_494.res.oracle | 6 +-
.../wp_bts/oracle_qualif/issue_508.res.oracle | 6 +-
.../wp_bts/oracle_qualif/issue_711.res.oracle | 2 +-
.../oracle_qualif/issue_715_a.res.oracle | 2 +-
.../oracle_qualif/issue_715_b.res.oracle | 4 +-
.../wp_bts/oracle_qualif/issue_751.res.oracle | 80 ++++----
.../wp_bts/oracle_qualif/issue_801.res.oracle | 12 +-
.../wp_bts/oracle_qualif/issue_81.res.oracle | 2 +-
.../wp_bts/oracle_qualif/issue_825.res.oracle | 16 +-
.../wp_bts/oracle_qualif/issue_837.res.oracle | 18 +-
.../wp_bts/oracle_qualif/issue_898.res.oracle | 4 +-
.../oracle_qualif/issue_pub_49.res.oracle | 66 +++----
.../oracle_qualif/nupw-bcl-bts1120.res.oracle | 12 +-
...multiplication-without-overflow.res.oracle | 32 +--
.../binary-multiplication.res.oracle | 34 ++--
.../oracle_qualif/bsearch.res.oracle | 56 +++---
.../oracle_qualif/euclid.res.oracle | 32 +--
.../wp_gallery/oracle_qualif/find.res.oracle | 88 ++++-----
.../frama_c_exo1_solved.res.oracle | 30 +--
.../frama_c_exo2_solved.res.oracle | 46 ++---
.../frama_c_exo3_solved.old.res.oracle | 100 +++++-----
.../frama_c_exo3_solved.old.v2.res.oracle | 102 +++++-----
.../frama_c_exo3_solved.simplified.res.oracle | 70 +++----
.../oracle_qualif/string-compare.res.oracle | 120 ++++++------
.../alias_assigns_hypotheses.res.oracle | 60 +++---
.../wp_hoare/oracle_qualif/byref.0.res.oracle | 24 +--
.../wp_hoare/oracle_qualif/byref.1.res.oracle | 24 +--
.../oracle_qualif/dispatch_var.res.oracle | 156 +++++++--------
.../oracle_qualif/dispatch_var2.0.res.oracle | 68 +++----
.../oracle_qualif/dispatch_var2.1.res.oracle | 68 +++----
.../wp_hoare/oracle_qualif/isHoare.res.oracle | 2 +-
.../oracle_qualif/logicarr.res.oracle | 6 +-
.../oracle_qualif/logicref.res.oracle | 10 +-
.../oracle_qualif/logicref_simple.res.oracle | 18 +-
.../memory_hypotheses_checking.res.oracle | 100 +++++-----
.../oracle_qualif/reference.res.oracle | 46 ++---
.../reference_and_struct.res.oracle | 64 +++---
.../oracle_qualif/reference_array.res.oracle | 72 +++----
.../reference_array_simple.res.oracle | 6 +-
.../oracle_qualif/refguards.res.oracle | 18 +-
.../oracle_qualif/manual.0.res.oracle | 4 +-
.../oracle_qualif/manual.1.res.oracle | 16 +-
.../wp_plugin/oracle_qualif/abs.res.oracle | 2 +-
.../wp_plugin/oracle_qualif/asm.res.oracle | 4 +-
.../oracle_qualif/bit_test.res.oracle | 6 +-
.../oracle_qualif/bitmask0x8000.res.oracle | 4 +-
.../wp_plugin/oracle_qualif/bool.res.oracle | 14 +-
.../wp_plugin/oracle_qualif/cfg.res.oracle | 10 +-
.../oracle_qualif/combined.res.oracle | 28 +--
.../oracle_qualif/convert.res.oracle | 4 +-
.../wp_plugin/oracle_qualif/copy.res.oracle | 22 +--
.../wp_plugin/oracle_qualif/doomed.res.oracle | 16 +-
.../oracle_qualif/doomed_axioms.res.oracle | 23 +--
.../oracle_qualif/doomed_call.0.res.oracle | 20 +-
.../oracle_qualif/doomed_call.1.res.oracle | 71 ++++---
.../oracle_qualif/doomed_call.2.res.oracle | 77 ++++----
.../oracle_qualif/doomed_dead.0.res.oracle | 94 +++++----
.../oracle_qualif/doomed_dead.1.res.oracle | 98 +++++-----
.../oracle_qualif/doomed_localinit.res.oracle | 9 +-
.../oracle_qualif/doomed_loop.res.oracle | 19 +-
.../oracle_qualif/doomed_pre.res.oracle | 34 ++--
.../oracle_qualif/doomed_report_ko.res.oracle | 23 +--
.../oracle_qualif/doomed_report_ok.res.oracle | 20 +-
.../oracle_qualif/doomed_unreach.res.oracle | 12 +-
.../oracle_qualif/doomed_unroll.res.oracle | 10 +-
.../oracle_qualif/dynamic.0.res.oracle | 94 ++++-----
.../oracle_qualif/dynamic.1.res.oracle | 10 +-
.../oracle_qualif/fallback.res.oracle | 2 +-
.../oracle_qualif/flash.0.res.oracle | 12 +-
.../oracle_qualif/flash.1.res.oracle | 12 +-
.../oracle_qualif/float_format.res.oracle | 2 +-
.../oracle_qualif/float_real.0.res.oracle | 2 +-
.../oracle_qualif/float_real.1.res.oracle | 2 +-
.../wp_plugin/oracle_qualif/frame.res.oracle | 12 +-
.../oracle_qualif/ground_real.res.oracle | 2 +-
.../oracle_qualif/init_const.res.oracle | 8 +-
.../init_const_filter.res.oracle | 2 +-
.../oracle_qualif/init_const_guard.res.oracle | 14 +-
.../oracle_qualif/init_extern.res.oracle | 6 +-
.../oracle_qualif/init_valid.res.oracle | 8 +-
.../oracle_qualif/initarr.res.oracle | 4 +-
.../oracle_qualif/injector.0.res.oracle | 26 +--
.../oracle_qualif/injector.1.res.oracle | 8 +-
.../wp_plugin/oracle_qualif/loop.res.oracle | 18 +-
.../oracle_qualif/loopcurrent.res.oracle | 8 +-
.../oracle_qualif/loopentry.res.oracle | 8 +-
.../oracle_qualif/loopextra.res.oracle | 6 +-
.../wp_plugin/oracle_qualif/mask.res.oracle | 4 +-
.../wp_plugin/oracle_qualif/math.0.res.oracle | 60 +++---
.../wp_plugin/oracle_qualif/math.1.res.oracle | 18 +-
.../wp_plugin/oracle_qualif/model.res.oracle | 4 +-
.../oracle_qualif/no_step_limit.res.oracle | 2 +-
.../oracle_qualif/nosession.res.oracle | 1 -
.../wp_plugin/oracle_qualif/nth.res.oracle | 52 ++---
.../oracle_qualif/nullable.res.oracle | 10 +-
.../oracle_qualif/nullable_ext.res.oracle | 12 +-
.../oracle_qualif/overarray.res.oracle | 24 +--
.../oracle_qualif/overassign.res.oracle | 24 +--
.../oracle_qualif/overflow2.res.oracle | 28 +--
.../wp_plugin/oracle_qualif/params.res.oracle | 2 +-
.../wp_plugin/oracle_qualif/plet.res.oracle | 2 +-
.../oracle_qualif/post_assigns.res.oracle | 10 +-
.../oracle_qualif/post_valid.res.oracle | 6 +-
.../wp_plugin/oracle_qualif/prenex.res.oracle | 24 +--
.../oracle_qualif/removed.res.oracle | 2 +-
.../wp_plugin/oracle_qualif/repeat.res.oracle | 94 ++++-----
.../wp_plugin/oracle_qualif/rte.res.oracle | 12 +-
.../oracle_qualif/sequence.0.res.oracle | 78 ++++----
.../oracle_qualif/sequence.1.res.oracle | 68 +++----
.../oracle_qualif/string_c.res.oracle | 88 ++++-----
.../wp_plugin/oracle_qualif/struct.res.oracle | 36 ++--
.../oracle_qualif/struct_hack.res.oracle | 20 +-
.../wp_plugin/oracle_qualif/subset.res.oracle | 2 +-
.../oracle_qualif/subset_fopen.res.oracle | 10 +-
.../wp_plugin/oracle_qualif/trig.res.oracle | 8 +-
.../oracle_qualif/unfold_assigns.0.res.oracle | 56 +++---
.../oracle_qualif/unfold_assigns.1.res.oracle | 56 +++---
.../oracle_qualif/unfold_assigns.2.res.oracle | 56 +++---
.../wp_plugin/oracle_qualif/unroll.res.oracle | 2 +-
.../oracle_qualif/unsafe-arrays.res.oracle | 6 +-
.../oracle_qualif/unsigned.res.oracle | 2 +-
.../oracle_qualif/volatile.0.res.oracle | 10 +-
.../oracle_qualif/volatile.1.res.oracle | 10 +-
.../wp_store/oracle_qualif/array.res.oracle | 4 +-
.../wp_store/oracle_qualif/natural.res.oracle | 6 +-
.../oracle_qualif/nonaliasing.0.res.oracle | 4 +-
.../oracle_qualif/nonaliasing.1.res.oracle | 4 +-
.../wp_store/oracle_qualif/struct.res.oracle | 12 +-
.../wp/tests/wp_tip/oracle/clear.res.oracle | 4 +-
.../wp_tip/oracle/induction_typing.res.oracle | 4 +-
.../tests/wp_tip/oracle/modmask.0.res.oracle | 4 +-
.../tests/wp_tip/oracle/modmask.1.res.oracle | 4 +-
.../wp/tests/wp_tip/oracle/split.res.oracle | 46 ++---
.../oracle_qualif/induction.0.res.oracle | 2 +-
.../oracle_qualif/induction.1.res.oracle | 2 +-
.../oracle_qualif/induction.2.res.oracle | 2 +-
.../wp_tip/oracle_qualif/overflow.res.oracle | 4 +-
.../tac_split_quantifiers.res.oracle | 10 +-
.../wp_tip/oracle_qualif/unroll.res.oracle | 6 +-
.../array_initialized.0.res.oracle | 10 +-
.../array_initialized.1.res.oracle | 10 +-
.../wp_typed/oracle_qualif/avar.res.oracle | 2 +-
.../oracle_qualif/cast_fits.res.oracle | 16 +-
.../wp_typed/oracle_qualif/frame.res.oracle | 12 +-
.../wp_typed/oracle_qualif/mvar.res.oracle | 2 +-
.../oracle_qualif/shift_lemma.res.oracle | 10 +-
.../struct_array_type.res.oracle | 2 +-
.../oracle_qualif/unit_alloc.0.res.oracle | 14 +-
.../oracle_qualif/unit_alloc.1.res.oracle | 14 +-
.../oracle_qualif/unit_bitwise.0.res.oracle | 122 ++++++------
.../oracle_qualif/unit_bitwise.1.res.oracle | 8 +-
.../oracle_qualif/unit_call.res.oracle | 2 +-
.../oracle_qualif/unit_cast.res.oracle | 2 +-
.../oracle_qualif/unit_cst.res.oracle | 4 +-
.../oracle_qualif/unit_float.res.oracle | 12 +-
.../oracle_qualif/unit_hard.res.oracle | 6 +-
.../oracle_qualif/unit_ite.res.oracle | 2 +-
.../oracle_qualif/unit_labels.res.oracle | 6 +-
.../oracle_qualif/unit_lemma.res.oracle | 12 +-
.../oracle_qualif/unit_local.0.res.oracle | 6 +-
.../oracle_qualif/unit_local.1.res.oracle | 6 +-
.../oracle_qualif/unit_loopscope.0.res.oracle | 4 +-
.../oracle_qualif/unit_loopscope.1.res.oracle | 4 +-
.../oracle_qualif/unit_matrix.res.oracle | 6 +-
.../oracle_qualif/unit_string.res.oracle | 12 +-
.../oracle_qualif/unit_tset.res.oracle | 6 +-
.../oracle_qualif/user_bitwise.0.res.oracle | 24 +--
.../oracle_qualif/user_collect.res.oracle | 64 +++---
.../oracle_qualif/user_init.0.res.oracle | 184 +++++++++---------
.../oracle_qualif/user_init.1.res.oracle | 46 ++---
.../oracle_qualif/user_init.2.res.oracle | 32 +--
.../oracle_qualif/user_injector.0.res.oracle | 40 ++--
.../oracle_qualif/user_injector.1.res.oracle | 32 +--
.../oracle_qualif/user_rec.res.oracle | 36 ++--
.../oracle_qualif/user_string.res.oracle | 26 +--
.../oracle_qualif/user_swap.0.res.oracle | 14 +-
.../oracle_qualif/user_swap.1.res.oracle | 12 +-
.../wp_usage/oracle_qualif/caveat2.res.oracle | 18 +-
.../oracle_qualif/caveat_range.res.oracle | 24 +--
.../oracle_qualif/issue-189-bis.0.res.oracle | 60 +++---
.../oracle_qualif/issue-189-bis.1.res.oracle | 20 +-
314 files changed, 3613 insertions(+), 3723 deletions(-)
diff --git a/src/plugins/wp/Stats.ml b/src/plugins/wp/Stats.ml
index 32e6fb46c18..ebd9a175550 100644
--- a/src/plugins/wp/Stats.ml
+++ b/src/plugins/wp/Stats.ml
@@ -219,7 +219,8 @@ let pp_stats ~shell ~updating fmt s =
Format.fprintf fmt ")"
end
) s.provers ;
- if 0 < s.cached then
+ if 0 < s.cached && List.exists (fun (p,_) -> p <> Qed) s.provers
+ then
if s.cached = vp || updating then
Format.fprintf fmt " (Cached)"
else
diff --git a/src/plugins/wp/VCS.ml b/src/plugins/wp/VCS.ml
index 3a94da3f3fc..7e56f3caa29 100644
--- a/src/plugins/wp/VCS.ml
+++ b/src/plugins/wp/VCS.ml
@@ -202,10 +202,12 @@ type result = {
prover_errmsg : string ;
}
-let is_verdict r = match r.verdict with
+let is_result = function
| Valid | Unknown | Invalid | Timeout | Stepout | Failed -> true
| NoResult | Computing _ -> false
+let is_verdict r = is_result r.verdict
+
let is_valid = function { verdict = Valid } -> true | _ -> false
let is_computing = function { verdict=Computing _ } -> true | _ -> false
diff --git a/src/plugins/wp/VCS.mli b/src/plugins/wp/VCS.mli
index d1b89ddddd8..1f384006307 100644
--- a/src/plugins/wp/VCS.mli
+++ b/src/plugins/wp/VCS.mli
@@ -111,6 +111,7 @@ val cached : result -> result (** only for true verdicts *)
val result : ?cached:bool -> ?solver:float -> ?time:float -> ?steps:int -> verdict -> result
val is_auto : prover -> bool
+val is_result : verdict -> bool
val is_verdict : result -> bool
val is_valid: result -> bool
val is_computing: result -> bool
diff --git a/src/plugins/wp/register.ml b/src/plugins/wp/register.ml
index c9595b57314..aa8d04a8b6a 100644
--- a/src/plugins/wp/register.ml
+++ b/src/plugins/wp/register.ml
@@ -295,56 +295,14 @@ let do_wpo_result goal prover res =
do_wpo_stat goal prover res ;
end
-let results g =
- List.filter
- (fun (_,r) -> VCS.is_verdict r)
- (Wpo.get_results g)
-
-let do_wpo_failed goal =
- let updating = Cache.is_updating () in
- match results goal with
- | [p,r] ->
- Wp_parameters.result "[%a] Goal %s : %t%a"
- VCS.pp_prover p (Wpo.get_gid goal)
- (VCS.pp_result_qualif ~updating p r) pp_warnings goal
- | pres ->
- Wp_parameters.result "[Failed] Goal %s%t" (Wpo.get_gid goal)
- begin fun fmt ->
- pp_warnings fmt goal ;
- List.iter
- (fun (p,r) ->
- Format.fprintf fmt "@\n%8s: @[<hv>%t@]"
- (VCS.title_of_prover p)
- (VCS.pp_result_qualif ~updating p r)
- ) pres ;
- end
-
-let do_wpo_smoke status goal =
- Wp_parameters.result "[%s] Smoke-test %s%t"
- (match status with
- | `Failed -> "Failed"
- | `Passed -> "Passed"
- | `Unknown -> "Partial")
- (Wpo.get_gid goal)
- begin fun fmt ->
- pp_warnings fmt goal ;
- let updating = Cache.is_updating () in
- List.iter
- (fun (p,r) ->
- Format.fprintf fmt "@\n%8s: @[<hv>%t@]"
- (VCS.title_of_prover p)
- (VCS.pp_result_qualif ~updating p r)
- ) (results goal) ;
- end
-[@@@ warning "-32"]
let do_report_stats ~shell ~updating ~smoke goal (verdict,stats) =
let status =
if smoke then
match verdict with
| VCS.NoResult | Computing _ -> ""
- | Invalid -> "Passed"
- | Valid -> "Failed"
+ | Valid -> "Failed (Doomed)"
| Failed -> "Unknown (Failure)"
+ | Invalid -> "Passed (Invalid)"
| Unknown -> "Passed (Unknown)"
| Timeout -> "Passed (Timeout)"
| Stepout -> "Passed (Stepout)"
@@ -361,7 +319,6 @@ let do_report_stats ~shell ~updating ~smoke goal (verdict,stats) =
Wp_parameters.feedback "[%s] %s%a%a"
status (Wpo.get_gid goal) (Stats.pp_stats ~shell ~updating) stats
pp_warnings goal
-[@@@ warning "+32"]
let do_wpo_success ~shell ~updating goal success =
if Wp_parameters.Generate.get () then
@@ -371,32 +328,18 @@ let do_wpo_success ~shell ~updating goal success =
Wp_parameters.feedback ~ontty:`Silent
"[Generated] Goal %s (%a)" (Wpo.get_gid goal) VCS.pp_prover prover
else
- if Wpo.is_smoke_test goal then
- begin match success with
- | None ->
- Wp_parameters.feedback ~ontty:`Silent
- "[Passed] Smoke-test %s" (Wpo.get_gid goal)
- | Some _ ->
- let status,target = Wpo.get_proof goal in
- do_wpo_smoke status goal ;
- if status = `Failed then
+ let smoke = Wpo.is_smoke_test goal in
+ let prs = Wpo.get_results goal in
+ let (verdict,_) as vstats = Stats.results ~smoke prs in
+ begin
+ if shell || verdict <> Valid then
+ do_report_stats ~shell ~updating goal ~smoke vstats ;
+ if smoke && verdict <> Valid then
+ begin
+ let target = Wpo.get_target goal in
let source = fst (Property.location target) in
Wp_parameters.warning ~source "Failed smoke-test"
- end
- else
- begin match success with
- | None -> do_wpo_failed goal
- | Some (VCS.Tactical as script) ->
- Wp_parameters.feedback ~ontty:`Silent
- "[%a] Goal %s : Valid"
- VCS.pp_prover script (Wpo.get_gid goal)
- | Some prover ->
- ignore shell ;
- let result = Wpo.get_result goal prover in
- Wp_parameters.feedback ~ontty:`Silent
- "[%a] Goal %s : %t"
- VCS.pp_prover prover (Wpo.get_gid goal)
- (VCS.pp_result_qualif ~updating prover result)
+ end ;
end
let do_report_time fmt s =
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/bad_cast_call.res.oracle b/src/plugins/wp/tests/wp/oracle_qualif/bad_cast_call.res.oracle
index 134366b7a46..af880279b45 100644
--- a/src/plugins/wp/tests/wp/oracle_qualif/bad_cast_call.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle_qualif/bad_cast_call.res.oracle
@@ -7,7 +7,7 @@
[wp] bad_cast_call.i:8: Warning:
Cast with incompatible pointers types (source: sint8*) (target: char**)
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_foo_assert_MUST_FAIL : Unsuccess (Stronger)
+[wp] [Unknown] typed_foo_assert_MUST_FAIL (Alt-Ergo) (Cached) (Stronger)
[wp] Proved goals: 0 / 1
Alt-Ergo: 0 (unsuccess: 1)
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/cfg_loop.res.oracle b/src/plugins/wp/tests/wp/oracle_qualif/cfg_loop.res.oracle
index 4ad9b8f4400..67fbf10cdde 100644
--- a/src/plugins/wp/tests/wp/oracle_qualif/cfg_loop.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle_qualif/cfg_loop.res.oracle
@@ -3,21 +3,21 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 15 goals scheduled
-[wp] [Qed] Goal typed_loop_switch_loop_invariant_preserved_part1 : Valid
-[wp] [Qed] Goal typed_loop_switch_loop_invariant_preserved_part2 : Valid
-[wp] [Qed] Goal typed_loop_switch_loop_invariant_preserved_part3 : Valid
-[wp] [Qed] Goal typed_loop_switch_loop_invariant_established : Valid
-[wp] [Qed] Goal typed_loop_switch_loop_invariant_2_preserved_part1 : Valid
-[wp] [Qed] Goal typed_loop_switch_loop_invariant_2_preserved_part2 : Valid
-[wp] [Qed] Goal typed_loop_switch_loop_invariant_2_preserved_part3 : Valid
-[wp] [Qed] Goal typed_loop_switch_loop_invariant_2_established : Valid
-[wp] [Qed] Goal typed_loop_switch_loop_assigns_part1 : Valid
-[wp] [Qed] Goal typed_loop_switch_loop_assigns_part2 : Valid
-[wp] [Qed] Goal typed_loop_switch_loop_assigns_part3 : Valid
-[wp] [Qed] Goal typed_loop_switch_loop_assigns_part4 : Valid
-[wp] [Qed] Goal typed_loop_continue_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_loop_continue_loop_invariant_established : Valid
-[wp] [Qed] Goal typed_loop_continue_loop_assigns : Valid
+[wp] [Valid] typed_loop_switch_loop_invariant_preserved_part1 (Qed)
+[wp] [Valid] typed_loop_switch_loop_invariant_preserved_part2 (Qed)
+[wp] [Valid] typed_loop_switch_loop_invariant_preserved_part3 (Qed)
+[wp] [Valid] typed_loop_switch_loop_invariant_established (Qed)
+[wp] [Valid] typed_loop_switch_loop_invariant_2_preserved_part1 (Qed)
+[wp] [Valid] typed_loop_switch_loop_invariant_2_preserved_part2 (Qed)
+[wp] [Valid] typed_loop_switch_loop_invariant_2_preserved_part3 (Qed)
+[wp] [Valid] typed_loop_switch_loop_invariant_2_established (Qed)
+[wp] [Valid] typed_loop_switch_loop_assigns_part1 (Qed)
+[wp] [Valid] typed_loop_switch_loop_assigns_part2 (Qed)
+[wp] [Valid] typed_loop_switch_loop_assigns_part3 (Qed)
+[wp] [Valid] typed_loop_switch_loop_assigns_part4 (Qed)
+[wp] [Valid] typed_loop_continue_loop_invariant_preserved (Qed)
+[wp] [Valid] typed_loop_continue_loop_invariant_established (Qed)
+[wp] [Valid] typed_loop_continue_loop_assigns (Qed)
[wp] Proved goals: 15 / 15
Qed: 15
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/default-stmt-assigns.res.oracle b/src/plugins/wp/tests/wp/oracle_qualif/default-stmt-assigns.res.oracle
index a7381e92a1a..7ccf269f01c 100644
--- a/src/plugins/wp/tests/wp/oracle_qualif/default-stmt-assigns.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle_qualif/default-stmt-assigns.res.oracle
@@ -5,7 +5,7 @@
[wp] default-stmt-assigns.i:2: Warning:
Missing assigns clause (assigns 'everything' instead)
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_automaton_state_accessor_assert : Unsuccess
+[wp] [Unknown] typed_automaton_state_accessor_assert (Alt-Ergo) (Cached)
[wp] Proved goals: 0 / 1
Alt-Ergo: 0 (unsuccess: 1)
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/exit_post_scope.res.oracle b/src/plugins/wp/tests/wp/oracle_qualif/exit_post_scope.res.oracle
index a12008e58e2..19d322b7883 100644
--- a/src/plugins/wp/tests/wp/oracle_qualif/exit_post_scope.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle_qualif/exit_post_scope.res.oracle
@@ -5,8 +5,8 @@
Neither code nor specification for function bar, generating default assigns from the prototype
[wp] Warning: Missing RTE guards
[wp] 2 goals scheduled
-[wp] [Alt-Ergo] Goal typed_foo_ensures : Unsuccess
-[wp] [Alt-Ergo] Goal typed_foo_exits : Unsuccess
+[wp] [Unknown] typed_foo_ensures (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_foo_exits (Alt-Ergo) (Cached)
[wp] Proved goals: 0 / 2
Alt-Ergo: 0 (unsuccess: 2)
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/sharing.res.oracle b/src/plugins/wp/tests/wp/oracle_qualif/sharing.res.oracle
index a074e6a554d..bb0b30e819b 100644
--- a/src/plugins/wp/tests/wp/oracle_qualif/sharing.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle_qualif/sharing.res.oracle
@@ -3,7 +3,7 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_f_ensures : Valid
+[wp] [Valid] typed_f_ensures (Alt-Ergo) (Cached)
[wp] Proved goals: 1 / 1
Qed: 0
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test.res.oracle b/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test.res.oracle
index 530da68980d..146f4a984bc 100644
--- a/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test.res.oracle
@@ -9,33 +9,33 @@
[wp] stmtcompiler_test.i:81: Warning:
Missing assigns clause (assigns 'everything' instead)
[wp] 27 goals scheduled
-[wp] [Qed] Goal typed_empty_assert : Valid
-[wp] [Qed] Goal typed_one_assign_assert : Valid
-[wp] [Qed] Goal typed_one_if_assert : Valid
-[wp] [Qed] Goal typed_some_seq_assert : Valid
-[wp] [Qed] Goal typed_some_seq_assert_2 : Valid
-[wp] [Qed] Goal typed_main_ensures_result_assert : Valid
-[wp] [Qed] Goal typed_main_assert : Valid
-[wp] [Alt-Ergo] Goal typed_not_main_assert_bad : Unsuccess
-[wp] [Qed] Goal typed_main_assigns_global_assert : Valid
-[wp] [Qed] Goal typed_main_assigns_global_assert_2 : Valid
-[wp] [Alt-Ergo] Goal typed_main_assigns_global_assert_bad : Unsuccess
-[wp] [Qed] Goal typed_zloop_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_zloop_loop_invariant_preserved : Unsuccess
-[wp] [Qed] Goal typed_zloop_loop_invariant_established : Valid
-[wp] [Qed] Goal typed_zloop_assert : Valid
-[wp] [Qed] Goal typed_zloop_assert_2 : Valid
-[wp] [Alt-Ergo] Goal typed_zloop_assert_3 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_zloop_assert_bad : Unsuccess
-[wp] [Qed] Goal typed_behavior2_assert : Valid
-[wp] [Qed] Goal typed_behavior3_assert : Valid
-[wp] [Qed] Goal typed_behavior4_assert : Valid
-[wp] [Alt-Ergo] Goal typed_behavior5_assert_bad : Unsuccess
-[wp] [Alt-Ergo] Goal typed_if_assert_assert : Valid
-[wp] [Alt-Ergo] Goal typed_if_assert_assert_2 : Unsuccess
-[wp] [Qed] Goal typed_if_assert_assert_3 : Valid
-[wp] [Alt-Ergo] Goal typed_if_assert_assert_missing_return : Unsuccess
-[wp] [Qed] Goal typed_compare_assert : Valid
+[wp] [Valid] typed_empty_assert (Qed)
+[wp] [Valid] typed_one_assign_assert (Qed)
+[wp] [Valid] typed_one_if_assert (Qed)
+[wp] [Valid] typed_some_seq_assert (Qed)
+[wp] [Valid] typed_some_seq_assert_2 (Qed)
+[wp] [Valid] typed_main_ensures_result_assert (Qed)
+[wp] [Valid] typed_main_assert (Qed)
+[wp] [Timeout] typed_not_main_assert_bad (Alt-Ergo) (Cached)
+[wp] [Valid] typed_main_assigns_global_assert (Qed)
+[wp] [Valid] typed_main_assigns_global_assert_2 (Qed)
+[wp] [Timeout] typed_main_assigns_global_assert_bad (Alt-Ergo) (Cached)
+[wp] [Valid] typed_zloop_ensures (Qed)
+[wp] [Timeout] typed_zloop_loop_invariant_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_zloop_loop_invariant_established (Qed)
+[wp] [Valid] typed_zloop_assert (Qed)
+[wp] [Valid] typed_zloop_assert_2 (Qed)
+[wp] [Timeout] typed_zloop_assert_3 (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_zloop_assert_bad (Alt-Ergo) (Cached)
+[wp] [Valid] typed_behavior2_assert (Qed)
+[wp] [Valid] typed_behavior3_assert (Qed)
+[wp] [Valid] typed_behavior4_assert (Qed)
+[wp] [Unknown] typed_behavior5_assert_bad (Alt-Ergo) (Cached)
+[wp] [Valid] typed_if_assert_assert (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_if_assert_assert_2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_if_assert_assert_3 (Qed)
+[wp] [Timeout] typed_if_assert_assert_missing_return (Alt-Ergo) (Cached)
+[wp] [Valid] typed_compare_assert (Qed)
[wp] Proved goals: 19 / 27
Qed: 18
Alt-Ergo: 1 (unsuccess: 8)
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test_rela.res.oracle b/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test_rela.res.oracle
index b72061a126f..a496dc231cb 100644
--- a/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test_rela.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test_rela.res.oracle
@@ -3,7 +3,7 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 1 goal scheduled
-[wp] [Qed] Goal typed_empty_assert : Valid
+[wp] [Valid] typed_empty_assert (Qed)
[wp] Proved goals: 1 / 1
Qed: 1
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.0.res.oracle b/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.0.res.oracle
index b52cb3c5676..201acf651d6 100644
--- a/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.0.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.0.res.oracle
@@ -5,25 +5,25 @@
[wp] wp_behav.c:82: Warning:
Missing assigns clause (assigns 'everything' instead)
[wp] 19 goals scheduled
-[wp] [Qed] Goal typed_f_ensures_qed_ok : Valid
-[wp] [Qed] Goal typed_f_x1_ensures_qed_ok : Valid
-[wp] [Qed] Goal typed_f_assert_qed_ok : Valid
-[wp] [Qed] Goal typed_f_x2_ensures_qed_ok : Valid
-[wp] [Qed] Goal typed_f_assert_qed_ok_2 : Valid
-[wp] [Qed] Goal typed_min_complete_bx_by : Valid
-[wp] [Qed] Goal typed_min_disjoint_bx_by : Valid
-[wp] [Qed] Goal typed_min_bx_ensures_qed_ok : Valid
-[wp] [Qed] Goal typed_min_by_ensures_qed_ok : Valid
-[wp] [Alt-Ergo] Goal typed_bhv_complete_neg_pos : Valid
-[wp] [Qed] Goal typed_bhv_pos_ensures_qed_ok : Valid
-[wp] [Qed] Goal typed_bhv_neg_ensures_qed_ok : Valid
-[wp] [Alt-Ergo] Goal typed_assert_needed_assert_ko : Unsuccess
-[wp] [Qed] Goal typed_assert_needed_assert_qed_ok_ok_with_hyp : Valid
-[wp] [Alt-Ergo] Goal typed_bts0513_ensures_ko1 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_bts0513_ensures_ko2 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_razT_loop_invariant_qed_ok_preserved : Valid
-[wp] [Qed] Goal typed_razT_loop_invariant_qed_ok_established : Valid
-[wp] [Alt-Ergo] Goal typed_razT_b1_ensures_e1 : Unsuccess
+[wp] [Valid] typed_f_ensures_qed_ok (Qed)
+[wp] [Valid] typed_f_x1_ensures_qed_ok (Qed)
+[wp] [Valid] typed_f_assert_qed_ok (Qed)
+[wp] [Valid] typed_f_x2_ensures_qed_ok (Qed)
+[wp] [Valid] typed_f_assert_qed_ok_2 (Qed)
+[wp] [Valid] typed_min_complete_bx_by (Qed)
+[wp] [Valid] typed_min_disjoint_bx_by (Qed)
+[wp] [Valid] typed_min_bx_ensures_qed_ok (Qed)
+[wp] [Valid] typed_min_by_ensures_qed_ok (Qed)
+[wp] [Valid] typed_bhv_complete_neg_pos (Alt-Ergo) (Cached)
+[wp] [Valid] typed_bhv_pos_ensures_qed_ok (Qed)
+[wp] [Valid] typed_bhv_neg_ensures_qed_ok (Qed)
+[wp] [Timeout] typed_assert_needed_assert_ko (Alt-Ergo) (Cached)
+[wp] [Valid] typed_assert_needed_assert_qed_ok_ok_with_hyp (Qed)
+[wp] [Unknown] typed_bts0513_ensures_ko1 (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_bts0513_ensures_ko2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_razT_loop_invariant_qed_ok_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_razT_loop_invariant_qed_ok_established (Qed)
+[wp] [Timeout] typed_razT_b1_ensures_e1 (Alt-Ergo) (Cached)
[wp] Proved goals: 15 / 19
Qed: 13
Alt-Ergo: 2 (unsuccess: 4)
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.1.res.oracle b/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.1.res.oracle
index 2c5857ce3ec..13da930a8a6 100644
--- a/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.1.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.1.res.oracle
@@ -3,11 +3,11 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 5 goals scheduled
-[wp] [Alt-Ergo] Goal typed_f_ensures_qed_ko : Unsuccess
-[wp] [Alt-Ergo] Goal typed_f_x1_ensures_qed_ko : Unsuccess
-[wp] [Alt-Ergo] Goal typed_f_x2_ensures_qed_ko : Unsuccess
-[wp] [Alt-Ergo] Goal typed_min_bx_ensures_qed_ko : Unsuccess
-[wp] [Alt-Ergo] Goal typed_min_by_ensures_qed_ko : Unsuccess
+[wp] [Stepout] typed_f_ensures_qed_ko (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_f_x1_ensures_qed_ko (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_f_x2_ensures_qed_ko (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_min_bx_ensures_qed_ko (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_min_by_ensures_qed_ko (Alt-Ergo) (Cached)
[wp] Proved goals: 0 / 5
Alt-Ergo: 0 (unsuccess: 5)
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/wp_call_pre.res.oracle b/src/plugins/wp/tests/wp/oracle_qualif/wp_call_pre.res.oracle
index 67664973b46..3e878841ff7 100644
--- a/src/plugins/wp/tests/wp/oracle_qualif/wp_call_pre.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle_qualif/wp_call_pre.res.oracle
@@ -7,15 +7,15 @@
No code nor implicit assigns clause for function g, generating default assigns from the prototype
[wp] Warning: Missing RTE guards
[wp] 9 goals scheduled
-[wp] [Qed] Goal typed_double_call_call_f_requires_qed_ok_Rf : Valid
-[wp] [Qed] Goal typed_double_call_call_f_2_requires_qed_ok_Rf : Valid
-[wp] [Qed] Goal typed_main_requires_qed_ok_Rmain : Valid
-[wp] [Qed] Goal typed_main_ensures_qed_ok_Emain : Valid
-[wp] [Qed] Goal typed_main_call_f_requires_qed_ok_Rf : Valid
-[wp] [Qed] Goal typed_call_main_ensures_qed_ok : Valid
-[wp] [Qed] Goal typed_call_main_call_main_requires_qed_ok_Rmain : Valid
-[wp] [Qed] Goal typed_call_g_call_g_requires_qed_ok_Rga : Valid
-[wp] [Qed] Goal typed_call_g_call_g_requires_Rgb : Valid
+[wp] [Valid] typed_double_call_call_f_requires_qed_ok_Rf (Qed)
+[wp] [Valid] typed_double_call_call_f_2_requires_qed_ok_Rf (Qed)
+[wp] [Valid] typed_main_requires_qed_ok_Rmain (Qed)
+[wp] [Valid] typed_main_ensures_qed_ok_Emain (Qed)
+[wp] [Valid] typed_main_call_f_requires_qed_ok_Rf (Qed)
+[wp] [Valid] typed_call_main_ensures_qed_ok (Qed)
+[wp] [Valid] typed_call_main_call_main_requires_qed_ok_Rmain (Qed)
+[wp] [Valid] typed_call_g_call_g_requires_qed_ok_Rga (Qed)
+[wp] [Valid] typed_call_g_call_g_requires_Rgb (Qed)
[wp] Proved goals: 9 / 9
Qed: 9
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/wp_eqb.res.oracle b/src/plugins/wp/tests/wp/oracle_qualif/wp_eqb.res.oracle
index e7aa87478b2..923d43916b2 100644
--- a/src/plugins/wp/tests/wp/oracle_qualif/wp_eqb.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle_qualif/wp_eqb.res.oracle
@@ -3,7 +3,7 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_f_ensures : Valid
+[wp] [Valid] typed_f_ensures (Alt-Ergo) (Cached)
[wp] Proved goals: 1 / 1
Qed: 0
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/wp_strategy.res.oracle b/src/plugins/wp/tests/wp/oracle_qualif/wp_strategy.res.oracle
index da93d6b571b..8ef9cf00202 100644
--- a/src/plugins/wp/tests/wp/oracle_qualif/wp_strategy.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle_qualif/wp_strategy.res.oracle
@@ -4,10 +4,10 @@
[rte:annot] annotating function bts0513_bis
[wp] Running WP plugin...
[wp] 4 goals scheduled
-[wp] [Alt-Ergo] Goal hoare_bts0513_ensures_qed_ko_ko1 : Unsuccess
-[wp] [Alt-Ergo] Goal hoare_bts0513_ensures_qed_ko_ko2 : Unsuccess
-[wp] [Alt-Ergo] Goal hoare_bts0513_bis_assert_qed_ko_ko1 : Unsuccess
-[wp] [Qed] Goal hoare_bts0513_bis_assert_qed_ok_ok : Valid
+[wp] [Unknown] hoare_bts0513_ensures_qed_ko_ko1 (Alt-Ergo) (Cached)
+[wp] [Unknown] hoare_bts0513_ensures_qed_ko_ko2 (Alt-Ergo) (Cached)
+[wp] [Timeout] hoare_bts0513_bis_assert_qed_ko_ko1 (Alt-Ergo) (Cached)
+[wp] [Valid] hoare_bts0513_bis_assert_qed_ok_ok (Qed)
[wp] Proved goals: 1 / 4
Qed: 1
Alt-Ergo: 0 (unsuccess: 3)
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/arith.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/arith.0.res.oracle
index 8fb1d6f4484..d3065b6d3f0 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/arith.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/arith.0.res.oracle
@@ -3,30 +3,30 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 24 goals scheduled
-[wp] [Alt-Ergo] Goal typed_lemma_ASSOC_land_qed_ok : Valid
-[wp] [Qed] Goal typed_lemma_L01_lnot_qed_ok : Valid
-[wp] [Qed] Goal typed_lemma_L10_land_neutral_qed_ok : Valid
-[wp] [Qed] Goal typed_lemma_L11_land_absorbant_qed_ok : Valid
-[wp] [Qed] Goal typed_lemma_L12_land_qed_ok : Valid
-[wp] [Qed] Goal typed_lemma_L13_land_qed_ok : Valid
-[wp] [Qed] Goal typed_lemma_L14_land_absorbant_qed_ok : Valid
-[wp] [Qed] Goal typed_lemma_L15_land_qed_ok : Valid
-[wp] [Qed] Goal typed_lemma_L16_land_qed_ok : Valid
-[wp] [Qed] Goal typed_lemma_L20_lor_neutral_qed_ok : Valid
-[wp] [Qed] Goal typed_lemma_L21_lor_absorbant_qed_ok : Valid
-[wp] [Qed] Goal typed_lemma_L30_lxor_neutral_qed_ok : Valid
-[wp] [Qed] Goal typed_lemma_scL1_qed_ok : Valid
-[wp] [Qed] Goal typed_lemma_scN1_qed_ok : Valid
-[wp] [Qed] Goal typed_lemma_scN2_qed_ok : Valid
-[wp] [Qed] Goal typed_lemma_ucL1_qed_ok : Valid
-[wp] [Qed] Goal typed_lemma_ucL2_qed_ok : Valid
-[wp] [Qed] Goal typed_lemma_ucL3_qed_ok : Valid
-[wp] [Qed] Goal typed_lemma_ucL4_qed_ok : Valid
-[wp] [Qed] Goal typed_lemma_ucN1_qed_ok : Valid
-[wp] [Qed] Goal typed_lemma_ucN2_qed_ok : Valid
-[wp] [Qed] Goal typed_cast_sgn_usgn_ensures_qed_ok_nat : Valid
-[wp] [Qed] Goal typed_uchar_range_assert_qed_ok_A1 : Valid
-[wp] [Qed] Goal typed_uchar_range_assert_qed_ok_A2 : Valid
+[wp] [Valid] typed_lemma_ASSOC_land_qed_ok (Alt-Ergo)
+[wp] [Valid] typed_lemma_L01_lnot_qed_ok (Qed)
+[wp] [Valid] typed_lemma_L10_land_neutral_qed_ok (Qed)
+[wp] [Valid] typed_lemma_L11_land_absorbant_qed_ok (Qed)
+[wp] [Valid] typed_lemma_L12_land_qed_ok (Qed)
+[wp] [Valid] typed_lemma_L13_land_qed_ok (Qed)
+[wp] [Valid] typed_lemma_L14_land_absorbant_qed_ok (Qed)
+[wp] [Valid] typed_lemma_L15_land_qed_ok (Qed)
+[wp] [Valid] typed_lemma_L16_land_qed_ok (Qed)
+[wp] [Valid] typed_lemma_L20_lor_neutral_qed_ok (Qed)
+[wp] [Valid] typed_lemma_L21_lor_absorbant_qed_ok (Qed)
+[wp] [Valid] typed_lemma_L30_lxor_neutral_qed_ok (Qed)
+[wp] [Valid] typed_lemma_scL1_qed_ok (Qed)
+[wp] [Valid] typed_lemma_scN1_qed_ok (Qed)
+[wp] [Valid] typed_lemma_scN2_qed_ok (Qed)
+[wp] [Valid] typed_lemma_ucL1_qed_ok (Qed)
+[wp] [Valid] typed_lemma_ucL2_qed_ok (Qed)
+[wp] [Valid] typed_lemma_ucL3_qed_ok (Qed)
+[wp] [Valid] typed_lemma_ucL4_qed_ok (Qed)
+[wp] [Valid] typed_lemma_ucN1_qed_ok (Qed)
+[wp] [Valid] typed_lemma_ucN2_qed_ok (Qed)
+[wp] [Valid] typed_cast_sgn_usgn_ensures_qed_ok_nat (Qed)
+[wp] [Valid] typed_uchar_range_assert_qed_ok_A1 (Qed)
+[wp] [Valid] typed_uchar_range_assert_qed_ok_A2 (Qed)
[wp] Proved goals: 24 / 24
Qed: 23
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/arith.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/arith.1.res.oracle
index ccc1c83ed99..e853c40b427 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/arith.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/arith.1.res.oracle
@@ -3,7 +3,7 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_cast_sgn_usgn_ensures_qed_ko_KO : Unsuccess
+[wp] [Stepout] typed_cast_sgn_usgn_ensures_qed_ko_KO (Alt-Ergo) (Cached)
[wp] Proved goals: 0 / 1
Alt-Ergo: 0 (unsuccess: 1)
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assign_array.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assign_array.res.oracle
index e7fabb1851d..d511156fb61 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assign_array.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assign_array.res.oracle
@@ -3,10 +3,10 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 4 goals scheduled
-[wp] [Qed] Goal typed_jobA_assigns_exit : Valid
-[wp] [Qed] Goal typed_jobA_assigns_normal : Valid
-[wp] [Qed] Goal typed_jobG_assigns_exit : Valid
-[wp] [Qed] Goal typed_jobG_assigns_normal : Valid
+[wp] [Valid] typed_jobA_assigns_exit (Qed)
+[wp] [Valid] typed_jobA_assigns_normal (Qed)
+[wp] [Valid] typed_jobG_assigns_exit (Qed)
+[wp] [Valid] typed_jobG_assigns_normal (Qed)
[wp] Proved goals: 4 / 4
Qed: 4
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigned_initialized_memtyped.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigned_initialized_memtyped.res.oracle
index 45ebd705372..819af00860d 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigned_initialized_memtyped.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigned_initialized_memtyped.res.oracle
@@ -3,48 +3,48 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 42 goals scheduled
-[wp] [Alt-Ergo] Goal typed_initialize_loop_invariant_CHECK_preserved : Valid
-[wp] [Qed] Goal typed_initialize_loop_invariant_CHECK_established : Valid
-[wp] [Alt-Ergo] Goal typed_initialize_check_CHECK : Valid
-[wp] [Qed] Goal typed_initialize_loop_assigns_part1 : Valid
-[wp] [Qed] Goal typed_initialize_loop_assigns_part2 : Valid
-[wp] [Qed] Goal typed_initialize_loop_assigns_part3 : Valid
-[wp] [Alt-Ergo] Goal typed_range_check_FAILS : Unsuccess
-[wp] [Qed] Goal typed_range_loop_assigns_part1 : Valid
-[wp] [Qed] Goal typed_range_loop_assigns_part2 : Valid
-[wp] [Qed] Goal typed_range_loop_assigns_part3 : Valid
-[wp] [Alt-Ergo] Goal typed_field_check_FAILS : Unsuccess
-[wp] [Qed] Goal typed_field_loop_assigns_part1 : Valid
-[wp] [Qed] Goal typed_field_loop_assigns_part2 : Valid
-[wp] [Alt-Ergo] Goal typed_array_check_FAILS : Unsuccess
-[wp] [Qed] Goal typed_array_loop_assigns_part1 : Valid
-[wp] [Qed] Goal typed_array_loop_assigns_part2 : Valid
-[wp] [Qed] Goal typed_array_loop_assigns_part3 : Valid
-[wp] [Alt-Ergo] Goal typed_index_check_FAILS : Unsuccess
-[wp] [Qed] Goal typed_index_loop_assigns_part1 : Valid
-[wp] [Qed] Goal typed_index_loop_assigns_part2 : Valid
-[wp] [Qed] Goal typed_index_loop_assigns_part3 : Valid
-[wp] [Alt-Ergo] Goal typed_descr_check_FAILS : Unsuccess
-[wp] [Qed] Goal typed_descr_loop_assigns_part1 : Valid
-[wp] [Alt-Ergo] Goal typed_descr_loop_assigns_part2 : Valid
-[wp] [Qed] Goal typed_descr_loop_assigns_part3 : Valid
-[wp] [Qed] Goal typed_descr_loop_assigns_part4 : Valid
-[wp] [Qed] Goal typed_descr_loop_assigns_part5 : Valid
-[wp] [Alt-Ergo] Goal typed_comp_check_FAILS : Unsuccess
-[wp] [Qed] Goal typed_comp_loop_assigns_part1 : Valid
-[wp] [Qed] Goal typed_comp_loop_assigns_part2 : Valid
-[wp] [Qed] Goal typed_comp_loop_assigns_part3 : Valid
-[wp] [Alt-Ergo] Goal typed_assigned_glob_check_FAILS : Unsuccess
-[wp] [Alt-Ergo] Goal typed_assigned_glob_loop_invariant_CHECK_preserved : Valid
-[wp] [Qed] Goal typed_assigned_glob_loop_invariant_CHECK_established : Valid
-[wp] [Alt-Ergo] Goal typed_assigned_glob_check_FAILS_2 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_assigned_glob_check_FAILS_3 : Unsuccess
-[wp] [Qed] Goal typed_assigned_glob_loop_assigns_part1 : Valid
-[wp] [Qed] Goal typed_assigned_glob_loop_assigns_part2 : Valid
-[wp] [Qed] Goal typed_assigned_glob_loop_assigns_part3 : Valid
-[wp] [Qed] Goal typed_assigned_glob_loop_assigns_2_part1 : Valid
-[wp] [Qed] Goal typed_assigned_glob_loop_assigns_2_part2 : Valid
-[wp] [Qed] Goal typed_assigned_glob_loop_assigns_2_part3 : Valid
+[wp] [Valid] typed_initialize_loop_invariant_CHECK_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_initialize_loop_invariant_CHECK_established (Qed)
+[wp] [Valid] typed_initialize_check_CHECK (Alt-Ergo) (Cached)
+[wp] [Valid] typed_initialize_loop_assigns_part1 (Qed)
+[wp] [Valid] typed_initialize_loop_assigns_part2 (Qed)
+[wp] [Valid] typed_initialize_loop_assigns_part3 (Qed)
+[wp] [Timeout] typed_range_check_FAILS (Alt-Ergo) (Cached)
+[wp] [Valid] typed_range_loop_assigns_part1 (Qed)
+[wp] [Valid] typed_range_loop_assigns_part2 (Qed)
+[wp] [Valid] typed_range_loop_assigns_part3 (Qed)
+[wp] [Timeout] typed_field_check_FAILS (Alt-Ergo) (Cached)
+[wp] [Valid] typed_field_loop_assigns_part1 (Qed)
+[wp] [Valid] typed_field_loop_assigns_part2 (Qed)
+[wp] [Timeout] typed_array_check_FAILS (Alt-Ergo) (Cached)
+[wp] [Valid] typed_array_loop_assigns_part1 (Qed)
+[wp] [Valid] typed_array_loop_assigns_part2 (Qed)
+[wp] [Valid] typed_array_loop_assigns_part3 (Qed)
+[wp] [Timeout] typed_index_check_FAILS (Alt-Ergo) (Cached)
+[wp] [Valid] typed_index_loop_assigns_part1 (Qed)
+[wp] [Valid] typed_index_loop_assigns_part2 (Qed)
+[wp] [Valid] typed_index_loop_assigns_part3 (Qed)
+[wp] [Timeout] typed_descr_check_FAILS (Alt-Ergo) (Cached)
+[wp] [Valid] typed_descr_loop_assigns_part1 (Qed)
+[wp] [Valid] typed_descr_loop_assigns_part2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_descr_loop_assigns_part3 (Qed)
+[wp] [Valid] typed_descr_loop_assigns_part4 (Qed)
+[wp] [Valid] typed_descr_loop_assigns_part5 (Qed)
+[wp] [Timeout] typed_comp_check_FAILS (Alt-Ergo) (Cached)
+[wp] [Valid] typed_comp_loop_assigns_part1 (Qed)
+[wp] [Valid] typed_comp_loop_assigns_part2 (Qed)
+[wp] [Valid] typed_comp_loop_assigns_part3 (Qed)
+[wp] [Unknown] typed_assigned_glob_check_FAILS (Alt-Ergo) (Cached)
+[wp] [Valid] typed_assigned_glob_loop_invariant_CHECK_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_assigned_glob_loop_invariant_CHECK_established (Qed)
+[wp] [Timeout] typed_assigned_glob_check_FAILS_2 (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_assigned_glob_check_FAILS_3 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_assigned_glob_loop_assigns_part1 (Qed)
+[wp] [Valid] typed_assigned_glob_loop_assigns_part2 (Qed)
+[wp] [Valid] typed_assigned_glob_loop_assigns_part3 (Qed)
+[wp] [Valid] typed_assigned_glob_loop_assigns_2_part1 (Qed)
+[wp] [Valid] typed_assigned_glob_loop_assigns_2_part2 (Qed)
+[wp] [Valid] typed_assigned_glob_loop_assigns_2_part3 (Qed)
[wp] Proved goals: 33 / 42
Qed: 29
Alt-Ergo: 4 (unsuccess: 9)
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigned_initialized_memvar.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigned_initialized_memvar.res.oracle
index b361a37e928..8e58fd14848 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigned_initialized_memvar.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigned_initialized_memvar.res.oracle
@@ -3,32 +3,32 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 26 goals scheduled
-[wp] [Alt-Ergo] Goal typed_initialize_loop_invariant_CHECK_preserved : Valid
-[wp] [Qed] Goal typed_initialize_loop_invariant_CHECK_established : Valid
-[wp] [Alt-Ergo] Goal typed_initialize_check_CHECK : Valid
-[wp] [Qed] Goal typed_initialize_loop_assigns : Valid
-[wp] [Alt-Ergo] Goal typed_range_loop_invariant_CHECK_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_range_loop_invariant_CHECK_established : Valid
-[wp] [Qed] Goal typed_range_check_CHECK : Valid
-[wp] [Qed] Goal typed_range_loop_assigns_part1 : Valid
-[wp] [Qed] Goal typed_range_loop_assigns_part2 : Valid
-[wp] [Alt-Ergo] Goal typed_field_check_FAILS : Unsuccess
-[wp] [Qed] Goal typed_field_loop_assigns : Valid
-[wp] [Alt-Ergo] Goal typed_array_check_FAILS : Unsuccess
-[wp] [Qed] Goal typed_array_loop_assigns : Valid
-[wp] [Alt-Ergo] Goal typed_index_check_FAILS : Unsuccess
-[wp] [Qed] Goal typed_index_loop_assigns_part1 : Valid
-[wp] [Qed] Goal typed_index_loop_assigns_part2 : Valid
-[wp] [Alt-Ergo] Goal typed_descr_loop_invariant_CHECK_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_descr_loop_invariant_CHECK_established : Valid
-[wp] [Qed] Goal typed_descr_check_CHECK : Valid
-[wp] [Qed] Goal typed_descr_loop_assigns_part1 : Valid
-[wp] [Alt-Ergo] Goal typed_descr_loop_assigns_part2 : Valid
-[wp] [Qed] Goal typed_descr_loop_assigns_part3 : Valid
-[wp] [Qed] Goal typed_descr_loop_assigns_part4 : Valid
-[wp] [Qed] Goal typed_descr_loop_assigns_part5 : Valid
-[wp] [Alt-Ergo] Goal typed_comp_check_FAILS : Unsuccess
-[wp] [Qed] Goal typed_comp_loop_assigns : Valid
+[wp] [Valid] typed_initialize_loop_invariant_CHECK_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_initialize_loop_invariant_CHECK_established (Qed)
+[wp] [Valid] typed_initialize_check_CHECK (Alt-Ergo) (Cached)
+[wp] [Valid] typed_initialize_loop_assigns (Qed)
+[wp] [Valid] typed_range_loop_invariant_CHECK_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_range_loop_invariant_CHECK_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_range_check_CHECK (Qed)
+[wp] [Valid] typed_range_loop_assigns_part1 (Qed)
+[wp] [Valid] typed_range_loop_assigns_part2 (Qed)
+[wp] [Timeout] typed_field_check_FAILS (Alt-Ergo) (Cached)
+[wp] [Valid] typed_field_loop_assigns (Qed)
+[wp] [Timeout] typed_array_check_FAILS (Alt-Ergo) (Cached)
+[wp] [Valid] typed_array_loop_assigns (Qed)
+[wp] [Timeout] typed_index_check_FAILS (Alt-Ergo) (Cached)
+[wp] [Valid] typed_index_loop_assigns_part1 (Qed)
+[wp] [Valid] typed_index_loop_assigns_part2 (Qed)
+[wp] [Valid] typed_descr_loop_invariant_CHECK_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_descr_loop_invariant_CHECK_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_descr_check_CHECK (Qed)
+[wp] [Valid] typed_descr_loop_assigns_part1 (Qed)
+[wp] [Valid] typed_descr_loop_assigns_part2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_descr_loop_assigns_part3 (Qed)
+[wp] [Valid] typed_descr_loop_assigns_part4 (Qed)
+[wp] [Valid] typed_descr_loop_assigns_part5 (Qed)
+[wp] [Timeout] typed_comp_check_FAILS (Alt-Ergo) (Cached)
+[wp] [Valid] typed_comp_loop_assigns (Qed)
[wp] Proved goals: 22 / 26
Qed: 15
Alt-Ergo: 7 (unsuccess: 4)
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigned_not_initialized_memtyped.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigned_not_initialized_memtyped.res.oracle
index 7138409bd8f..f53e5fccc66 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigned_not_initialized_memtyped.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigned_not_initialized_memtyped.res.oracle
@@ -3,15 +3,15 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 9 goals scheduled
-[wp] [Alt-Ergo] Goal typed_atomic_check_FAIL : Unsuccess
-[wp] [Alt-Ergo] Goal typed_comp_check_FAIL : Unsuccess
-[wp] [Alt-Ergo] Goal typed_array_check_FAIL : Unsuccess
-[wp] [Alt-Ergo] Goal typed_assigned_glob_atomic_check_FAIL : Unsuccess
-[wp] [Alt-Ergo] Goal typed_assigned_glob_atomic_check_OK : Valid
-[wp] [Alt-Ergo] Goal typed_assigned_glob_comp_check_FAIL : Unsuccess
-[wp] [Alt-Ergo] Goal typed_assigned_glob_comp_check_FAIL_2 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_assigned_glob_array_check_FAIL : Unsuccess
-[wp] [Alt-Ergo] Goal typed_assigned_glob_array_check_OK : Valid
+[wp] [Timeout] typed_atomic_check_FAIL (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_comp_check_FAIL (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_array_check_FAIL (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_assigned_glob_atomic_check_FAIL (Alt-Ergo) (Cached)
+[wp] [Valid] typed_assigned_glob_atomic_check_OK (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_assigned_glob_comp_check_FAIL (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_assigned_glob_comp_check_FAIL_2 (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_assigned_glob_array_check_FAIL (Alt-Ergo) (Cached)
+[wp] [Valid] typed_assigned_glob_array_check_OK (Alt-Ergo) (Cached)
[wp] Proved goals: 2 / 9
Qed: 0
Alt-Ergo: 2 (unsuccess: 7)
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigned_not_initialized_memvar.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigned_not_initialized_memvar.res.oracle
index b7400e96ca7..834c73eccee 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigned_not_initialized_memvar.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigned_not_initialized_memvar.res.oracle
@@ -3,9 +3,9 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 3 goals scheduled
-[wp] [Alt-Ergo] Goal typed_atomic_check_FAIL : Unsuccess
-[wp] [Alt-Ergo] Goal typed_comp_check_FAIL : Unsuccess
-[wp] [Alt-Ergo] Goal typed_array_check_FAIL : Unsuccess
+[wp] [Timeout] typed_atomic_check_FAIL (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_comp_check_FAIL (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_array_check_FAIL (Alt-Ergo) (Cached)
[wp] Proved goals: 0 / 3
Alt-Ergo: 0 (unsuccess: 3)
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_path.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_path.res.oracle
index 825667eba07..7d651dfbc94 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_path.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_path.res.oracle
@@ -3,15 +3,15 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 9 goals scheduled
-[wp] [Qed] Goal typed_job_ensures_N : Valid
-[wp] [Alt-Ergo] Goal typed_job_ensures_A : Valid
-[wp] [Qed] Goal typed_job_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_job_loop_invariant_established : Valid
-[wp] [Alt-Ergo] Goal typed_job_loop_invariant_2_preserved : Valid
-[wp] [Qed] Goal typed_job_loop_invariant_2_established : Valid
-[wp] [Qed] Goal typed_job_loop_assigns : Valid
-[wp] [Qed] Goal typed_job_assigns_part1 : Valid
-[wp] [Qed] Goal typed_job_assigns_part2 : Valid
+[wp] [Valid] typed_job_ensures_N (Qed)
+[wp] [Valid] typed_job_ensures_A (Alt-Ergo) (Cached)
+[wp] [Valid] typed_job_loop_invariant_preserved (Qed)
+[wp] [Valid] typed_job_loop_invariant_established (Qed)
+[wp] [Valid] typed_job_loop_invariant_2_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_job_loop_invariant_2_established (Qed)
+[wp] [Valid] typed_job_loop_assigns (Qed)
+[wp] [Valid] typed_job_assigns_part1 (Qed)
+[wp] [Valid] typed_job_assigns_part2 (Qed)
[wp] Proved goals: 9 / 9
Qed: 7
Alt-Ergo: 2
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_range.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_range.0.res.oracle
index a1167da627e..73d554b7c76 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_range.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_range.0.res.oracle
@@ -3,23 +3,23 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 17 goals scheduled
-[wp] [Qed] Goal typed_call_assigns_all_assigns_exit_part1 : Valid
-[wp] [Qed] Goal typed_call_assigns_all_assigns_exit_part2 : Valid
-[wp] [Qed] Goal typed_call_assigns_all_assigns_exit_part3 : Valid
-[wp] [Qed] Goal typed_call_assigns_all_assigns_exit_part4 : Valid
-[wp] [Qed] Goal typed_call_assigns_all_assigns_exit_part5 : Valid
-[wp] [Qed] Goal typed_call_assigns_all_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_call_assigns_all_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_call_assigns_all_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_call_assigns_all_assigns_normal_part4 : Valid
-[wp] [Qed] Goal typed_call_assigns_all_assigns_normal_part5 : Valid
-[wp] [Alt-Ergo] Goal typed_call_assigns_all_call_assigns_t1_an_element_requires : Valid
-[wp] [Qed] Goal typed_call_assigns_all_call_assigns_t2_bound_requires : Valid
-[wp] [Qed] Goal typed_call_assigns_all_call_assigns_t3_inf_bound_requires : Valid
-[wp] [Qed] Goal typed_call_assigns_all_call_assigns_t4_sup_bound_requires : Valid
-[wp] [Alt-Ergo] Goal typed_call_assigns_t1_call_assigns_t1_an_element_requires : Valid
-[wp] [Alt-Ergo] Goal typed_call_assigns_t2_call_assigns_t2_bound_requires : Valid
-[wp] [Qed] Goal typed_call_assigns_t4_call_assigns_t4_sup_bound_requires : Valid
+[wp] [Valid] typed_call_assigns_all_assigns_exit_part1 (Qed)
+[wp] [Valid] typed_call_assigns_all_assigns_exit_part2 (Qed)
+[wp] [Valid] typed_call_assigns_all_assigns_exit_part3 (Qed)
+[wp] [Valid] typed_call_assigns_all_assigns_exit_part4 (Qed)
+[wp] [Valid] typed_call_assigns_all_assigns_exit_part5 (Qed)
+[wp] [Valid] typed_call_assigns_all_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_call_assigns_all_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_call_assigns_all_assigns_normal_part3 (Qed)
+[wp] [Valid] typed_call_assigns_all_assigns_normal_part4 (Qed)
+[wp] [Valid] typed_call_assigns_all_assigns_normal_part5 (Qed)
+[wp] [Valid] typed_call_assigns_all_call_assigns_t1_an_element_requires (Alt-Ergo) (Cached)
+[wp] [Valid] typed_call_assigns_all_call_assigns_t2_bound_requires (Qed)
+[wp] [Valid] typed_call_assigns_all_call_assigns_t3_inf_bound_requires (Qed)
+[wp] [Valid] typed_call_assigns_all_call_assigns_t4_sup_bound_requires (Qed)
+[wp] [Valid] typed_call_assigns_t1_call_assigns_t1_an_element_requires (Alt-Ergo) (Cached)
+[wp] [Valid] typed_call_assigns_t2_call_assigns_t2_bound_requires (Alt-Ergo) (Cached)
+[wp] [Valid] typed_call_assigns_t4_call_assigns_t4_sup_bound_requires (Qed)
[wp] Proved goals: 17 / 17
Qed: 14
Alt-Ergo: 3
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_range.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_range.1.res.oracle
index 8e75f33c163..f2447e801f8 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_range.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_range.1.res.oracle
@@ -3,12 +3,12 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 6 goals scheduled
-[wp] [Alt-Ergo] Goal typed_call_assigns_t1_assigns_exit : Unsuccess
-[wp] [Alt-Ergo] Goal typed_call_assigns_t1_assigns_normal : Unsuccess
-[wp] [Alt-Ergo] Goal typed_call_assigns_t2_assigns_exit : Unsuccess
-[wp] [Alt-Ergo] Goal typed_call_assigns_t2_assigns_normal : Unsuccess
-[wp] [Alt-Ergo] Goal typed_call_assigns_t4_assigns_exit : Unsuccess
-[wp] [Alt-Ergo] Goal typed_call_assigns_t4_assigns_normal : Unsuccess
+[wp] [Stepout] typed_call_assigns_t1_assigns_exit (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_call_assigns_t1_assigns_normal (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_call_assigns_t2_assigns_exit (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_call_assigns_t2_assigns_normal (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_call_assigns_t4_assigns_exit (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_call_assigns_t4_assigns_normal (Alt-Ergo) (Cached)
[wp] Proved goals: 0 / 6
Alt-Ergo: 0 (unsuccess: 6)
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assumes_labels.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assumes_labels.res.oracle
index d173e90ff4a..7d2a71f8d35 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assumes_labels.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assumes_labels.res.oracle
@@ -3,9 +3,9 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 3 goals scheduled
-[wp] [Qed] Goal typed_foo_assigns : Valid
-[wp] [Qed] Goal typed_foo_b1_ensures : Valid
-[wp] [Qed] Goal typed_bar_check : Valid
+[wp] [Valid] typed_foo_assigns (Qed)
+[wp] [Valid] typed_foo_b1_ensures (Qed)
+[wp] [Valid] typed_bar_check (Qed)
[wp] Proved goals: 3 / 3
Qed: 3
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/axioms.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/axioms.res.oracle
index 2e6f0226f8a..4605df532c3 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/axioms.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/axioms.res.oracle
@@ -3,16 +3,16 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 10 goals scheduled
-[wp] [Alt-Ergo] Goal typed_f_ensures_P_todo : Unsuccess
-[wp] [Alt-Ergo] Goal typed_f_ensures_Q : Valid
-[wp] [Alt-Ergo] Goal typed_f_loop_invariant_Index_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_f_loop_invariant_Index_established : Valid
-[wp] [Alt-Ergo] Goal typed_f_loop_invariant_Positive_preserved : Valid
-[wp] [Qed] Goal typed_f_loop_invariant_Positive_established : Valid
-[wp] [Qed] Goal typed_f_loop_assigns_part1 : Valid
-[wp] [Qed] Goal typed_f_loop_assigns_part2 : Valid
-[wp] [Alt-Ergo] Goal typed_f_loop_assigns_part3 : Valid
-[wp] [Alt-Ergo] Goal typed_f_assigns : Unsuccess
+[wp] [Timeout] typed_f_ensures_P_todo (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_ensures_Q (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_loop_invariant_Index_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_loop_invariant_Index_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_loop_invariant_Positive_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_loop_invariant_Positive_established (Qed)
+[wp] [Valid] typed_f_loop_assigns_part1 (Qed)
+[wp] [Valid] typed_f_loop_assigns_part2 (Qed)
+[wp] [Valid] typed_f_loop_assigns_part3 (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_f_assigns (Alt-Ergo) (Cached)
[wp] Proved goals: 8 / 10
Qed: 3
Alt-Ergo: 5 (unsuccess: 2)
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/base_offset.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/base_offset.res.oracle
index 44e1c94ba9b..ee281896541 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/base_offset.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/base_offset.res.oracle
@@ -3,11 +3,11 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 5 goals scheduled
-[wp] [Qed] Goal typed_f_ensures : Valid
-[wp] [Qed] Goal typed_f_ensures_2 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_3 : Valid
-[wp] [Alt-Ergo] Goal typed_g_check_KO : Unsuccess
-[wp] [Alt-Ergo] Goal typed_g_check_KO_2 : Unsuccess
+[wp] [Valid] typed_f_ensures (Qed)
+[wp] [Valid] typed_f_ensures_2 (Qed)
+[wp] [Valid] typed_f_ensures_3 (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_g_check_KO (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_g_check_KO_2 (Alt-Ergo) (Cached)
[wp] Proved goals: 3 / 5
Qed: 2
Alt-Ergo: 1 (unsuccess: 2)
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/bitwise.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/bitwise.res.oracle
index 980b05bfb36..8544a5ec8e0 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/bitwise.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/bitwise.res.oracle
@@ -3,62 +3,62 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 56 goals scheduled
-[wp] [Qed] Goal typed_band_ensures : Valid
-[wp] [Qed] Goal typed_band_ensures_band0 : Valid
-[wp] [Qed] Goal typed_band_bit0_ensures_band1 : Valid
-[wp] [Qed] Goal typed_band_bit0_ensures_band2 : Valid
-[wp] [Qed] Goal typed_band_bit1_ensures_band3 : Valid
-[wp] [Qed] Goal typed_band_bit2_ensures_band4 : Valid
-[wp] [Qed] Goal typed_band_bit3_ensures_band5 : Valid
-[wp] [Qed] Goal typed_band_bit4_ensures_band6 : Valid
-[wp] [Qed] Goal typed_bor_ensures : Valid
-[wp] [Qed] Goal typed_bor_ensures_bor0 : Valid
-[wp] [Qed] Goal typed_bor_bit1_ensures_bor1 : Valid
-[wp] [Qed] Goal typed_bor_bit2_ensures_bor2 : Valid
-[wp] [Qed] Goal typed_bor_bit3_ensures_bor3 : Valid
-[wp] [Qed] Goal typed_bxor_ensures : Valid
-[wp] [Qed] Goal typed_bxor_bit1_ensures : Valid
-[wp] [Qed] Goal typed_bxor_bit2_ensures : Valid
-[wp] [Qed] Goal typed_bxor_bit3_ensures : Valid
-[wp] [Qed] Goal typed_bnot_ensures : Valid
-[wp] [Qed] Goal typed_lshift_ensures : Valid
-[wp] [Qed] Goal typed_lshift_shift1_ensures_lsl1 : Valid
-[wp] [Qed] Goal typed_lshift_shift1_ensures_lsl2 : Valid
-[wp] [Qed] Goal typed_lshift_shift2_ensures_lsl3 : Valid
-[wp] [Qed] Goal typed_rshift_ensures : Valid
-[wp] [Qed] Goal typed_rshift_shift1_ensures_lsr1 : Valid
-[wp] [Qed] Goal typed_bor_bool_true_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_bor_bool_false_ensures : Valid
-[wp] [Qed] Goal typed_band_bool_true_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_band_bool_false_ensures : Valid
-[wp] [Qed] Goal typed_bxor_bool_true_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_bxor_bool_false_ensures : Valid
-[wp] [Qed] Goal typed_lemma_check : Valid
-[wp] [Qed] Goal typed_lemma_check_2 : Valid
-[wp] [Qed] Goal typed_lemma_check_3 : Valid
-[wp] [Qed] Goal typed_lemma_check_4 : Valid
-[wp] [Qed] Goal typed_lemma_check_5 : Valid
-[wp] [Qed] Goal typed_lemma_check_6 : Valid
-[wp] [Qed] Goal typed_lemma_check_7 : Valid
-[wp] [Qed] Goal typed_cast_uchar_ensures : Valid
-[wp] [Qed] Goal typed_cast_uchar_check_bit_test_ok : Valid
-[wp] [Qed] Goal typed_cast_uchar_check_bit_test1_ok : Valid
-[wp] [Qed] Goal typed_cast_uchar_check_bit_unset_ok : Valid
-[wp] [Qed] Goal typed_cast_uchar_check_bit_set_unset_ok : Valid
-[wp] [Qed] Goal typed_cast_uchar_check_bit_set_unset2_ok : Valid
-[wp] [Qed] Goal typed_cast_uchar_check_bit_defined_ok : Valid
-[wp] [Qed] Goal typed_cast_uchar_check_bit_defined2_ok : Valid
-[wp] [Qed] Goal typed_cast_uchar_check_bit_to_signed_positive_ok : Valid
-[wp] [Qed] Goal typed_cast_uchar_check_bit_to_signed_positive2_ok : Valid
-[wp] [Qed] Goal typed_cast_uchar_check_bit_to_signed_negative_ok : Valid
-[wp] [Qed] Goal typed_cast_uchar_check_bit_to_signed_negative2_ok : Valid
-[wp] [Qed] Goal typed_cast_uchar_check_bit_to_signed_ok : Valid
-[wp] [Qed] Goal typed_cast_uchar_check_bit_to_signed2_ok : Valid
-[wp] [Qed] Goal typed_cast_uchar_check_bit_lsl_lowest_ok : Valid
-[wp] [Qed] Goal typed_cast_uchar_check_bit_lsl_higher_set_ok : Valid
-[wp] [Qed] Goal typed_cast_uchar_check_bit_lsl_higher_unset_ok : Valid
-[wp] [Qed] Goal typed_cast_uchar_check_bit_lsr_set_ok : Valid
-[wp] [Qed] Goal typed_cast_uchar_check_bit_lsr_unset_ok : Valid
+[wp] [Valid] typed_band_ensures (Qed)
+[wp] [Valid] typed_band_ensures_band0 (Qed)
+[wp] [Valid] typed_band_bit0_ensures_band1 (Qed)
+[wp] [Valid] typed_band_bit0_ensures_band2 (Qed)
+[wp] [Valid] typed_band_bit1_ensures_band3 (Qed)
+[wp] [Valid] typed_band_bit2_ensures_band4 (Qed)
+[wp] [Valid] typed_band_bit3_ensures_band5 (Qed)
+[wp] [Valid] typed_band_bit4_ensures_band6 (Qed)
+[wp] [Valid] typed_bor_ensures (Qed)
+[wp] [Valid] typed_bor_ensures_bor0 (Qed)
+[wp] [Valid] typed_bor_bit1_ensures_bor1 (Qed)
+[wp] [Valid] typed_bor_bit2_ensures_bor2 (Qed)
+[wp] [Valid] typed_bor_bit3_ensures_bor3 (Qed)
+[wp] [Valid] typed_bxor_ensures (Qed)
+[wp] [Valid] typed_bxor_bit1_ensures (Qed)
+[wp] [Valid] typed_bxor_bit2_ensures (Qed)
+[wp] [Valid] typed_bxor_bit3_ensures (Qed)
+[wp] [Valid] typed_bnot_ensures (Qed)
+[wp] [Valid] typed_lshift_ensures (Qed)
+[wp] [Valid] typed_lshift_shift1_ensures_lsl1 (Qed)
+[wp] [Valid] typed_lshift_shift1_ensures_lsl2 (Qed)
+[wp] [Valid] typed_lshift_shift2_ensures_lsl3 (Qed)
+[wp] [Valid] typed_rshift_ensures (Qed)
+[wp] [Valid] typed_rshift_shift1_ensures_lsr1 (Qed)
+[wp] [Valid] typed_bor_bool_true_ensures (Qed)
+[wp] [Valid] typed_bor_bool_false_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_band_bool_true_ensures (Qed)
+[wp] [Valid] typed_band_bool_false_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_bxor_bool_true_ensures (Qed)
+[wp] [Valid] typed_bxor_bool_false_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_check (Qed)
+[wp] [Valid] typed_lemma_check_2 (Qed)
+[wp] [Valid] typed_lemma_check_3 (Qed)
+[wp] [Valid] typed_lemma_check_4 (Qed)
+[wp] [Valid] typed_lemma_check_5 (Qed)
+[wp] [Valid] typed_lemma_check_6 (Qed)
+[wp] [Valid] typed_lemma_check_7 (Qed)
+[wp] [Valid] typed_cast_uchar_ensures (Qed)
+[wp] [Valid] typed_cast_uchar_check_bit_test_ok (Qed)
+[wp] [Valid] typed_cast_uchar_check_bit_test1_ok (Qed)
+[wp] [Valid] typed_cast_uchar_check_bit_unset_ok (Qed)
+[wp] [Valid] typed_cast_uchar_check_bit_set_unset_ok (Qed)
+[wp] [Valid] typed_cast_uchar_check_bit_set_unset2_ok (Qed)
+[wp] [Valid] typed_cast_uchar_check_bit_defined_ok (Qed)
+[wp] [Valid] typed_cast_uchar_check_bit_defined2_ok (Qed)
+[wp] [Valid] typed_cast_uchar_check_bit_to_signed_positive_ok (Qed)
+[wp] [Valid] typed_cast_uchar_check_bit_to_signed_positive2_ok (Qed)
+[wp] [Valid] typed_cast_uchar_check_bit_to_signed_negative_ok (Qed)
+[wp] [Valid] typed_cast_uchar_check_bit_to_signed_negative2_ok (Qed)
+[wp] [Valid] typed_cast_uchar_check_bit_to_signed_ok (Qed)
+[wp] [Valid] typed_cast_uchar_check_bit_to_signed2_ok (Qed)
+[wp] [Valid] typed_cast_uchar_check_bit_lsl_lowest_ok (Qed)
+[wp] [Valid] typed_cast_uchar_check_bit_lsl_higher_set_ok (Qed)
+[wp] [Valid] typed_cast_uchar_check_bit_lsl_higher_unset_ok (Qed)
+[wp] [Valid] typed_cast_uchar_check_bit_lsr_set_ok (Qed)
+[wp] [Valid] typed_cast_uchar_check_bit_lsr_unset_ok (Qed)
[wp] Proved goals: 56 / 56
Qed: 53
Alt-Ergo: 3
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/bitwise2.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/bitwise2.res.oracle
index dc9160a870f..cb1d19a92f5 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/bitwise2.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/bitwise2.res.oracle
@@ -3,11 +3,11 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 5 goals scheduled
-[wp] [Qed] Goal typed_job1_ensures : Valid
-[wp] [Qed] Goal typed_job1bis_ensures : Valid
-[wp] [Qed] Goal typed_job2_ensures : Valid
-[wp] [Qed] Goal typed_job3_ensures : Valid
-[wp] [Qed] Goal typed_job4_ensures : Valid
+[wp] [Valid] typed_job1_ensures (Qed)
+[wp] [Valid] typed_job1bis_ensures (Qed)
+[wp] [Valid] typed_job2_ensures (Qed)
+[wp] [Valid] typed_job3_ensures (Qed)
+[wp] [Valid] typed_job4_ensures (Qed)
[wp] Proved goals: 5 / 5
Qed: 5
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/bitwise_idemp.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/bitwise_idemp.res.oracle
index 5e0256b9bc4..4a687712c1a 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/bitwise_idemp.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/bitwise_idemp.res.oracle
@@ -3,12 +3,12 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 6 goals scheduled
-[wp] [Alt-Ergo] Goal typed_land_check_A : Unsuccess
-[wp] [Alt-Ergo] Goal typed_land_check_B : Unsuccess
-[wp] [Alt-Ergo] Goal typed_lor_check_A : Unsuccess
-[wp] [Alt-Ergo] Goal typed_lor_check_B : Unsuccess
-[wp] [Alt-Ergo] Goal typed_lxor_check_A : Unsuccess
-[wp] [Alt-Ergo] Goal typed_lxor_check_B : Unsuccess
+[wp] [Timeout] typed_land_check_A (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_land_check_B (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_lor_check_A (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_lor_check_B (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_lxor_check_A (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_lxor_check_B (Alt-Ergo) (Cached)
[wp] Proved goals: 0 / 6
Alt-Ergo: 0 (unsuccess: 6)
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/block_length.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/block_length.res.oracle
index e01d608c849..fc8b29a037f 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/block_length.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/block_length.res.oracle
@@ -3,26 +3,26 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 20 goals scheduled
-[wp] [Qed] Goal typed_f_ensures_Pt : Valid
-[wp] [Qed] Goal typed_f_ensures_Psiz1 : Valid
-[wp] [Qed] Goal typed_f_ensures_Pmat1 : Valid
-[wp] [Qed] Goal typed_f_ensures_Psiz2 : Valid
-[wp] [Qed] Goal typed_f_ensures_Pmat2 : Valid
-[wp] [Qed] Goal typed_f_ensures_Ps : Valid
-[wp] [Qed] Goal typed_f_ensures_Pts : Valid
-[wp] [Qed] Goal typed_f_ensures_Pt1 : Valid
-[wp] [Qed] Goal typed_f_ensures_Pmat12 : Valid
-[wp] [Qed] Goal typed_f_ensures_Pts1 : Valid
-[wp] [Alt-Ergo] Goal typed_g_ensures_Pt : Valid
-[wp] [Qed] Goal typed_g_ensures_Psiz1 : Valid
-[wp] [Alt-Ergo] Goal typed_g_ensures_Pmat1 : Valid
-[wp] [Qed] Goal typed_g_ensures_Psiz2 : Valid
-[wp] [Alt-Ergo] Goal typed_g_ensures_Pmat2 : Valid
-[wp] [Alt-Ergo] Goal typed_g_ensures_Ps : Valid
-[wp] [Alt-Ergo] Goal typed_g_ensures_Pts : Valid
-[wp] [Alt-Ergo] Goal typed_g_ensures_Pt1 : Valid
-[wp] [Alt-Ergo] Goal typed_g_ensures_Pmat12 : Valid
-[wp] [Alt-Ergo] Goal typed_g_ensures_Pts1 : Valid
+[wp] [Valid] typed_f_ensures_Pt (Qed)
+[wp] [Valid] typed_f_ensures_Psiz1 (Qed)
+[wp] [Valid] typed_f_ensures_Pmat1 (Qed)
+[wp] [Valid] typed_f_ensures_Psiz2 (Qed)
+[wp] [Valid] typed_f_ensures_Pmat2 (Qed)
+[wp] [Valid] typed_f_ensures_Ps (Qed)
+[wp] [Valid] typed_f_ensures_Pts (Qed)
+[wp] [Valid] typed_f_ensures_Pt1 (Qed)
+[wp] [Valid] typed_f_ensures_Pmat12 (Qed)
+[wp] [Valid] typed_f_ensures_Pts1 (Qed)
+[wp] [Valid] typed_g_ensures_Pt (Alt-Ergo) (Cached)
+[wp] [Valid] typed_g_ensures_Psiz1 (Qed)
+[wp] [Valid] typed_g_ensures_Pmat1 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_g_ensures_Psiz2 (Qed)
+[wp] [Valid] typed_g_ensures_Pmat2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_g_ensures_Ps (Alt-Ergo) (Cached)
+[wp] [Valid] typed_g_ensures_Pts (Alt-Ergo) (Cached)
+[wp] [Valid] typed_g_ensures_Pt1 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_g_ensures_Pmat12 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_g_ensures_Pts1 (Alt-Ergo) (Cached)
[wp] Proved goals: 20 / 20
Qed: 12
Alt-Ergo: 8
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/boolean.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/boolean.res.oracle
index 48e6e69aca4..4006e54d3a9 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/boolean.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/boolean.res.oracle
@@ -3,10 +3,10 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 4 goals scheduled
-[wp] [Alt-Ergo] Goal typed_u8_is_continue_ensures : Valid
-[wp] [Qed] Goal typed_u8_is_continue_assigns_part1 : Valid
-[wp] [Qed] Goal typed_u8_is_continue_assigns_part2 : Valid
-[wp] [Qed] Goal typed_u8_is_continue_assigns_part3 : Valid
+[wp] [Valid] typed_u8_is_continue_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_u8_is_continue_assigns_part1 (Qed)
+[wp] [Valid] typed_u8_is_continue_assigns_part2 (Qed)
+[wp] [Valid] typed_u8_is_continue_assigns_part3 (Qed)
[wp] Proved goals: 4 / 4
Qed: 3
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/checks.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/checks.res.oracle
index 7eda1878452..82f65330cdf 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/checks.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/checks.res.oracle
@@ -3,10 +3,10 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 4 goals scheduled
-[wp] [Alt-Ergo] Goal typed_main_check_c1 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_main_assert_a1 : Unsuccess
-[wp] [Qed] Goal typed_main_check_c2 : Valid
-[wp] [Qed] Goal typed_main_assert_a2 : Valid
+[wp] [Stepout] typed_main_check_c1 (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_main_assert_a1 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_main_check_c2 (Qed)
+[wp] [Valid] typed_main_assert_a2 (Qed)
[wp] Proved goals: 2 / 4
Qed: 2
Alt-Ergo: 0 (unsuccess: 2)
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/chunk_typing.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/chunk_typing.res.oracle
index de5777ff704..a5d41edfbce 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/chunk_typing.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/chunk_typing.res.oracle
@@ -3,45 +3,45 @@
[wp] Running WP plugin...
[rte:annot] annotating function function
[wp] 39 goals scheduled
-[wp] [Alt-Ergo] Goal typed_function_ensures : Valid
-[wp] [Qed] Goal typed_function_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_function_loop_invariant_established : Valid
-[wp] [Alt-Ergo] Goal typed_function_loop_invariant_2_preserved : Valid
-[wp] [Qed] Goal typed_function_loop_invariant_2_established : Valid
-[wp] [Alt-Ergo] Goal typed_function_loop_invariant_3_preserved : Valid
-[wp] [Qed] Goal typed_function_loop_invariant_3_established : Valid
-[wp] [Alt-Ergo] Goal typed_function_loop_invariant_4_preserved : Valid
-[wp] [Qed] Goal typed_function_loop_invariant_4_established : Valid
-[wp] [Alt-Ergo] Goal typed_function_loop_invariant_5_preserved : Valid
-[wp] [Qed] Goal typed_function_loop_invariant_5_established : Valid
-[wp] [Alt-Ergo] Goal typed_function_loop_invariant_6_preserved : Valid
-[wp] [Qed] Goal typed_function_loop_invariant_6_established : Valid
-[wp] [Alt-Ergo] Goal typed_function_loop_invariant_7_preserved : Valid
-[wp] [Qed] Goal typed_function_loop_invariant_7_established : Valid
-[wp] [Alt-Ergo] Goal typed_function_loop_invariant_8_preserved : Valid
-[wp] [Qed] Goal typed_function_loop_invariant_8_established : Valid
-[wp] [Alt-Ergo] Goal typed_function_loop_invariant_9_preserved : Valid
-[wp] [Qed] Goal typed_function_loop_invariant_9_established : Valid
-[wp] [Alt-Ergo] Goal typed_function_assert_rte_mem_access : Valid
-[wp] [Alt-Ergo] Goal typed_function_assert_rte_mem_access_2 : Valid
-[wp] [Alt-Ergo] Goal typed_function_assert_rte_mem_access_3 : Valid
-[wp] [Alt-Ergo] Goal typed_function_assert_rte_mem_access_4 : Valid
-[wp] [Alt-Ergo] Goal typed_function_assert_rte_mem_access_5 : Valid
-[wp] [Alt-Ergo] Goal typed_function_assert_rte_mem_access_6 : Valid
-[wp] [Alt-Ergo] Goal typed_function_assert_rte_mem_access_7 : Valid
-[wp] [Alt-Ergo] Goal typed_function_assert_rte_mem_access_8 : Valid
-[wp] [Qed] Goal typed_function_assert_rte_signed_overflow : Valid
-[wp] [Qed] Goal typed_function_loop_assigns_part1 : Valid
-[wp] [Qed] Goal typed_function_loop_assigns_part2 : Valid
-[wp] [Qed] Goal typed_function_loop_assigns_part3 : Valid
-[wp] [Qed] Goal typed_function_loop_assigns_part4 : Valid
-[wp] [Qed] Goal typed_function_loop_assigns_part5 : Valid
-[wp] [Qed] Goal typed_function_loop_assigns_part6 : Valid
-[wp] [Qed] Goal typed_function_loop_assigns_part7 : Valid
-[wp] [Qed] Goal typed_function_loop_assigns_part8 : Valid
-[wp] [Qed] Goal typed_function_loop_assigns_part9 : Valid
-[wp] [Qed] Goal typed_function_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_function_loop_variant_positive : Valid
+[wp] [Valid] typed_function_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_function_loop_invariant_preserved (Qed)
+[wp] [Valid] typed_function_loop_invariant_established (Qed)
+[wp] [Valid] typed_function_loop_invariant_2_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_function_loop_invariant_2_established (Qed)
+[wp] [Valid] typed_function_loop_invariant_3_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_function_loop_invariant_3_established (Qed)
+[wp] [Valid] typed_function_loop_invariant_4_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_function_loop_invariant_4_established (Qed)
+[wp] [Valid] typed_function_loop_invariant_5_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_function_loop_invariant_5_established (Qed)
+[wp] [Valid] typed_function_loop_invariant_6_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_function_loop_invariant_6_established (Qed)
+[wp] [Valid] typed_function_loop_invariant_7_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_function_loop_invariant_7_established (Qed)
+[wp] [Valid] typed_function_loop_invariant_8_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_function_loop_invariant_8_established (Qed)
+[wp] [Valid] typed_function_loop_invariant_9_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_function_loop_invariant_9_established (Qed)
+[wp] [Valid] typed_function_assert_rte_mem_access (Alt-Ergo) (Cached)
+[wp] [Valid] typed_function_assert_rte_mem_access_2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_function_assert_rte_mem_access_3 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_function_assert_rte_mem_access_4 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_function_assert_rte_mem_access_5 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_function_assert_rte_mem_access_6 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_function_assert_rte_mem_access_7 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_function_assert_rte_mem_access_8 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_function_assert_rte_signed_overflow (Qed)
+[wp] [Valid] typed_function_loop_assigns_part1 (Qed)
+[wp] [Valid] typed_function_loop_assigns_part2 (Qed)
+[wp] [Valid] typed_function_loop_assigns_part3 (Qed)
+[wp] [Valid] typed_function_loop_assigns_part4 (Qed)
+[wp] [Valid] typed_function_loop_assigns_part5 (Qed)
+[wp] [Valid] typed_function_loop_assigns_part6 (Qed)
+[wp] [Valid] typed_function_loop_assigns_part7 (Qed)
+[wp] [Valid] typed_function_loop_assigns_part8 (Qed)
+[wp] [Valid] typed_function_loop_assigns_part9 (Qed)
+[wp] [Valid] typed_function_loop_variant_decrease (Qed)
+[wp] [Valid] typed_function_loop_variant_positive (Qed)
[wp] Proved goals: 39 / 39
Qed: 22
Alt-Ergo: 17
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/chunk_typing_usable.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/chunk_typing_usable.res.oracle
index 55692682053..5581c380c94 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/chunk_typing_usable.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/chunk_typing_usable.res.oracle
@@ -4,9 +4,9 @@
[rte:annot] annotating function usable_axiom
[rte:annot] annotating function usable_lemma
[wp] 3 goals scheduled
-[wp] [Alt-Ergo] Goal typed_lemma_provable_lemma : Unsuccess
-[wp] [Alt-Ergo] Goal typed_usable_axiom_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_usable_lemma_ensures : Valid
+[wp] [Timeout] typed_lemma_provable_lemma (Alt-Ergo) (Cached)
+[wp] [Valid] typed_usable_axiom_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_usable_lemma_ensures (Alt-Ergo) (Cached)
[wp] Proved goals: 2 / 3
Qed: 0
Alt-Ergo: 2 (unsuccess: 1)
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.0.res.oracle
index e5e152aa2a0..39b78491b50 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.0.res.oracle
@@ -2,9 +2,9 @@
[kernel] Parsing classify_float.c (with preprocessing)
[wp] Running WP plugin...
[wp] 3 goals scheduled
-[wp] [Alt-Ergo] Goal typed_lemma_InfN_not_finite : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_InfP_not_finite : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_NaN_not_finite : Valid
+[wp] [Valid] typed_lemma_InfN_not_finite (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_InfP_not_finite (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_NaN_not_finite (Alt-Ergo) (Cached)
[wp] Proved goals: 3 / 3
Qed: 0
Alt-Ergo: 3
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.1.res.oracle
index d56892bed73..11f6006d694 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.1.res.oracle
@@ -2,9 +2,9 @@
[kernel] Parsing classify_float.c (with preprocessing)
[wp] Running WP plugin...
[wp] 3 goals scheduled
-[wp] [Qed] Goal typed_real_lemma_InfN_not_finite : Valid
-[wp] [Qed] Goal typed_real_lemma_InfP_not_finite : Valid
-[wp] [Qed] Goal typed_real_lemma_NaN_not_finite : Valid
+[wp] [Valid] typed_real_lemma_InfN_not_finite (Qed)
+[wp] [Valid] typed_real_lemma_InfP_not_finite (Qed)
+[wp] [Valid] typed_real_lemma_NaN_not_finite (Qed)
[wp] Proved goals: 3 / 3
Qed: 3
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/clusters.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/clusters.res.oracle
index b7b48261bc0..aa382b5dae2 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/clusters.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/clusters.res.oracle
@@ -28,21 +28,21 @@
No 'decreases' clause on recursive function 'fp', cannot prove termination
[wp] clusters.i:55: Warning: No decreases clause for fp
[wp] 15 goals scheduled
-[wp] [Qed] Goal typed_simpl_r_terminates : Valid
-[wp] [Alt-Ergo] Goal typed_simpl_r_variant : Valid
-[wp] [Qed] Goal typed_simpl_rf_terminates_part1 : Valid
-[wp] [Alt-Ergo] Goal typed_simpl_rf_terminates_part2 : Unsuccess
-[wp] [Qed] Goal typed_mutual_1_terminates_part1 : Valid
-[wp] [Alt-Ergo] Goal typed_mutual_1_terminates_part2 : Unsuccess
-[wp] [Qed] Goal typed_mutual_2_terminates : Valid
-[wp] [Alt-Ergo] Goal typed_mutual_2_variant : Unsuccess (Degenerated)
-[wp] [Qed] Goal typed_caller_no_cluster_terminates : Valid
-[wp] [Qed] Goal typed_fp_call_point_function_s41 : Valid
-[wp] [Qed] Goal typed_fp_terminates_part1 : Valid
-[wp] [Alt-Ergo] Goal typed_fp_terminates_part2 : Unsuccess
-[wp] [Qed] Goal typed_function_terminates : Valid
-[wp] [Alt-Ergo] Goal typed_function_variant : Unsuccess (Degenerated)
-[wp] [Qed] Goal typed_function_call_fp_requires : Valid
+[wp] [Valid] typed_simpl_r_terminates (Qed)
+[wp] [Valid] typed_simpl_r_variant (Alt-Ergo) (Cached)
+[wp] [Valid] typed_simpl_rf_terminates_part1 (Qed)
+[wp] [Unknown] typed_simpl_rf_terminates_part2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_mutual_1_terminates_part1 (Qed)
+[wp] [Unknown] typed_mutual_1_terminates_part2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_mutual_2_terminates (Qed)
+[wp] [Timeout] typed_mutual_2_variant (Alt-Ergo) (Cached) (Degenerated)
+[wp] [Valid] typed_caller_no_cluster_terminates (Qed)
+[wp] [Valid] typed_fp_call_point_function_s41 (Qed)
+[wp] [Valid] typed_fp_terminates_part1 (Qed)
+[wp] [Unknown] typed_fp_terminates_part2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_function_terminates (Qed)
+[wp] [Timeout] typed_function_variant (Alt-Ergo) (Cached) (Degenerated)
+[wp] [Valid] typed_function_call_fp_requires (Qed)
[wp] Proved goals: 11 / 16
Qed: 9
Alt-Ergo: 1 (unsuccess: 5)
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.res.oracle
index 2631afd542b..e4f16aa718f 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.res.oracle
@@ -4,20 +4,20 @@
[wp] Warning: Missing RTE guards
[wp] 43 goals scheduled
[wp:cnf] CNF=P_A /\ P_A1 /\ P_A2
-[wp] [Qed] Goal typed_f_ensures_a0 : Valid
+[wp] [Valid] typed_f_ensures_a0 (Qed)
[wp:cnf] CNF=P_A \/ P_A1 \/ P_A2
-[wp] [Qed] Goal typed_f_ensures_a1 : Valid
+[wp] [Valid] typed_f_ensures_a1 (Qed)
[wp:cnf] CNF=P_A2
-[wp] [Qed] Goal typed_f_ensures_a2 : Valid
+[wp] [Valid] typed_f_ensures_a2 (Qed)
[wp:cnf] CNF=((not P_A1) \/ P_A2) /\ (P_A1 \/ (not P_A2))
-[wp] [Alt-Ergo] Goal typed_f_ensures_a3 : Valid
+[wp] [Valid] typed_f_ensures_a3 (Alt-Ergo) (Cached)
[wp:cnf] CNF=((not P_A) \/ P_A1) /\ (P_A \/ P_A2)
-[wp] [Alt-Ergo] Goal typed_f_ensures_a4 : Valid
+[wp] [Valid] typed_f_ensures_a4 (Alt-Ergo) (Cached)
[wp:cnf]
CNF=(P_A \/ P_B) /\ (P_A \/ P_B1) /\ (P_A \/ P_B2) /\ (P_A \/ P_C)
/\ (P_A1 \/ P_B) /\ (P_A1 \/ P_B1) /\ (P_A1 \/ P_B2) /\ (P_A1 \/ P_C)
/\ (P_A2 \/ P_B) /\ (P_A2 \/ P_B1) /\ (P_A2 \/ P_B2) /\ (P_A2 \/ P_C)
-[wp] [Alt-Ergo] Goal typed_f_ensures_a5 : Valid
+[wp] [Valid] typed_f_ensures_a5 (Alt-Ergo) (Cached)
[wp:cnf]
CNF=(P_A \/ P_A1 \/ P_A2 \/ P_C) /\ (P_A \/ P_A1 \/ P_A2 \/ P_B \/ P_C)
/\ (P_A \/ P_A1 \/ P_A2 \/ P_B1 \/ P_C)
@@ -26,7 +26,7 @@
/\ (P_A \/ P_A1 \/ P_A2 \/ P_B \/ P_B1 \/ P_C)
/\ (P_A \/ P_A1 \/ P_A2 \/ P_B \/ P_B2 \/ P_C)
/\ (P_A \/ P_A1 \/ P_A2 \/ P_B1 \/ P_B2 \/ P_C)
-[wp] [Alt-Ergo] Goal typed_f_ensures_a6 : Valid
+[wp] [Valid] typed_f_ensures_a6 (Alt-Ergo) (Cached)
[wp:cnf]
CNF=(P_A2 \/ P_C) /\ (P_A2 \/ (not P_B) \/ P_C)
/\ (P_A2 \/ (not P_B1) \/ P_C) /\ (P_A2 \/ P_B2 \/ P_C)
@@ -34,7 +34,7 @@
/\ (P_A2 \/ (not P_B) \/ (not P_B1) \/ P_C)
/\ (P_A2 \/ (not P_B) \/ P_B2 \/ P_C)
/\ (P_A2 \/ (not P_B1) \/ P_B2 \/ P_C)
-[wp] [Alt-Ergo] Goal typed_f_ensures_a7 : Valid
+[wp] [Valid] typed_f_ensures_a7 (Alt-Ergo) (Cached)
[wp:cnf]
CNF=((not P_A1) \/ P_A2 \/ P_C) /\ (P_A1 \/ (not P_A2) \/ P_C)
/\ ((not P_A1) \/ P_A2 \/ (not P_B1) \/ P_B2)
@@ -57,7 +57,7 @@
/\ (P_A1 \/ (not P_A2) \/ (not P_B1) \/ P_B2 \/ P_C)
/\ (P_A1 \/ (not P_A2) \/ P_B1 \/ (not P_B2) \/ P_C)
/\ (P_A1 \/ (not P_A2) \/ P_B1 \/ P_B2 \/ P_C)
-[wp] [Alt-Ergo] Goal typed_f_ensures_a8 : Valid
+[wp] [Valid] typed_f_ensures_a8 (Alt-Ergo) (Cached)
[wp:cnf]
CNF=((not P_A) \/ P_A1 \/ P_C) /\ (P_A \/ P_A2 \/ P_C)
/\ ((not P_A) \/ P_A1 \/ (not P_B) \/ P_B1)
@@ -119,37 +119,37 @@
/\ ((not P_A) \/ P_A1 \/ P_A2 \/ P_B \/ P_B1 \/ P_B2 \/ P_C)
/\ (P_A \/ P_A1 \/ P_A2 \/ (not P_B) \/ P_B1 \/ P_B2 \/ P_C)
/\ (P_A \/ P_A1 \/ P_A2 \/ P_B \/ P_B1 \/ P_B2 \/ P_C)
-[wp] [Alt-Ergo] Goal typed_f_ensures_a9 : Valid
+[wp] [Valid] typed_f_ensures_a9 (Alt-Ergo) (Cached)
[wp:cnf] CNF=P_B /\ P_B1 /\ P_B2 /\ P_C
-[wp] [Qed] Goal typed_f_ensures_b0 : Valid
+[wp] [Valid] typed_f_ensures_b0 (Qed)
[wp:cnf] CNF=P_C /\ (P_B \/ P_B1 \/ P_B2)
-[wp] [Qed] Goal typed_f_ensures_b1 : Valid
+[wp] [Valid] typed_f_ensures_b1 (Qed)
[wp:cnf] CNF=P_C /\ ((not P_B) \/ (not P_B1) \/ P_B2)
-[wp] [Alt-Ergo] Goal typed_f_ensures_b2 : Valid
+[wp] [Valid] typed_f_ensures_b2 (Alt-Ergo) (Cached)
[wp:cnf] CNF=P_C /\ ((not P_B1) \/ P_B2) /\ (P_B1 \/ (not P_B2))
-[wp] [Alt-Ergo] Goal typed_f_ensures_b3 : Valid
+[wp] [Valid] typed_f_ensures_b3 (Alt-Ergo) (Cached)
[wp:cnf] CNF=P_C /\ ((not P_B) \/ P_B1) /\ (P_B \/ P_B2)
-[wp] [Alt-Ergo] Goal typed_f_ensures_b4 : Valid
+[wp] [Valid] typed_f_ensures_b4 (Alt-Ergo) (Cached)
[wp:cnf] CNF=true
-[wp] [Qed] Goal typed_f_ensures_b5 : Valid
+[wp] [Valid] typed_f_ensures_b5 (Qed)
[wp:cnf] CNF=P_B \/ P_B1 \/ P_B2 \/ P_C1
-[wp] [Qed] Goal typed_f_ensures_b6 : Valid
-[wp] [Qed] Goal typed_f_ensures_b7 : Valid
-[wp] [Qed] Goal typed_f_ensures_b8 : Valid
+[wp] [Valid] typed_f_ensures_b6 (Qed)
+[wp] [Valid] typed_f_ensures_b7 (Qed)
+[wp] [Valid] typed_f_ensures_b8 (Qed)
[wp:cnf] CNF=true
-[wp] [Qed] Goal typed_f_ensures_b9 : Valid
+[wp] [Valid] typed_f_ensures_b9 (Qed)
[wp:cnf] CNF=(P_B \/ P_C) /\ (P_B1 \/ P_C) /\ (P_B2 \/ P_C)
-[wp] [Alt-Ergo] Goal typed_f_ensures_c0 : Valid
+[wp] [Valid] typed_f_ensures_c0 (Alt-Ergo) (Cached)
[wp:cnf] CNF=P_B \/ P_B1 \/ P_B2 \/ P_C
-[wp] [Qed] Goal typed_f_ensures_c1 : Valid
+[wp] [Valid] typed_f_ensures_c1 (Qed)
[wp:cnf] CNF=P_B2 \/ P_C
-[wp] [Qed] Goal typed_f_ensures_c2 : Valid
+[wp] [Valid] typed_f_ensures_c2 (Qed)
[wp:cnf] CNF=((not P_B1) \/ P_B2 \/ P_C) /\ (P_B1 \/ (not P_B2) \/ P_C)
-[wp] [Alt-Ergo] Goal typed_f_ensures_c3 : Valid
+[wp] [Valid] typed_f_ensures_c3 (Alt-Ergo) (Cached)
[wp:cnf]
CNF=((not P_B) \/ P_B1 \/ P_C) /\ (P_B \/ P_B2 \/ P_C)
/\ ((not P_B) \/ P_B1 \/ P_B2 \/ P_C) /\ (P_B \/ P_B1 \/ P_B2 \/ P_C)
-[wp] [Alt-Ergo] Goal typed_f_ensures_c4 : Valid
+[wp] [Valid] typed_f_ensures_c4 (Alt-Ergo) (Cached)
[wp:cnf]
CNF=(P_B \/ (not P_C) \/ (not P_C1)) /\ (P_B \/ P_C \/ P_C1)
/\ (P_B1 \/ (not P_C) \/ (not P_C1)) /\ (P_B1 \/ P_C \/ P_C1)
@@ -178,7 +178,7 @@
/\ (P_B \/ (not P_B1) \/ (not P_B2) \/ P_C \/ P_C1)
/\ (P_B \/ (not P_B1) \/ P_B2 \/ P_C \/ P_C1)
/\ (P_B \/ P_B1 \/ (not P_B2) \/ P_C \/ P_C1)
-[wp] [Alt-Ergo] Goal typed_f_ensures_c5 : Valid
+[wp] [Valid] typed_f_ensures_c5 (Alt-Ergo) (Cached)
[wp:cnf]
CNF=((not P_B) \/ P_C1) /\ ((not P_B1) \/ P_C1) /\ ((not P_B2) \/ P_C1)
/\ ((not P_B) \/ (not P_B1) \/ P_C1)
@@ -205,7 +205,7 @@
/\ (P_B \/ P_B1 \/ (not P_B2) \/ (not P_C) \/ P_C1)
/\ (P_B \/ P_B1 \/ P_B2 \/ (not P_C) \/ (not P_C1))
/\ (P_B \/ P_B1 \/ P_B2 \/ P_C \/ P_C1)
-[wp] [Alt-Ergo] Goal typed_f_ensures_c6 : Valid
+[wp] [Valid] typed_f_ensures_c6 (Alt-Ergo) (Cached)
[wp:cnf]
CNF=((not P_B2) \/ P_C1) /\ (P_B \/ P_C1) /\ (P_B1 \/ P_C1)
/\ ((not P_B) \/ (not P_B2) \/ P_C1) /\ ((not P_B) \/ P_B1 \/ P_C1)
@@ -231,72 +231,72 @@
/\ ((not P_B) \/ (not P_B1) \/ P_B2 \/ P_C \/ P_C1)
/\ ((not P_B) \/ P_B1 \/ P_B2 \/ (not P_C) \/ P_C1)
/\ (P_B \/ (not P_B1) \/ P_B2 \/ (not P_C) \/ P_C1)
-[wp] [Alt-Ergo] Goal typed_f_ensures_c7 : Valid
+[wp] [Valid] typed_f_ensures_c7 (Alt-Ergo) (Cached)
[wp:cnf] Too big CNF/DNF
[wp:cnf]
CNF=((P_C \/ (P_B2 <-> P_B1)) -> ((P_B2 <-> P_B1) <-> P_C1))
/\ (((P_B2 <-> P_B1) <-> P_C1) -> (P_C \/ (P_B2 <-> P_B1)))
-[wp] [Alt-Ergo] Goal typed_f_ensures_c8 : Valid
+[wp] [Valid] typed_f_ensures_c8 (Alt-Ergo) (Cached)
[wp:cnf] Too big CNF/DNF
[wp:cnf]
CNF=((P_C \/ ((P_B -> P_B1) /\ ((not P_B) -> P_B2)))
-> ((P_B2 <-> P_B1) <-> P_C1))
/\ (((P_B2 <-> P_B1) <-> P_C1)
-> (P_C \/ ((P_B -> P_B1) /\ ((not P_B) -> P_B2))))
-[wp] [Alt-Ergo] Goal typed_f_ensures_c9 : Valid
+[wp] [Valid] typed_f_ensures_c9 (Alt-Ergo) (Cached)
[wp:cnf]
CNF=(P_B \/ (not P_C)) /\ (P_B1 \/ (not P_C)) /\ (P_B2 \/ (not P_C))
/\ ((not P_B) \/ (not P_B1) \/ (not P_B2) \/ P_C)
-[wp] [Alt-Ergo] Goal typed_f_ensures_d0 : Valid
+[wp] [Valid] typed_f_ensures_d0 (Alt-Ergo) (Cached)
[wp:cnf]
CNF=((not P_B) \/ P_C) /\ ((not P_B1) \/ P_C) /\ ((not P_B2) \/ P_C)
/\ (P_B \/ P_B1 \/ P_B2 \/ (not P_C))
-[wp] [Alt-Ergo] Goal typed_f_ensures_d1 : Valid
+[wp] [Valid] typed_f_ensures_d1 (Alt-Ergo) (Cached)
[wp:cnf]
CNF=((not P_B2) \/ P_C) /\ (P_B \/ P_C) /\ (P_B1 \/ P_C)
/\ ((not P_B) \/ (not P_B1) \/ P_B2 \/ (not P_C))
-[wp] [Alt-Ergo] Goal typed_f_ensures_d2 : Valid
+[wp] [Valid] typed_f_ensures_d2 (Alt-Ergo) (Cached)
[wp:cnf]
CNF=((not P_B1) \/ (not P_B2) \/ P_C) /\ ((not P_B1) \/ P_B2 \/ (not P_C))
/\ (P_B1 \/ (not P_B2) \/ (not P_C)) /\ (P_B1 \/ P_B2 \/ P_C)
-[wp] [Alt-Ergo] Goal typed_f_ensures_d3 : Valid
+[wp] [Valid] typed_f_ensures_d3 (Alt-Ergo) (Cached)
[wp:cnf]
CNF=((not P_B) \/ (not P_B1) \/ P_C) /\ ((not P_B) \/ P_B1 \/ (not P_C))
/\ ((not P_B1) \/ (not P_B2) \/ P_C) /\ (P_B \/ (not P_B2) \/ P_C)
/\ (P_B \/ P_B2 \/ (not P_C))
/\ ((not P_B) \/ P_B1 \/ P_B2 \/ (not P_C))
/\ (P_B \/ P_B1 \/ P_B2 \/ (not P_C))
-[wp] [Alt-Ergo] Goal typed_f_ensures_d4 : Valid
+[wp] [Valid] typed_f_ensures_d4 (Alt-Ergo) (Cached)
[wp:cnf]
CNF=((not P_B1) \/ P_B2) /\ (P_B \/ (not P_B1)) /\ (P_B \/ (not P_B2))
/\ (P_B \/ (not P_C)) /\ (P_B1 \/ (not P_B2)) /\ (P_B1 \/ (not P_C))
/\ (P_B2 \/ (not P_C))
-[wp] [Alt-Ergo] Goal typed_f_ensures_d5 : Valid
+[wp] [Valid] typed_f_ensures_d5 (Alt-Ergo) (Cached)
[wp:cnf]
CNF=((not P_B) \/ P_B1 \/ P_B2 \/ P_C) /\ (P_B \/ P_B1 \/ P_B2 \/ (not P_C))
-[wp] [Alt-Ergo] Goal typed_f_ensures_d6 : Valid
+[wp] [Valid] typed_f_ensures_d6 (Alt-Ergo) (Cached)
[wp:cnf]
CNF=((not P_B) \/ (not P_B1) \/ P_B2) /\ (P_B1 \/ P_B2 \/ P_C)
/\ ((not P_B) \/ (not P_B1) \/ P_B2 \/ (not P_C))
/\ (P_B \/ P_B1 \/ P_B2 \/ P_C)
-[wp] [Alt-Ergo] Goal typed_f_ensures_d7 : Valid
+[wp] [Valid] typed_f_ensures_d7 (Alt-Ergo) (Cached)
[wp:cnf]
CNF=((not P_B1) \/ P_B2) /\ (P_B1 \/ (not P_B2))
/\ ((not P_B1) \/ P_B2 \/ (not P_C))
/\ (P_B1 \/ (not P_B2) \/ (not P_C)) /\ (P_B1 \/ P_B2 \/ P_C)
-[wp] [Alt-Ergo] Goal typed_f_ensures_d8 : Valid
+[wp] [Valid] typed_f_ensures_d8 (Alt-Ergo) (Cached)
[wp:cnf]
CNF=((not P_B) \/ P_B1 \/ (not P_B2)) /\ ((not P_B) \/ P_B1 \/ (not P_C))
/\ (P_B \/ (not P_B1) \/ P_B2) /\ (P_B \/ P_B2 \/ (not P_C))
/\ ((not P_B) \/ P_B1 \/ P_B2 \/ (not P_C))
/\ (P_B \/ P_B1 \/ P_B2 \/ (not P_C))
-[wp] [Alt-Ergo] Goal typed_f_ensures_d9 : Valid
+[wp] [Valid] typed_f_ensures_d9 (Alt-Ergo) (Cached)
[wp:cnf] CNF=P_A /\ ((not P_B) \/ P_C) /\ ((not P_A) \/ (not P_B) \/ P_C)
-[wp] [Alt-Ergo] Goal typed_f_ensures_e0 : Valid
+[wp] [Valid] typed_f_ensures_e0 (Alt-Ergo) (Cached)
[wp:cnf] CNF=P_B /\ ((not P_B) \/ P_C) /\ ((not P_A) \/ (not P_B) \/ P_C)
-[wp] [Alt-Ergo] Goal typed_f_ensures_e1 : Valid
+[wp] [Valid] typed_f_ensures_e1 (Alt-Ergo) (Cached)
[wp:cnf] CNF=P_C /\ ((not P_B) \/ P_C) /\ ((not P_A) \/ (not P_B) \/ P_C)
-[wp] [Alt-Ergo] Goal typed_f_ensures_e2 : Valid
+[wp] [Valid] typed_f_ensures_e2 (Alt-Ergo) (Cached)
[wp] Proved goals: 43 / 43
Qed: 12
Alt-Ergo: 31
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/ctor.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/ctor.res.oracle
index eaecc9714e5..4807ea1a47d 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/ctor.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/ctor.res.oracle
@@ -2,8 +2,8 @@
[kernel] Parsing ctor.i (no preprocessing)
[wp] Running WP plugin...
[wp] 2 goals scheduled
-[wp] [Qed] Goal typed_lemma_cons : Valid
-[wp] [Qed] Goal typed_lemma_diff : Valid
+[wp] [Valid] typed_lemma_cons (Qed)
+[wp] [Valid] typed_lemma_diff (Qed)
[wp] Proved goals: 2 / 2
Qed: 2
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/decreases.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/decreases.0.res.oracle
index a87bf332421..0a1e7ec321d 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/decreases.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/decreases.0.res.oracle
@@ -13,33 +13,33 @@
[wp] decreases.i:105: Warning:
On call to mw2, relation (Rel) does not match caller (Wrong)
[wp] 27 goals scheduled
-[wp] [Qed] Goal typed_fact_terminates : Valid
-[wp] [Alt-Ergo] Goal typed_fact_variant : Valid
-[wp] [Alt-Ergo] Goal typed_fails_fact_variant : Unsuccess
-[wp] [Alt-Ergo] Goal typed_facto_gen_variant : Valid
-[wp] [Alt-Ergo] Goal typed_fails_facto_gen_variant : Unsuccess
-[wp] [Qed] Goal typed_fact_i_terminates_part1 : Valid
-[wp] [Alt-Ergo] Goal typed_fact_i_terminates_part2 : Valid
-[wp] [Alt-Ergo] Goal typed_fact_i_variant : Unsuccess
-[wp] [Qed] Goal typed_fails_fact_i_terminates_part1 : Valid
-[wp] [Alt-Ergo] Goal typed_fails_fact_i_terminates_part2 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_fails_fact_i_variant : Unsuccess
-[wp] [Alt-Ergo] Goal typed_m2_variant_part1 : Valid
-[wp] [Alt-Ergo] Goal typed_m2_variant_part2 : Valid
-[wp] [Alt-Ergo] Goal typed_m1_variant : Valid
-[wp] [Alt-Ergo] Goal typed_missing_variant_part1 : Unsuccess (Degenerated)
-[wp] [Alt-Ergo] Goal typed_missing_variant_part2 : Valid
-[wp] [Qed] Goal typed_mt2_terminates_part1 : Valid
-[wp] [Qed] Goal typed_mt2_terminates_part2 : Valid
-[wp] [Alt-Ergo] Goal typed_mt2_variant_part1 : Valid
-[wp] [Alt-Ergo] Goal typed_mt2_variant_part2 : Valid
-[wp] [Qed] Goal typed_mt1_terminates_part1 : Valid
-[wp] [Alt-Ergo] Goal typed_mt1_terminates_part2 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_mt1_variant : Valid
-[wp] [Alt-Ergo] Goal typed_mw2_variant_part1 : Unsuccess (Degenerated)
-[wp] [Alt-Ergo] Goal typed_mw2_variant_part2 : Valid
-[wp] [Alt-Ergo] Goal typed_mw1_variant : Unsuccess (Degenerated)
-[wp] [Qed] Goal typed_se_variant : Valid
+[wp] [Valid] typed_fact_terminates (Qed)
+[wp] [Valid] typed_fact_variant (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_fails_fact_variant (Alt-Ergo) (Cached)
+[wp] [Valid] typed_facto_gen_variant (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_fails_facto_gen_variant (Alt-Ergo) (Cached)
+[wp] [Valid] typed_fact_i_terminates_part1 (Qed)
+[wp] [Valid] typed_fact_i_terminates_part2 (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_fact_i_variant (Alt-Ergo) (Cached)
+[wp] [Valid] typed_fails_fact_i_terminates_part1 (Qed)
+[wp] [Timeout] typed_fails_fact_i_terminates_part2 (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_fails_fact_i_variant (Alt-Ergo) (Cached)
+[wp] [Valid] typed_m2_variant_part1 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_m2_variant_part2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_m1_variant (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_missing_variant_part1 (Alt-Ergo) (Cached) (Degenerated)
+[wp] [Valid] typed_missing_variant_part2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_mt2_terminates_part1 (Qed)
+[wp] [Valid] typed_mt2_terminates_part2 (Qed)
+[wp] [Valid] typed_mt2_variant_part1 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_mt2_variant_part2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_mt1_terminates_part1 (Qed)
+[wp] [Timeout] typed_mt1_terminates_part2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_mt1_variant (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_mw2_variant_part1 (Alt-Ergo) (Cached) (Degenerated)
+[wp] [Valid] typed_mw2_variant_part2 (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_mw1_variant (Alt-Ergo) (Cached) (Degenerated)
+[wp] [Valid] typed_se_variant (Qed)
[wp] Proved goals: 18 / 27
Qed: 7
Alt-Ergo: 11 (unsuccess: 9)
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/decreases.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/decreases.1.res.oracle
index f18fe8e1bdf..21211b0d7e3 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/decreases.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/decreases.1.res.oracle
@@ -13,33 +13,33 @@
[wp] decreases.i:105: Warning:
On call to mw2, relation (Rel) does not match caller (Wrong)
[wp] 27 goals scheduled
-[wp] [Qed] Goal typed_fact_terminates : Valid
-[wp] [Alt-Ergo] Goal typed_fact_variant : Valid
-[wp] [Alt-Ergo] Goal typed_fails_fact_variant : Unsuccess
-[wp] [Alt-Ergo] Goal typed_facto_gen_variant : Valid
-[wp] [Alt-Ergo] Goal typed_fails_facto_gen_variant : Unsuccess
-[wp] [Qed] Goal typed_fact_i_terminates_part1 : Valid
-[wp] [Alt-Ergo] Goal typed_fact_i_terminates_part2 : Valid
-[wp] [Qed] Goal typed_fact_i_variant : Valid
-[wp] [Qed] Goal typed_fails_fact_i_terminates_part1 : Valid
-[wp] [Alt-Ergo] Goal typed_fails_fact_i_terminates_part2 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_fails_fact_i_variant : Unsuccess
-[wp] [Alt-Ergo] Goal typed_m2_variant_part1 : Valid
-[wp] [Alt-Ergo] Goal typed_m2_variant_part2 : Valid
-[wp] [Alt-Ergo] Goal typed_m1_variant : Valid
-[wp] [Alt-Ergo] Goal typed_missing_variant_part1 : Unsuccess (Degenerated)
-[wp] [Alt-Ergo] Goal typed_missing_variant_part2 : Valid
-[wp] [Qed] Goal typed_mt2_terminates_part1 : Valid
-[wp] [Qed] Goal typed_mt2_terminates_part2 : Valid
-[wp] [Alt-Ergo] Goal typed_mt2_variant_part1 : Valid
-[wp] [Qed] Goal typed_mt2_variant_part2 : Valid
-[wp] [Qed] Goal typed_mt1_terminates_part1 : Valid
-[wp] [Alt-Ergo] Goal typed_mt1_terminates_part2 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_mt1_variant : Valid
-[wp] [Alt-Ergo] Goal typed_mw2_variant_part1 : Unsuccess (Degenerated)
-[wp] [Alt-Ergo] Goal typed_mw2_variant_part2 : Valid
-[wp] [Alt-Ergo] Goal typed_mw1_variant : Unsuccess (Degenerated)
-[wp] [Qed] Goal typed_se_variant : Valid
+[wp] [Valid] typed_fact_terminates (Qed)
+[wp] [Valid] typed_fact_variant (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_fails_fact_variant (Alt-Ergo) (Cached)
+[wp] [Valid] typed_facto_gen_variant (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_fails_facto_gen_variant (Alt-Ergo) (Cached)
+[wp] [Valid] typed_fact_i_terminates_part1 (Qed)
+[wp] [Valid] typed_fact_i_terminates_part2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_fact_i_variant (Qed)
+[wp] [Valid] typed_fails_fact_i_terminates_part1 (Qed)
+[wp] [Timeout] typed_fails_fact_i_terminates_part2 (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_fails_fact_i_variant (Alt-Ergo) (Cached)
+[wp] [Valid] typed_m2_variant_part1 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_m2_variant_part2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_m1_variant (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_missing_variant_part1 (Alt-Ergo) (Cached) (Degenerated)
+[wp] [Valid] typed_missing_variant_part2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_mt2_terminates_part1 (Qed)
+[wp] [Valid] typed_mt2_terminates_part2 (Qed)
+[wp] [Valid] typed_mt2_variant_part1 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_mt2_variant_part2 (Qed)
+[wp] [Valid] typed_mt1_terminates_part1 (Qed)
+[wp] [Timeout] typed_mt1_terminates_part2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_mt1_variant (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_mw2_variant_part1 (Alt-Ergo) (Cached) (Degenerated)
+[wp] [Valid] typed_mw2_variant_part2 (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_mw1_variant (Alt-Ergo) (Cached) (Degenerated)
+[wp] [Valid] typed_se_variant (Qed)
[wp] Proved goals: 19 / 27
Qed: 9
Alt-Ergo: 10 (unsuccess: 8)
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.res.oracle
index 8abf0f34df3..7f84b71732a 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.res.oracle
@@ -3,28 +3,28 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 22 goals scheduled
-[wp] [Alt-Ergo] Goal typed_f_ensures_d0_div_pos_pos : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_d1_div_neg_pos : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_d2_div_pos_neg : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_d3_div_neg_neg : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_d4_div_x_1 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_d5_div_x_minus1 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_d6_div_0_x : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_sd0_div_pos_pos : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_sd1_div_neg_pos : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_sd2_div_pos_neg : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_sd3_div_neg_neg : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_m0_mod_pos_pos : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_m1_mod_neg_pos : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_m2_mod_pos_neg : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_m3_mod_neg_neg : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_m4_mod_x_1 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_m5_mod_x_minus1 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_m6_mod_0_x : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_sm0_mod_pos_pos : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_sm1_mod_neg_pos : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_sm2_mod_pos_neg : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_sm3_mod_neg_neg : Valid
+[wp] [Valid] typed_f_ensures_d0_div_pos_pos (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_d1_div_neg_pos (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_d2_div_pos_neg (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_d3_div_neg_neg (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_d4_div_x_1 (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_d5_div_x_minus1 (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_d6_div_0_x (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_ensures_sd0_div_pos_pos (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_ensures_sd1_div_neg_pos (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_ensures_sd2_div_pos_neg (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_ensures_sd3_div_neg_neg (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_ensures_m0_mod_pos_pos (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_m1_mod_neg_pos (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_m2_mod_pos_neg (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_m3_mod_neg_neg (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_m4_mod_x_1 (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_m5_mod_x_minus1 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_ensures_m6_mod_0_x (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_ensures_sm0_mod_pos_pos (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_ensures_sm1_mod_neg_pos (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_ensures_sm2_mod_pos_neg (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_ensures_sm3_mod_neg_neg (Alt-Ergo) (Cached)
[wp] Proved goals: 22 / 22
Qed: 0
Alt-Ergo: 22
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.res.oracle
index 8abf0f34df3..7f84b71732a 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.res.oracle
@@ -3,28 +3,28 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 22 goals scheduled
-[wp] [Alt-Ergo] Goal typed_f_ensures_d0_div_pos_pos : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_d1_div_neg_pos : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_d2_div_pos_neg : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_d3_div_neg_neg : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_d4_div_x_1 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_d5_div_x_minus1 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_d6_div_0_x : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_sd0_div_pos_pos : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_sd1_div_neg_pos : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_sd2_div_pos_neg : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_sd3_div_neg_neg : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_m0_mod_pos_pos : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_m1_mod_neg_pos : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_m2_mod_pos_neg : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_m3_mod_neg_neg : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_m4_mod_x_1 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_m5_mod_x_minus1 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_m6_mod_0_x : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_sm0_mod_pos_pos : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_sm1_mod_neg_pos : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_sm2_mod_pos_neg : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_sm3_mod_neg_neg : Valid
+[wp] [Valid] typed_f_ensures_d0_div_pos_pos (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_d1_div_neg_pos (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_d2_div_pos_neg (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_d3_div_neg_neg (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_d4_div_x_1 (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_d5_div_x_minus1 (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_d6_div_0_x (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_ensures_sd0_div_pos_pos (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_ensures_sd1_div_neg_pos (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_ensures_sd2_div_pos_neg (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_ensures_sd3_div_neg_neg (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_ensures_m0_mod_pos_pos (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_m1_mod_neg_pos (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_m2_mod_pos_neg (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_m3_mod_neg_neg (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_m4_mod_x_1 (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_m5_mod_x_minus1 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_ensures_m6_mod_0_x (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_ensures_sm0_mod_pos_pos (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_ensures_sm1_mod_neg_pos (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_ensures_sm2_mod_pos_neg (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_ensures_sm3_mod_neg_neg (Alt-Ergo) (Cached)
[wp] Proved goals: 22 / 22
Qed: 0
Alt-Ergo: 22
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.2.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.2.res.oracle
index e0f1fa19f1b..d4089c386c4 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.2.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.2.res.oracle
@@ -3,8 +3,8 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 2 goals scheduled
-[wp] [Alt-Ergo] Goal typed_f_ensures_d7_div_0_x_ko : Unsuccess
-[wp] [Alt-Ergo] Goal typed_f_ensures_m7_mod_0_x_ko : Unsuccess
+[wp] [Stepout] typed_f_ensures_d7_div_0_x_ko (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_f_ensures_m7_mod_0_x_ko (Alt-Ergo) (Cached)
[wp] Proved goals: 0 / 2
Alt-Ergo: 0 (unsuccess: 2)
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/e_imply.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/e_imply.res.oracle
index 163a8786402..82fa40a0e3b 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/e_imply.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/e_imply.res.oracle
@@ -3,48 +3,48 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 42 goals scheduled
-[wp] [Alt-Ergo] Goal typed_f_ensures_p0 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_p1 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_p2 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_p3 : Valid
-[wp] [Qed] Goal typed_f_ensures_p4 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_p5 : Valid
-[wp] [Qed] Goal typed_f_ensures_p6 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_p7 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_p8 : Valid
-[wp] [Qed] Goal typed_f_ensures_p9 : Valid
-[wp] [Qed] Goal typed_f_ensures_i0 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_i1 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_i2 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_i3 : Valid
-[wp] [Qed] Goal typed_f_ensures_i4 : Valid
-[wp] [Qed] Goal typed_f_ensures_i5 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_i6 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_i7 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_i8 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_i9 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_a0 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_a1 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_a2 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_a3 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_a4 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_a5 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_a6 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_a7 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_a8 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_a9 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_o0 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_o1 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_o2 : Valid
-[wp] [Qed] Goal typed_f_ensures_o3 : Valid
-[wp] [Qed] Goal typed_f_ensures_o4 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_o5 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_o6 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_o7 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_o8 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_o9 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_f0 : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_f1 : Valid
+[wp] [Valid] typed_f_ensures_p0 (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_p1 (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_p2 (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_p3 (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_p4 (Qed)
+[wp] [Valid] typed_f_ensures_p5 (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_p6 (Qed)
+[wp] [Valid] typed_f_ensures_p7 (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_p8 (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_p9 (Qed)
+[wp] [Valid] typed_f_ensures_i0 (Qed)
+[wp] [Valid] typed_f_ensures_i1 (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_i2 (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_i3 (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_i4 (Qed)
+[wp] [Valid] typed_f_ensures_i5 (Qed)
+[wp] [Valid] typed_f_ensures_i6 (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_i7 (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_i8 (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_i9 (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_a0 (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_a1 (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_a2 (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_a3 (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_a4 (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_a5 (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_a6 (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_a7 (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_a8 (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_a9 (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_o0 (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_o1 (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_o2 (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_o3 (Qed)
+[wp] [Valid] typed_f_ensures_o4 (Qed)
+[wp] [Valid] typed_f_ensures_o5 (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_o6 (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_o7 (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_o8 (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_o9 (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_f0 (Alt-Ergo)
+[wp] [Valid] typed_f_ensures_f1 (Alt-Ergo)
[wp] Proved goals: 42 / 42
Qed: 8
Alt-Ergo: 34
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/equal.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/equal.res.oracle
index bc4d3a27e1a..0a7d0a62fcd 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/equal.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/equal.res.oracle
@@ -3,12 +3,12 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 6 goals scheduled
-[wp] [Qed] Goal typed_simple_struct_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_simple_array_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_with_array_struct_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_with_ptr_struct_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_with_ptr_array_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_with_ptr_and_array_struct_ensures : Valid
+[wp] [Valid] typed_simple_struct_ensures (Qed)
+[wp] [Valid] typed_simple_array_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_with_array_struct_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_with_ptr_struct_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_with_ptr_array_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_with_ptr_and_array_struct_ensures (Alt-Ergo) (Cached)
[wp] Proved goals: 6 / 6
Qed: 1
Alt-Ergo: 5
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.res.oracle
index 9ba561787d4..44aaf5c6cdd 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.res.oracle
@@ -3,25 +3,25 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 19 goals scheduled
-[wp] [Alt-Ergo] Goal typed_lemma_finite_32_64 : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_finite_32_64_real : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_test_double_compare : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_test_double_compare_greater : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_test_float_compare : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_test_float_compare_greater : Valid
-[wp] [Alt-Ergo] Goal typed_cmp_ff_ensures_DEF : Valid
-[wp] [Alt-Ergo] Goal typed_cmp_ff_ensures_REL1 : Valid
-[wp] [Alt-Ergo] Goal typed_cmp_ff_ensures_REL2 : Valid
-[wp] [Alt-Ergo] Goal typed_cmp_dd_ensures_DEF : Valid
-[wp] [Alt-Ergo] Goal typed_cmp_dd_ensures_REL1 : Valid
-[wp] [Alt-Ergo] Goal typed_cmp_dd_ensures_REL2 : Valid
-[wp] [Alt-Ergo] Goal typed_cmp_fd_ensures_DEF : Valid
-[wp] [Alt-Ergo] Goal typed_cmp_fd_ensures_REL1 : Valid
-[wp] [Alt-Ergo] Goal typed_cmp_fd_ensures_REL2 : Valid
-[wp] [Alt-Ergo] Goal typed_cmp_fd_assert : Valid
-[wp] [Alt-Ergo] Goal typed_cmp_fd_assert_2 : Valid
-[wp] [Qed] Goal typed_cmp_fnan_ensures_POS : Valid
-[wp] [Qed] Goal typed_cmp_fnan_ensures_NEG : Valid
+[wp] [Valid] typed_lemma_finite_32_64 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_finite_32_64_real (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_test_double_compare (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_test_double_compare_greater (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_test_float_compare (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_test_float_compare_greater (Alt-Ergo) (Cached)
+[wp] [Valid] typed_cmp_ff_ensures_DEF (Alt-Ergo) (Cached)
+[wp] [Valid] typed_cmp_ff_ensures_REL1 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_cmp_ff_ensures_REL2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_cmp_dd_ensures_DEF (Alt-Ergo) (Cached)
+[wp] [Valid] typed_cmp_dd_ensures_REL1 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_cmp_dd_ensures_REL2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_cmp_fd_ensures_DEF (Alt-Ergo) (Cached)
+[wp] [Valid] typed_cmp_fd_ensures_REL1 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_cmp_fd_ensures_REL2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_cmp_fd_assert (Alt-Ergo) (Cached)
+[wp] [Valid] typed_cmp_fd_assert_2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_cmp_fnan_ensures_POS (Qed)
+[wp] [Valid] typed_cmp_fnan_ensures_NEG (Qed)
[wp] Proved goals: 19 / 19
Qed: 2
Alt-Ergo: 17
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.1.res.oracle
index 6d1b078148d..a8df3532212 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.1.res.oracle
@@ -3,25 +3,25 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 19 goals scheduled
-[wp] [Qed] Goal typed_real_lemma_finite_32_64 : Valid
-[wp] [Qed] Goal typed_real_lemma_finite_32_64_real : Valid
-[wp] [Alt-Ergo] Goal typed_real_lemma_test_double_compare : Valid
-[wp] [Alt-Ergo] Goal typed_real_lemma_test_double_compare_greater : Valid
-[wp] [Alt-Ergo] Goal typed_real_lemma_test_float_compare : Valid
-[wp] [Alt-Ergo] Goal typed_real_lemma_test_float_compare_greater : Valid
-[wp] [Qed] Goal typed_real_cmp_ff_ensures_DEF : Valid
-[wp] [Qed] Goal typed_real_cmp_ff_ensures_REL1 : Valid
-[wp] [Qed] Goal typed_real_cmp_ff_ensures_REL2 : Valid
-[wp] [Qed] Goal typed_real_cmp_dd_ensures_DEF : Valid
-[wp] [Qed] Goal typed_real_cmp_dd_ensures_REL1 : Valid
-[wp] [Qed] Goal typed_real_cmp_dd_ensures_REL2 : Valid
-[wp] [Qed] Goal typed_real_cmp_fd_ensures_DEF : Valid
-[wp] [Qed] Goal typed_real_cmp_fd_ensures_REL1 : Valid
-[wp] [Qed] Goal typed_real_cmp_fd_ensures_REL2 : Valid
-[wp] [Qed] Goal typed_real_cmp_fd_assert : Valid
-[wp] [Qed] Goal typed_real_cmp_fd_assert_2 : Valid
-[wp] [Qed] Goal typed_real_cmp_fnan_ensures_POS : Valid
-[wp] [Qed] Goal typed_real_cmp_fnan_ensures_NEG : Valid
+[wp] [Valid] typed_real_lemma_finite_32_64 (Qed)
+[wp] [Valid] typed_real_lemma_finite_32_64_real (Qed)
+[wp] [Valid] typed_real_lemma_test_double_compare (Alt-Ergo) (Cached)
+[wp] [Valid] typed_real_lemma_test_double_compare_greater (Alt-Ergo) (Cached)
+[wp] [Valid] typed_real_lemma_test_float_compare (Alt-Ergo) (Cached)
+[wp] [Valid] typed_real_lemma_test_float_compare_greater (Alt-Ergo) (Cached)
+[wp] [Valid] typed_real_cmp_ff_ensures_DEF (Qed)
+[wp] [Valid] typed_real_cmp_ff_ensures_REL1 (Qed)
+[wp] [Valid] typed_real_cmp_ff_ensures_REL2 (Qed)
+[wp] [Valid] typed_real_cmp_dd_ensures_DEF (Qed)
+[wp] [Valid] typed_real_cmp_dd_ensures_REL1 (Qed)
+[wp] [Valid] typed_real_cmp_dd_ensures_REL2 (Qed)
+[wp] [Valid] typed_real_cmp_fd_ensures_DEF (Qed)
+[wp] [Valid] typed_real_cmp_fd_ensures_REL1 (Qed)
+[wp] [Valid] typed_real_cmp_fd_ensures_REL2 (Qed)
+[wp] [Valid] typed_real_cmp_fd_assert (Qed)
+[wp] [Valid] typed_real_cmp_fd_assert_2 (Qed)
+[wp] [Valid] typed_real_cmp_fnan_ensures_POS (Qed)
+[wp] [Valid] typed_real_cmp_fnan_ensures_NEG (Qed)
[wp] Proved goals: 19 / 19
Qed: 15
Alt-Ergo: 4
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_const.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_const.res.oracle
index 3362c14fd99..a7f17ddfd50 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_const.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_const.res.oracle
@@ -6,14 +6,14 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 8 goals scheduled
-[wp] [Alt-Ergo] Goal typed_float_convertible_check : Valid
-[wp] [Alt-Ergo] Goal typed_float_convertible_check_2 : Valid
-[wp] [Alt-Ergo] Goal typed_float_convertible_check_3 : Valid
-[wp] [Alt-Ergo] Goal typed_float_convertible_check_4 : Valid
-[wp] [Alt-Ergo] Goal typed_double_convertible_check : Valid
-[wp] [Alt-Ergo] Goal typed_double_convertible_check_2 : Valid
-[wp] [Alt-Ergo] Goal typed_double_convertible_check_3 : Valid
-[wp] [Alt-Ergo] Goal typed_double_convertible_check_4 : Valid
+[wp] [Valid] typed_float_convertible_check (Alt-Ergo) (Cached)
+[wp] [Valid] typed_float_convertible_check_2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_float_convertible_check_3 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_float_convertible_check_4 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_double_convertible_check (Alt-Ergo) (Cached)
+[wp] [Valid] typed_double_convertible_check_2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_double_convertible_check_3 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_double_convertible_check_4 (Alt-Ergo) (Cached)
[wp] Proved goals: 8 / 8
Qed: 0
Alt-Ergo: 8
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/funvar_inv.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/funvar_inv.res.oracle
index 232ed2e60fe..ef1205af69c 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/funvar_inv.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/funvar_inv.res.oracle
@@ -3,9 +3,9 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 3 goals scheduled
-[wp] [Qed] Goal typed_ref_f_loop_assigns : Valid
-[wp] [Qed] Goal typed_ref_f2_loop_assigns : Valid
-[wp] [Qed] Goal typed_ref_g_loop_assigns : Valid
+[wp] [Valid] typed_ref_f_loop_assigns (Qed)
+[wp] [Valid] typed_ref_f2_loop_assigns (Qed)
+[wp] [Valid] typed_ref_g_loop_assigns (Qed)
[wp] Proved goals: 3 / 3
Qed: 3
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/garbled_opaque_struct.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/garbled_opaque_struct.res.oracle
index 0eddc6bf257..560a24fd6da 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/garbled_opaque_struct.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/garbled_opaque_struct.res.oracle
@@ -7,7 +7,7 @@
[wp] garbled_opaque_struct.i:3: Warning:
Cast with incompatible pointers types (source: sint8*) (target: capture*)
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_g_assert : Unsuccess (Stronger)
+[wp] [Timeout] typed_g_assert (Alt-Ergo) (Cached) (Stronger)
[wp] Proved goals: 0 / 1
Alt-Ergo: 0 (unsuccess: 1)
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/generalized_checks.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/generalized_checks.res.oracle
index 6d8240fdb82..c1e56f988bf 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/generalized_checks.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/generalized_checks.res.oracle
@@ -3,27 +3,27 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 21 goals scheduled
-[wp] [Alt-Ergo] Goal typed_check_lemma_C_ko : Unsuccess
-[wp] [Alt-Ergo] Goal typed_lemma_L_ko : Unsuccess
-[wp] [Alt-Ergo] Goal typed_job_ensures_B : Valid
-[wp] [Alt-Ergo] Goal typed_job_check_ensures_CB1 : Valid
-[wp] [Alt-Ergo] Goal typed_job_check_ensures_CB2_ko : Unsuccess
-[wp] [Qed] Goal typed_job_assigns_exit : Valid
-[wp] [Qed] Goal typed_job_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_job_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_caller_ensures_R : Valid
-[wp] [Alt-Ergo] Goal typed_caller_ensures_R1_ko : Unsuccess
-[wp] [Alt-Ergo] Goal typed_caller_ensures_R2_ko : Unsuccess
-[wp] [Qed] Goal typed_caller_assigns_exit : Valid
-[wp] [Qed] Goal typed_caller_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_caller_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_caller_call_job_requires_A : Valid
-[wp] [Qed] Goal typed_caller_call_job_check_requires_CA1 : Valid
-[wp] [Alt-Ergo] Goal typed_caller_call_job_check_requires_CA2_ko : Unsuccess
-[wp] [Qed] Goal typed_loop_check_loop_invariant_false_but_preserved_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_loop_check_loop_invariant_false_but_preserved_established : Unsuccess
-[wp] [Alt-Ergo] Goal typed_loop_check_implied_by_false_invariant : Unsuccess
-[wp] [Qed] Goal typed_loop_loop_assigns : Valid
+[wp] [Unknown] typed_check_lemma_C_ko (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_lemma_L_ko (Alt-Ergo) (Cached)
+[wp] [Valid] typed_job_ensures_B (Alt-Ergo) (Cached)
+[wp] [Valid] typed_job_check_ensures_CB1 (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_job_check_ensures_CB2_ko (Alt-Ergo) (Cached)
+[wp] [Valid] typed_job_assigns_exit (Qed)
+[wp] [Valid] typed_job_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_job_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_caller_ensures_R (Qed)
+[wp] [Timeout] typed_caller_ensures_R1_ko (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_caller_ensures_R2_ko (Alt-Ergo) (Cached)
+[wp] [Valid] typed_caller_assigns_exit (Qed)
+[wp] [Valid] typed_caller_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_caller_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_caller_call_job_requires_A (Qed)
+[wp] [Valid] typed_caller_call_job_check_requires_CA1 (Qed)
+[wp] [Timeout] typed_caller_call_job_check_requires_CA2_ko (Alt-Ergo) (Cached)
+[wp] [Valid] typed_loop_check_loop_invariant_false_but_preserved_preserved (Qed)
+[wp] [Unknown] typed_loop_check_loop_invariant_false_but_preserved_established (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_loop_check_implied_by_false_invariant (Alt-Ergo) (Cached)
+[wp] [Valid] typed_loop_loop_assigns (Qed)
[wp] Proved goals: 13 / 21
Qed: 11
Alt-Ergo: 2 (unsuccess: 8)
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/global_const_dependencies.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/global_const_dependencies.res.oracle
index 3f93a0b972d..081c8443f48 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/global_const_dependencies.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/global_const_dependencies.res.oracle
@@ -3,7 +3,7 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 1 goal scheduled
-[wp] [Qed] Goal typed_main_assert : Valid
+[wp] [Valid] typed_main_assert (Qed)
[wp] Proved goals: 1 / 1
Qed: 1
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/gnu_zero_array.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/gnu_zero_array.res.oracle
index 2ac1dd590cf..9b406902186 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/gnu_zero_array.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/gnu_zero_array.res.oracle
@@ -5,7 +5,7 @@
[wp] gnu_zero_array.i:14: Warning:
Cast with incompatible pointers types (source: sint8*) (target: S*)
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_main_assert_rte_mem_access : Unsuccess (Stronger)
+[wp] [Timeout] typed_main_assert_rte_mem_access (Alt-Ergo) (Cached) (Stronger)
[wp] Proved goals: 0 / 1
Alt-Ergo: 0 (unsuccess: 1)
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/implicit_enum_cast.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/implicit_enum_cast.res.oracle
index 7be55226988..39f97444bf3 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/implicit_enum_cast.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/implicit_enum_cast.res.oracle
@@ -3,15 +3,15 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 9 goals scheduled
-[wp] [Qed] Goal typed_bar_ensures : Valid
-[wp] [Qed] Goal typed_bar_assigns_exit_part1 : Valid
-[wp] [Qed] Goal typed_bar_assigns_exit_part2 : Valid
-[wp] [Qed] Goal typed_bar_assigns_exit_part3 : Valid
-[wp] [Qed] Goal typed_bar_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_bar_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_bar_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_bar_assigns_normal_part4 : Valid
-[wp] [Qed] Goal typed_bar_assigns_normal_part5 : Valid
+[wp] [Valid] typed_bar_ensures (Qed)
+[wp] [Valid] typed_bar_assigns_exit_part1 (Qed)
+[wp] [Valid] typed_bar_assigns_exit_part2 (Qed)
+[wp] [Valid] typed_bar_assigns_exit_part3 (Qed)
+[wp] [Valid] typed_bar_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_bar_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_bar_assigns_normal_part3 (Qed)
+[wp] [Valid] typed_bar_assigns_normal_part4 (Qed)
+[wp] [Valid] typed_bar_assigns_normal_part5 (Qed)
[wp] Proved goals: 9 / 9
Qed: 9
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_label.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_label.res.oracle
index 42a2712a517..1a5333cde68 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_label.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_label.res.oracle
@@ -5,10 +5,10 @@
No code nor implicit assigns clause for function main, generating default assigns from the prototype
[wp] Warning: Missing RTE guards
[wp] 4 goals scheduled
-[wp] [Qed] Goal typed_main_requires_OK : Valid
-[wp] [Alt-Ergo] Goal typed_job_ensures_OK : Valid
-[wp] [Qed] Goal typed_foreign_ensures_OK : Valid
-[wp] [Alt-Ergo] Goal typed_extra_ensures_KO : Unsuccess
+[wp] [Valid] typed_main_requires_OK (Qed)
+[wp] [Valid] typed_job_ensures_OK (Alt-Ergo) (Cached)
+[wp] [Valid] typed_foreign_ensures_OK (Qed)
+[wp] [Timeout] typed_extra_ensures_KO (Alt-Ergo) (Cached)
[wp] Proved goals: 3 / 4
Qed: 2
Alt-Ergo: 1 (unsuccess: 1)
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.0.res.oracle
index dfbed47d774..764061a4205 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.0.res.oracle
@@ -3,30 +3,30 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 24 goals scheduled
-[wp] [Qed] Goal typed_main_requires_qed_ok_Struct_Simple_a : Valid
-[wp] [Qed] Goal typed_main_requires_qed_ok_Struct_Simple_b : Valid
-[wp] [Qed] Goal typed_main_requires_qed_ok_Simple_Array_0 : Valid
-[wp] [Qed] Goal typed_main_requires_qed_ok_Simple_Array_1 : Valid
-[wp] [Qed] Goal typed_main_requires_qed_ok_With_Array_Struct_5 : Valid
-[wp] [Qed] Goal typed_main_requires_qed_ok_With_Array_Struct_3 : Valid
-[wp] [Alt-Ergo] Goal typed_main_requires_qed_ok_Sc_eq : Valid
-[wp] [Qed] Goal typed_main_requires_qed_ok_Sc_t : Valid
-[wp] [Qed] Goal typed_main_requires_qed_ok_Sc_t_2 : Valid
-[wp] [Qed] Goal typed_main_requires_qed_ok_Sc_c_2 : Valid
-[wp] [Qed] Goal typed_main_requires_qed_ok_Sc_c_3 : Valid
-[wp] [Qed] Goal typed_main_requires_qed_ok_Tab_no_init : Valid
-[wp] [Alt-Ergo] Goal typed_main_requires_qed_ok_Tab_todo : Valid
-[wp] [Qed] Goal typed_main_requires_qed_ok : Valid
-[wp] [Qed] Goal typed_main_requires_qed_ok_2 : Valid
-[wp] [Alt-Ergo] Goal typed_main_requires_qed_ok_3 : Valid
-[wp] [Qed] Goal typed_main_requires_qed_ok_todo : Valid
-[wp] [Qed] Goal typed_main_requires_qed_ok_4 : Valid
-[wp] [Alt-Ergo] Goal typed_main_requires_qed_ok_5 : Valid
-[wp] [Qed] Goal typed_main_requires_qed_ok_direct_init_union : Valid
-[wp] [Qed] Goal typed_fa1_ensures_qed_ok : Valid
-[wp] [Qed] Goal typed_fa2_ensures_qed_ok : Valid
-[wp] [Qed] Goal typed_fa3_ensures_qed_ok : Valid
-[wp] [Alt-Ergo] Goal typed_fs1_ensures_qed_ok : Valid
+[wp] [Valid] typed_main_requires_qed_ok_Struct_Simple_a (Qed)
+[wp] [Valid] typed_main_requires_qed_ok_Struct_Simple_b (Qed)
+[wp] [Valid] typed_main_requires_qed_ok_Simple_Array_0 (Qed)
+[wp] [Valid] typed_main_requires_qed_ok_Simple_Array_1 (Qed)
+[wp] [Valid] typed_main_requires_qed_ok_With_Array_Struct_5 (Qed)
+[wp] [Valid] typed_main_requires_qed_ok_With_Array_Struct_3 (Qed)
+[wp] [Valid] typed_main_requires_qed_ok_Sc_eq (Alt-Ergo) (Cached)
+[wp] [Valid] typed_main_requires_qed_ok_Sc_t (Qed)
+[wp] [Valid] typed_main_requires_qed_ok_Sc_t_2 (Qed)
+[wp] [Valid] typed_main_requires_qed_ok_Sc_c_2 (Qed)
+[wp] [Valid] typed_main_requires_qed_ok_Sc_c_3 (Qed)
+[wp] [Valid] typed_main_requires_qed_ok_Tab_no_init (Qed)
+[wp] [Valid] typed_main_requires_qed_ok_Tab_todo (Alt-Ergo) (Cached)
+[wp] [Valid] typed_main_requires_qed_ok (Qed)
+[wp] [Valid] typed_main_requires_qed_ok_2 (Qed)
+[wp] [Valid] typed_main_requires_qed_ok_3 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_main_requires_qed_ok_todo (Qed)
+[wp] [Valid] typed_main_requires_qed_ok_4 (Qed)
+[wp] [Valid] typed_main_requires_qed_ok_5 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_main_requires_qed_ok_direct_init_union (Qed)
+[wp] [Valid] typed_fa1_ensures_qed_ok (Qed)
+[wp] [Valid] typed_fa2_ensures_qed_ok (Qed)
+[wp] [Valid] typed_fa3_ensures_qed_ok (Qed)
+[wp] [Valid] typed_fs1_ensures_qed_ok (Alt-Ergo) (Cached)
[wp] Proved goals: 24 / 24
Qed: 19
Alt-Ergo: 5
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.res.oracle
index 96e1fe244e4..437f5229878 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.res.oracle
@@ -3,24 +3,24 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 18 goals scheduled
-[wp] [Alt-Ergo] Goal typed_main_ko_requires_qed_ko_Sc_eq_ko : Unsuccess
-[wp] [Alt-Ergo] Goal typed_main_ko_requires_qed_ko_Sc_t : Unsuccess
-[wp] [Alt-Ergo] Goal typed_main_ko_requires_qed_ko_Sc_c_2 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_main_ko_requires_qed_ko_Tab_no_init : Unsuccess
-[wp] [Alt-Ergo] Goal typed_main_ko_requires_qed_ko_With_Array_Struct_3 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_main_ko_requires_qed_ko_Simple_Array_1 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_main_ko_requires_qed_ko_T1_6 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_main_ko_requires_qed_ko_indirect_init_union_b : Unsuccess
-[wp] [Alt-Ergo] Goal typed_main_ko_requires_qed_ko_indirect_init_union_t : Unsuccess
-[wp] [Alt-Ergo] Goal typed_fa1_ensures_qed_ko : Unsuccess
-[wp] [Alt-Ergo] Goal typed_fa1_ensures_qed_ko_2 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_fa2_ensures_qed_ko : Unsuccess
-[wp] [Alt-Ergo] Goal typed_fa2_ensures_qed_ko_2 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_fa3_ensures_qed_ko : Unsuccess
-[wp] [Alt-Ergo] Goal typed_fa3_ensures_qed_ko_2 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_fa3_ensures_qed_ko_3 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_fs1_ensures_qed_ko : Unsuccess
-[wp] [Alt-Ergo] Goal typed_fs1_ensures_qed_ko_2 : Unsuccess
+[wp] [Stepout] typed_main_ko_requires_qed_ko_Sc_eq_ko (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_main_ko_requires_qed_ko_Sc_t (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_main_ko_requires_qed_ko_Sc_c_2 (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_main_ko_requires_qed_ko_Tab_no_init (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_main_ko_requires_qed_ko_With_Array_Struct_3 (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_main_ko_requires_qed_ko_Simple_Array_1 (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_main_ko_requires_qed_ko_T1_6 (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_main_ko_requires_qed_ko_indirect_init_union_b (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_main_ko_requires_qed_ko_indirect_init_union_t (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_fa1_ensures_qed_ko (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_fa1_ensures_qed_ko_2 (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_fa2_ensures_qed_ko (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_fa2_ensures_qed_ko_2 (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_fa3_ensures_qed_ko (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_fa3_ensures_qed_ko_2 (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_fa3_ensures_qed_ko_3 (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_fs1_ensures_qed_ko (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_fs1_ensures_qed_ko_2 (Alt-Ergo) (Cached)
[wp] Proved goals: 0 / 18
Alt-Ergo: 0 (unsuccess: 18)
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value_mem.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value_mem.res.oracle
index 4d2e5f794dd..fb4ed347de9 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value_mem.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value_mem.res.oracle
@@ -3,8 +3,8 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 2 goals scheduled
-[wp] [Alt-Ergo] Goal typed_main_ensures_P : Valid
-[wp] [Alt-Ergo] Goal typed_main_ensures_Q : Valid
+[wp] [Valid] typed_main_ensures_P (Alt-Ergo) (Cached)
+[wp] [Valid] typed_main_ensures_Q (Alt-Ergo) (Cached)
[wp] Proved goals: 2 / 2
Qed: 0
Alt-Ergo: 2
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/initialized_local_init.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/initialized_local_init.res.oracle
index f259918a238..b0fffb93341 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/initialized_local_init.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/initialized_local_init.res.oracle
@@ -3,15 +3,15 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 9 goals scheduled
-[wp] [Qed] Goal typed_l_int_assert_SUCCS : Valid
-[wp] [Qed] Goal typed_l_int_assert_SUCCS_2 : Valid
-[wp] [Alt-Ergo] Goal typed_l_int_check_FAILS : Unsuccess
-[wp] [Alt-Ergo] Goal typed_l_array_assert_SUCCS : Valid
-[wp] [Alt-Ergo] Goal typed_l_array_assert_SUCCS_2 : Valid
-[wp] [Alt-Ergo] Goal typed_l_array_check_FAILS : Unsuccess
-[wp] [Qed] Goal typed_l_struct_assert_SUCCS : Valid
-[wp] [Qed] Goal typed_l_struct_assert_SUCCS_2 : Valid
-[wp] [Alt-Ergo] Goal typed_l_struct_check_FAILS : Unsuccess
+[wp] [Valid] typed_l_int_assert_SUCCS (Qed)
+[wp] [Valid] typed_l_int_assert_SUCCS_2 (Qed)
+[wp] [Unknown] typed_l_int_check_FAILS (Alt-Ergo) (Cached)
+[wp] [Valid] typed_l_array_assert_SUCCS (Alt-Ergo) (Cached)
+[wp] [Valid] typed_l_array_assert_SUCCS_2 (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_l_array_check_FAILS (Alt-Ergo) (Cached)
+[wp] [Valid] typed_l_struct_assert_SUCCS (Qed)
+[wp] [Valid] typed_l_struct_assert_SUCCS_2 (Qed)
+[wp] [Unknown] typed_l_struct_check_FAILS (Alt-Ergo) (Cached)
[wp] Proved goals: 6 / 9
Qed: 4
Alt-Ergo: 2 (unsuccess: 3)
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/initialized_memtyped.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/initialized_memtyped.res.oracle
index 59797277f68..9cbbbaf44b4 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/initialized_memtyped.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/initialized_memtyped.res.oracle
@@ -3,35 +3,35 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 29 goals scheduled
-[wp] [Alt-Ergo] Goal typed_test_check_unknown : Unsuccess
-[wp] [Alt-Ergo] Goal typed_test_check_unknown_2 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_test_check_unknown_3 : Unsuccess
-[wp] [Qed] Goal typed_test_check_qed_ok : Valid
-[wp] [Qed] Goal typed_test_check_qed_ok_2 : Valid
-[wp] [Alt-Ergo] Goal typed_test_check_unknown_4 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_test_check_unknown_5 : Unsuccess
-[wp] [Qed] Goal typed_test_check_qed_ok_3 : Valid
-[wp] [Qed] Goal typed_test_check_qed_ok_4 : Valid
-[wp] [Alt-Ergo] Goal typed_test_check_provable : Valid
-[wp] [Qed] Goal typed_test_check_qed_ok_5 : Valid
-[wp] [Alt-Ergo] Goal typed_test_check_unknown_6 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_test_check_unknown_7 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_test_check_unknown_8 : Unsuccess
-[wp] [Qed] Goal typed_test_check_qed_ok_6 : Valid
-[wp] [Alt-Ergo] Goal typed_test_check_unknown_9 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_test_check_unknown_10 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_test_check_unknown_11 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_test_check_provable_2 : Valid
-[wp] [Alt-Ergo] Goal typed_test_check_unknown_12 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_test_check_provable_3 : Valid
-[wp] [Alt-Ergo] Goal typed_test_check_unknown_13 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_test_check_provable_4 : Valid
-[wp] [Alt-Ergo] Goal typed_glob_var_ensures_provable : Valid
-[wp] [Alt-Ergo] Goal typed_glob_var_ensures_unknown : Unsuccess
-[wp] [Alt-Ergo] Goal typed_glob_arr_ensures_provable : Valid
-[wp] [Alt-Ergo] Goal typed_glob_arr_ensures_unknown : Unsuccess
-[wp] [Alt-Ergo] Goal typed_formal_assert_provable : Valid
-[wp] [Alt-Ergo] Goal typed_ptr_on_local_assert_provable : Valid
+[wp] [Unknown] typed_test_check_unknown (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_test_check_unknown_2 (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_test_check_unknown_3 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_test_check_qed_ok (Qed)
+[wp] [Valid] typed_test_check_qed_ok_2 (Qed)
+[wp] [Unknown] typed_test_check_unknown_4 (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_test_check_unknown_5 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_test_check_qed_ok_3 (Qed)
+[wp] [Valid] typed_test_check_qed_ok_4 (Qed)
+[wp] [Valid] typed_test_check_provable (Alt-Ergo) (Cached)
+[wp] [Valid] typed_test_check_qed_ok_5 (Qed)
+[wp] [Unknown] typed_test_check_unknown_6 (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_test_check_unknown_7 (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_test_check_unknown_8 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_test_check_qed_ok_6 (Qed)
+[wp] [Unknown] typed_test_check_unknown_9 (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_test_check_unknown_10 (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_test_check_unknown_11 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_test_check_provable_2 (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_test_check_unknown_12 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_test_check_provable_3 (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_test_check_unknown_13 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_test_check_provable_4 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_glob_var_ensures_provable (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_glob_var_ensures_unknown (Alt-Ergo) (Cached)
+[wp] [Valid] typed_glob_arr_ensures_provable (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_glob_arr_ensures_unknown (Alt-Ergo) (Cached)
+[wp] [Valid] typed_formal_assert_provable (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ptr_on_local_assert_provable (Alt-Ergo) (Cached)
[wp] Proved goals: 14 / 29
Qed: 6
Alt-Ergo: 8 (unsuccess: 15)
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/initialized_memvar.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/initialized_memvar.res.oracle
index e50494d4d90..396c8780705 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/initialized_memvar.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/initialized_memvar.res.oracle
@@ -3,101 +3,79 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 73 goals scheduled
-[wp] [Qed] Goal typed_globals_check_qed_ok : Valid
-[wp] [Qed] Goal typed_globals_check_qed_ok_2 : Valid
-[wp] [Qed] Goal typed_globals_check_qed_ok_3 : Valid
-[wp] [Failed] Goal typed_globals_check_qed_ko
- Alt-Ergo: Unsuccess
- Script: Unsuccess
-[wp] [Qed] Goal typed_globals_check_qed_ok_4 : Valid
-[wp] [Failed] Goal typed_globals_check_qed_ko_2
- Alt-Ergo: Unsuccess
- Script: Unsuccess
-[wp] [Qed] Goal typed_globals_check_qed_ok_5 : Valid
-[wp] [Qed] Goal typed_globals_check_qed_ok_6 : Valid
-[wp] [Qed] Goal typed_globals_check_qed_ok_7 : Valid
-[wp] [Script] Goal typed_globals_check_provable : Valid
-[wp] [Script] Goal typed_globals_check_provable_2 : Valid
-[wp] [Failed] Goal typed_globals_check_not_provable
- Alt-Ergo: Unsuccess
- Script: Unsuccess
-[wp] [Script] Goal typed_globals_check_provable_3 : Valid
-[wp] [Failed] Goal typed_globals_check_qed_ko_3
- Alt-Ergo: Unsuccess
- Script: Unsuccess
-[wp] [Qed] Goal typed_globals_check_qed_ok_8 : Valid
-[wp] [Qed] Goal typed_globals_check_qed_ok_9 : Valid
-[wp] [Qed] Goal typed_globals_check_qed_ok_10 : Valid
-[wp] [Qed] Goal typed_globals_check_qed_ok_11 : Valid
-[wp] [Qed] Goal typed_globals_check_qed_ok_12 : Valid
-[wp] [Qed] Goal typed_globals_check_qed_ok_13 : Valid
-[wp] [Script] Goal typed_globals_check_provable_4 : Valid
-[wp] [Script] Goal typed_globals_check_provable_5 : Valid
-[wp] [Script] Goal typed_globals_check_provable_6 : Valid
-[wp] [Script] Goal typed_globals_check_provable_7 : Valid
-[wp] [Failed] Goal typed_globals_check_qed_ko_4
- Alt-Ergo: Unsuccess
- Script: Unsuccess
-[wp] [Failed] Goal typed_globals_check_qed_ko_5
- Alt-Ergo: Unsuccess
- Script: Unsuccess
-[wp] [Failed] Goal typed_globals_check_qed_ko_6
- Alt-Ergo: Unsuccess
- Script: Unsuccess
-[wp] [Failed] Goal typed_globals_check_qed_ko_7
- Alt-Ergo: Unsuccess
- Script: Unsuccess
-[wp] [Failed] Goal typed_globals_check_not_provable_2
- Alt-Ergo: Unsuccess
- Script: Unsuccess
-[wp] [Failed] Goal typed_globals_check_not_provable_3
- Alt-Ergo: Unsuccess
- Script: Unsuccess
-[wp] [Failed] Goal typed_globals_check_not_provable_4
- Alt-Ergo: Unsuccess
- Script: Unsuccess
-[wp] [Qed] Goal typed_locals_check_qed_ok : Valid
-[wp] [Qed] Goal typed_locals_check_qed_ok_2 : Valid
-[wp] [Qed] Goal typed_locals_check_qed_ok_3 : Valid
-[wp] [Qed] Goal typed_locals_check_qed_ok_4 : Valid
-[wp] [Qed] Goal typed_locals_check_qed_ok_5 : Valid
-[wp] [Qed] Goal typed_locals_check_qed_ok_6 : Valid
-[wp] [Qed] Goal typed_locals_check_qed_ok_7 : Valid
-[wp] [Qed] Goal typed_locals_check_qed_ok_8 : Valid
-[wp] [Qed] Goal typed_locals_check_qed_ok_9 : Valid
-[wp] [Script] Goal typed_locals_check_provable : Valid
-[wp] [Qed] Goal typed_locals_check_qed_ok_10 : Valid
-[wp] [Qed] Goal typed_locals_check_qed_ok_11 : Valid
-[wp] [Qed] Goal typed_locals_check_qed_ok_12 : Valid
-[wp] [Qed] Goal typed_locals_check_qed_ok_13 : Valid
-[wp] [Qed] Goal typed_locals_check_qed_ok_14 : Valid
-[wp] [Qed] Goal typed_locals_check_qed_ok_15 : Valid
-[wp] [Qed] Goal typed_locals_check_qed_ok_16 : Valid
-[wp] [Qed] Goal typed_locals_check_qed_ok_17 : Valid
-[wp] [Qed] Goal typed_locals_check_qed_ok_18 : Valid
-[wp] [Qed] Goal typed_locals_check_qed_ok_19 : Valid
-[wp] [Script] Goal typed_locals_check_provable_2 : Valid
-[wp] [Qed] Goal typed_locals_check_qed_ok_20 : Valid
-[wp] [Qed] Goal typed_locals_check_qed_ok_21 : Valid
-[wp] [Qed] Goal typed_complex_struct_check_qed_ok : Valid
-[wp] [Qed] Goal typed_complex_struct_check_qed_ok_2 : Valid
-[wp] [Qed] Goal typed_complex_struct_check_qed_ok_3 : Valid
-[wp] [Qed] Goal typed_complex_struct_check_qed_ok_4 : Valid
-[wp] [Qed] Goal typed_complex_struct_check_qed_ok_5 : Valid
-[wp] [Qed] Goal typed_complex_struct_check_qed_ok_6 : Valid
-[wp] [Qed] Goal typed_complex_struct_check_qed_ok_7 : Valid
-[wp] [Qed] Goal typed_complex_struct_check_qed_ok_8 : Valid
-[wp] [Qed] Goal typed_complex_struct_check_qed_ok_9 : Valid
-[wp] [Qed] Goal typed_complex_struct_check_qed_ok_10 : Valid
-[wp] [Qed] Goal typed_complex_struct_check_qed_ok_11 : Valid
-[wp] [Qed] Goal typed_complex_struct_check_qed_ok_12 : Valid
-[wp] [Qed] Goal typed_complex_struct_check_qed_ok_13 : Valid
-[wp] [Qed] Goal typed_complex_struct_check_qed_ok_14 : Valid
-[wp] [Qed] Goal typed_complex_struct_check_qed_ok_15 : Valid
-[wp] [Qed] Goal typed_complex_struct_check_qed_ok_16 : Valid
-[wp] [Qed] Goal typed_complex_struct_check_qed_ok_17 : Valid
-[wp] [Qed] Goal typed_complex_struct_check_qed_ok_18 : Valid
-[wp] [Script] Goal typed_complex_struct_check_provable : Valid
+[wp] [Valid] typed_globals_check_qed_ok (Qed)
+[wp] [Valid] typed_globals_check_qed_ok_2 (Qed)
+[wp] [Valid] typed_globals_check_qed_ok_3 (Qed)
+[wp] [Unknown] typed_globals_check_qed_ko (Alt-Ergo)
+[wp] [Valid] typed_globals_check_qed_ok_4 (Qed)
+[wp] [Unknown] typed_globals_check_qed_ko_2 (Alt-Ergo)
+[wp] [Valid] typed_globals_check_qed_ok_5 (Qed)
+[wp] [Valid] typed_globals_check_qed_ok_6 (Qed)
+[wp] [Valid] typed_globals_check_qed_ok_7 (Qed)
+[wp] [Valid] typed_globals_check_provable (Alt-Ergo) (Cached)
+[wp] [Valid] typed_globals_check_provable_2 (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_globals_check_not_provable (Alt-Ergo)
+[wp] [Valid] typed_globals_check_provable_3 (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_globals_check_qed_ko_3 (Alt-Ergo)
+[wp] [Valid] typed_globals_check_qed_ok_8 (Qed)
+[wp] [Valid] typed_globals_check_qed_ok_9 (Qed)
+[wp] [Valid] typed_globals_check_qed_ok_10 (Qed)
+[wp] [Valid] typed_globals_check_qed_ok_11 (Qed)
+[wp] [Valid] typed_globals_check_qed_ok_12 (Qed)
+[wp] [Valid] typed_globals_check_qed_ok_13 (Qed)
+[wp] [Valid] typed_globals_check_provable_4 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_globals_check_provable_5 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_globals_check_provable_6 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_globals_check_provable_7 (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_globals_check_qed_ko_4 (Alt-Ergo)
+[wp] [Unknown] typed_globals_check_qed_ko_5 (Alt-Ergo)
+[wp] [Unknown] typed_globals_check_qed_ko_6 (Alt-Ergo)
+[wp] [Unknown] typed_globals_check_qed_ko_7 (Alt-Ergo)
+[wp] [Unknown] typed_globals_check_not_provable_2 (Alt-Ergo)
+[wp] [Unknown] typed_globals_check_not_provable_3 (Alt-Ergo)
+[wp] [Unknown] typed_globals_check_not_provable_4 (Alt-Ergo)
+[wp] [Valid] typed_locals_check_qed_ok (Qed)
+[wp] [Valid] typed_locals_check_qed_ok_2 (Qed)
+[wp] [Valid] typed_locals_check_qed_ok_3 (Qed)
+[wp] [Valid] typed_locals_check_qed_ok_4 (Qed)
+[wp] [Valid] typed_locals_check_qed_ok_5 (Qed)
+[wp] [Valid] typed_locals_check_qed_ok_6 (Qed)
+[wp] [Valid] typed_locals_check_qed_ok_7 (Qed)
+[wp] [Valid] typed_locals_check_qed_ok_8 (Qed)
+[wp] [Valid] typed_locals_check_qed_ok_9 (Qed)
+[wp] [Valid] typed_locals_check_provable (Alt-Ergo) (Cached)
+[wp] [Valid] typed_locals_check_qed_ok_10 (Qed)
+[wp] [Valid] typed_locals_check_qed_ok_11 (Qed)
+[wp] [Valid] typed_locals_check_qed_ok_12 (Qed)
+[wp] [Valid] typed_locals_check_qed_ok_13 (Qed)
+[wp] [Valid] typed_locals_check_qed_ok_14 (Qed)
+[wp] [Valid] typed_locals_check_qed_ok_15 (Qed)
+[wp] [Valid] typed_locals_check_qed_ok_16 (Qed)
+[wp] [Valid] typed_locals_check_qed_ok_17 (Qed)
+[wp] [Valid] typed_locals_check_qed_ok_18 (Qed)
+[wp] [Valid] typed_locals_check_qed_ok_19 (Qed)
+[wp] [Valid] typed_locals_check_provable_2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_locals_check_qed_ok_20 (Qed)
+[wp] [Valid] typed_locals_check_qed_ok_21 (Qed)
+[wp] [Valid] typed_complex_struct_check_qed_ok (Qed)
+[wp] [Valid] typed_complex_struct_check_qed_ok_2 (Qed)
+[wp] [Valid] typed_complex_struct_check_qed_ok_3 (Qed)
+[wp] [Valid] typed_complex_struct_check_qed_ok_4 (Qed)
+[wp] [Valid] typed_complex_struct_check_qed_ok_5 (Qed)
+[wp] [Valid] typed_complex_struct_check_qed_ok_6 (Qed)
+[wp] [Valid] typed_complex_struct_check_qed_ok_7 (Qed)
+[wp] [Valid] typed_complex_struct_check_qed_ok_8 (Qed)
+[wp] [Valid] typed_complex_struct_check_qed_ok_9 (Qed)
+[wp] [Valid] typed_complex_struct_check_qed_ok_10 (Qed)
+[wp] [Valid] typed_complex_struct_check_qed_ok_11 (Qed)
+[wp] [Valid] typed_complex_struct_check_qed_ok_12 (Qed)
+[wp] [Valid] typed_complex_struct_check_qed_ok_13 (Qed)
+[wp] [Valid] typed_complex_struct_check_qed_ok_14 (Qed)
+[wp] [Valid] typed_complex_struct_check_qed_ok_15 (Qed)
+[wp] [Valid] typed_complex_struct_check_qed_ok_16 (Qed)
+[wp] [Valid] typed_complex_struct_check_qed_ok_17 (Qed)
+[wp] [Valid] typed_complex_struct_check_qed_ok_18 (Qed)
+[wp] [Valid] typed_complex_struct_check_provable (Script)
[wp] Proved goals: 62 / 73
Qed: 52
Script: 1
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/initialized_shift_array.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/initialized_shift_array.res.oracle
index b7fa009bab8..7196363cd95 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/initialized_shift_array.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/initialized_shift_array.res.oracle
@@ -5,17 +5,17 @@
No code nor implicit assigns clause for function test, generating default assigns from the prototype
[wp] Warning: Missing RTE guards
[wp] 11 goals scheduled
-[wp] [Qed] Goal typed_succ_full_first_cell_call_test_requires : Valid
-[wp] [Alt-Ergo] Goal typed_succ_full_full_call_test_requires : Valid
-[wp] [Alt-Ergo] Goal typed_succ_full_from_1_call_test_requires : Valid
-[wp] [Alt-Ergo] Goal typed_succ_from_1_from_1_call_test_requires : Valid
-[wp] [Alt-Ergo] Goal typed_succ_full_from_2_call_test_requires : Valid
-[wp] [Alt-Ergo] Goal typed_fail_cell_before_call_test_requires : Unsuccess
-[wp] [Alt-Ergo] Goal typed_fail_too_long_call_test_requires : Unsuccess
-[wp] [Alt-Ergo] Goal typed_fail_too_long_from_1_call_test_requires : Unsuccess
-[wp] [Alt-Ergo] Goal typed_fail_too_long_from_2_call_test_requires : Unsuccess
-[wp] [Alt-Ergo] Goal typed_fail_cell_after_end_call_test_requires : Unsuccess
-[wp] [Alt-Ergo] Goal typed_fail_partial_not_full_call_test_requires : Unsuccess
+[wp] [Valid] typed_succ_full_first_cell_call_test_requires (Qed)
+[wp] [Valid] typed_succ_full_full_call_test_requires (Alt-Ergo) (Cached)
+[wp] [Valid] typed_succ_full_from_1_call_test_requires (Alt-Ergo) (Cached)
+[wp] [Valid] typed_succ_from_1_from_1_call_test_requires (Alt-Ergo) (Cached)
+[wp] [Valid] typed_succ_full_from_2_call_test_requires (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_fail_cell_before_call_test_requires (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_fail_too_long_call_test_requires (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_fail_too_long_from_1_call_test_requires (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_fail_too_long_from_2_call_test_requires (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_fail_cell_after_end_call_test_requires (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_fail_partial_not_full_call_test_requires (Alt-Ergo) (Cached)
[wp] Proved goals: 5 / 11
Qed: 1
Alt-Ergo: 4 (unsuccess: 6)
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/intbool.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/intbool.res.oracle
index b1ebccde248..bab5e982989 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/intbool.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/intbool.res.oracle
@@ -3,7 +3,7 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 1 goal scheduled
-[wp] [Qed] Goal typed_bug_ensures : Valid
+[wp] [Valid] typed_bug_ensures (Qed)
[wp] Proved goals: 1 / 1
Qed: 1
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/invalid_pointer.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/invalid_pointer.res.oracle
index 1f30033a7b2..24acc3d88c3 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/invalid_pointer.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/invalid_pointer.res.oracle
@@ -4,26 +4,26 @@
[wp] Warning: Missing RTE guards
[wp] invalid_pointer.c:23: Warning: void object
[wp] 20 goals scheduled
-[wp] [Qed] Goal typed_memvar_check_M1 : Valid
-[wp] [Qed] Goal typed_memvar_check_P0 : Valid
-[wp] [Qed] Goal typed_memvar_check_P1 : Valid
-[wp] [Qed] Goal typed_memvar_check_P2 : Valid
-[wp] [Alt-Ergo] Goal typed_pointer_check_M1 : Valid
-[wp] [Alt-Ergo] Goal typed_pointer_check_P0 : Valid
-[wp] [Alt-Ergo] Goal typed_pointer_check_P1 : Valid
-[wp] [Alt-Ergo] Goal typed_pointer_check_P2 : Valid
-[wp] [Qed] Goal typed_pointer_check_qed_NULL : Valid
-[wp] [Alt-Ergo] Goal typed_pointer_check_prover_NULL : Valid
-[wp] [Alt-Ergo] Goal typed_array_check_ARR : Valid
-[wp] [Qed] Goal typed_compound_check_M1 : Valid
-[wp] [Qed] Goal typed_compound_check_P0 : Valid
-[wp] [Qed] Goal typed_compound_check_P1 : Valid
-[wp] [Qed] Goal typed_compound_check_P2 : Valid
-[wp] [Alt-Ergo] Goal typed_compound_check_F : Valid
-[wp] [Alt-Ergo] Goal typed_compound_check_G : Valid
-[wp] [Alt-Ergo] Goal typed_compound_check_F2 : Valid
-[wp] [Alt-Ergo] Goal typed_compound_check_G2 : Valid
-[wp] [Qed] Goal typed_compound_check_AM : Valid
+[wp] [Valid] typed_memvar_check_M1 (Qed)
+[wp] [Valid] typed_memvar_check_P0 (Qed)
+[wp] [Valid] typed_memvar_check_P1 (Qed)
+[wp] [Valid] typed_memvar_check_P2 (Qed)
+[wp] [Valid] typed_pointer_check_M1 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_pointer_check_P0 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_pointer_check_P1 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_pointer_check_P2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_pointer_check_qed_NULL (Qed)
+[wp] [Valid] typed_pointer_check_prover_NULL (Alt-Ergo) (Cached)
+[wp] [Valid] typed_array_check_ARR (Alt-Ergo) (Cached)
+[wp] [Valid] typed_compound_check_M1 (Qed)
+[wp] [Valid] typed_compound_check_P0 (Qed)
+[wp] [Valid] typed_compound_check_P1 (Qed)
+[wp] [Valid] typed_compound_check_P2 (Qed)
+[wp] [Valid] typed_compound_check_F (Alt-Ergo) (Cached)
+[wp] [Valid] typed_compound_check_G (Alt-Ergo) (Cached)
+[wp] [Valid] typed_compound_check_F2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_compound_check_G2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_compound_check_AM (Qed)
[wp] Proved goals: 20 / 20
Qed: 10
Alt-Ergo: 10
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/issue_A228.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/issue_A228.res.oracle
index 3bcb5ffdc5a..9409b34a1c4 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/issue_A228.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/issue_A228.res.oracle
@@ -3,7 +3,7 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_job_ensures_GOAL : Unsuccess
+[wp] [Stepout] typed_job_ensures_GOAL (Alt-Ergo) (Cached)
[wp] Proved goals: 0 / 1
Alt-Ergo: 0 (unsuccess: 1)
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/label_escape.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/label_escape.0.res.oracle
index f4a753164c5..d77e8e117a6 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/label_escape.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/label_escape.0.res.oracle
@@ -3,7 +3,7 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 1 goal scheduled
-[wp] [Qed] Goal typed_g_assert_qed_ok_ok : Valid
+[wp] [Valid] typed_g_assert_qed_ok_ok (Qed)
[wp] Proved goals: 1 / 1
Qed: 1
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/label_escape.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/label_escape.1.res.oracle
index 9ed64cb24ee..3e72b1c7822 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/label_escape.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/label_escape.1.res.oracle
@@ -3,7 +3,7 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_f_assert_qed_ko_oracle_ko : Unsuccess
+[wp] [Stepout] typed_f_assert_qed_ko_oracle_ko (Alt-Ergo) (Cached)
[wp] Proved goals: 0 / 1
Alt-Ergo: 0 (unsuccess: 1)
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/lemma_dependency.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/lemma_dependency.res.oracle
index a9da9c10e05..69234151994 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/lemma_dependency.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/lemma_dependency.res.oracle
@@ -2,7 +2,7 @@
[kernel] Parsing lemma_dependency.i (no preprocessing)
[wp] Running WP plugin...
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_lemma_depends : Valid
+[wp] [Valid] typed_lemma_depends (Alt-Ergo) (Cached)
[wp] Proved goals: 1 / 1
Qed: 0
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/logic.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/logic.res.oracle
index dd79df97db6..aa3dba5a7ec 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/logic.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/logic.res.oracle
@@ -25,27 +25,27 @@
[wp] logic.i:50: Warning: Logic cast from struct (Point) not implemented yet
[wp] logic.i:49: Warning: Logic cast from struct (Tint2) not implemented yet
[wp] 21 goals scheduled
-[wp] [Alt-Ergo] Goal typed_h_ensures : Valid
-[wp] [Qed] Goal typed_h_assigns_exit : Valid
-[wp] [Qed] Goal typed_h_assigns_normal : Valid
-[wp] [Qed] Goal typed_main_requires_qed_ok : Valid
-[wp] [Alt-Ergo] Goal typed_main_requires_qed_ok_2 : Valid
-[wp] [Alt-Ergo] Goal typed_main_requires_qed_ok_3 : Valid
-[wp] [Alt-Ergo] Goal typed_main_requires_qed_ok_4 : Valid
-[wp] [Alt-Ergo] Goal typed_main_requires_qed_ok_5 : Unsuccess (Stronger)
-[wp] [Alt-Ergo] Goal typed_main_requires_qed_ok_6 : Unsuccess (Stronger)
-[wp] [Alt-Ergo] Goal typed_main_requires_qed_ok_7 : Unsuccess (Stronger)
-[wp] [Alt-Ergo] Goal typed_main_requires_qed_ok_8 : Unsuccess (Stronger)
-[wp] [Alt-Ergo] Goal typed_main_requires_qed_ok_9 : Unsuccess (Stronger)
-[wp] [Alt-Ergo] Goal typed_main_requires_qed_ok_10 : Unsuccess (Stronger)
-[wp] [Alt-Ergo] Goal typed_main_requires_qed_ok_11 : Unsuccess (Stronger)
-[wp] [Alt-Ergo] Goal typed_main_requires_qed_ok_12 : Unsuccess (Stronger)
-[wp] [Alt-Ergo] Goal typed_main_requires_qed_ok_13 : Unsuccess (Stronger)
-[wp] [Alt-Ergo] Goal typed_main_requires_qed_ok_14 : Unsuccess (Stronger)
-[wp] [Alt-Ergo] Goal typed_main_requires_qed_ok_15 : Unsuccess (Stronger)
-[wp] [Alt-Ergo] Goal typed_main_requires_qed_ok_16 : Unsuccess (Stronger)
-[wp] [Alt-Ergo] Goal typed_main_requires_qed_ok_17 : Unsuccess (Stronger)
-[wp] [Alt-Ergo] Goal typed_main_requires_qed_ok_18 : Unsuccess (Stronger)
+[wp] [Valid] typed_h_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_h_assigns_exit (Qed)
+[wp] [Valid] typed_h_assigns_normal (Qed)
+[wp] [Valid] typed_main_requires_qed_ok (Qed)
+[wp] [Valid] typed_main_requires_qed_ok_2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_main_requires_qed_ok_3 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_main_requires_qed_ok_4 (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_main_requires_qed_ok_5 (Alt-Ergo) (Cached) (Stronger)
+[wp] [Timeout] typed_main_requires_qed_ok_6 (Alt-Ergo) (Cached) (Stronger)
+[wp] [Timeout] typed_main_requires_qed_ok_7 (Alt-Ergo) (Cached) (Stronger)
+[wp] [Unknown] typed_main_requires_qed_ok_8 (Alt-Ergo) (Cached) (Stronger)
+[wp] [Unknown] typed_main_requires_qed_ok_9 (Alt-Ergo) (Cached) (Stronger)
+[wp] [Unknown] typed_main_requires_qed_ok_10 (Alt-Ergo) (Cached) (Stronger)
+[wp] [Timeout] typed_main_requires_qed_ok_11 (Alt-Ergo) (Cached) (Stronger)
+[wp] [Timeout] typed_main_requires_qed_ok_12 (Alt-Ergo) (Cached) (Stronger)
+[wp] [Timeout] typed_main_requires_qed_ok_13 (Alt-Ergo) (Cached) (Stronger)
+[wp] [Unknown] typed_main_requires_qed_ok_14 (Alt-Ergo) (Cached) (Stronger)
+[wp] [Unknown] typed_main_requires_qed_ok_15 (Alt-Ergo) (Cached) (Stronger)
+[wp] [Unknown] typed_main_requires_qed_ok_16 (Alt-Ergo) (Cached) (Stronger)
+[wp] [Timeout] typed_main_requires_qed_ok_17 (Alt-Ergo) (Cached) (Stronger)
+[wp] [Timeout] typed_main_requires_qed_ok_18 (Alt-Ergo) (Cached) (Stronger)
[wp] Proved goals: 7 / 21
Qed: 3
Alt-Ergo: 4 (unsuccess: 14)
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/looplabels.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/looplabels.res.oracle
index 3882015f2cd..c7a0a6f88fd 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/looplabels.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/looplabels.res.oracle
@@ -3,14 +3,14 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 8 goals scheduled
-[wp] [Alt-Ergo] Goal typed_copy_ensures : Valid
-[wp] [Qed] Goal typed_copy_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_copy_loop_invariant_established : Valid
-[wp] [Alt-Ergo] Goal typed_copy_loop_invariant_2_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_copy_loop_invariant_2_established : Valid
-[wp] [Qed] Goal typed_copy_loop_assigns_part1 : Valid
-[wp] [Alt-Ergo] Goal typed_copy_loop_assigns_part2 : Valid
-[wp] [Qed] Goal typed_copy_assigns : Valid
+[wp] [Valid] typed_copy_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_copy_loop_invariant_preserved (Qed)
+[wp] [Valid] typed_copy_loop_invariant_established (Qed)
+[wp] [Valid] typed_copy_loop_invariant_2_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_copy_loop_invariant_2_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_copy_loop_assigns_part1 (Qed)
+[wp] [Valid] typed_copy_loop_assigns_part2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_copy_assigns (Qed)
[wp] Proved goals: 8 / 8
Qed: 4
Alt-Ergo: 4
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/memvar_chunk_typing.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/memvar_chunk_typing.res.oracle
index dc3afd8b0ce..21961c7fcaa 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/memvar_chunk_typing.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/memvar_chunk_typing.res.oracle
@@ -2,7 +2,7 @@
[kernel] Parsing memvar_chunk_typing.i (no preprocessing)
[wp] Running WP plugin...
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_lemma_L : Valid
+[wp] [Valid] typed_lemma_L (Alt-Ergo) (Cached)
[wp] Proved goals: 1 / 1
Qed: 0
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/null.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/null.res.oracle
index 20301879897..b20209a0e25 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/null.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/null.res.oracle
@@ -3,15 +3,15 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 9 goals scheduled
-[wp] [Alt-Ergo] Goal typed_lemma_prover_not_valid_null : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_prover_not_valid_read_null : Valid
-[wp] [Qed] Goal typed_lemma_qed_not_valid_null : Valid
-[wp] [Qed] Goal typed_lemma_qed_not_valid_read_null : Valid
-[wp] [Qed] Goal typed_null_is_zero_ensures : Valid
-[wp] [Qed] Goal typed_qed_assigns_exit : Valid
-[wp] [Qed] Goal typed_qed_assigns_normal : Valid
-[wp] [Alt-Ergo] Goal typed_prover_assigns_exit : Valid
-[wp] [Alt-Ergo] Goal typed_prover_assigns_normal : Valid
+[wp] [Valid] typed_lemma_prover_not_valid_null (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_prover_not_valid_read_null (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_qed_not_valid_null (Qed)
+[wp] [Valid] typed_lemma_qed_not_valid_read_null (Qed)
+[wp] [Valid] typed_null_is_zero_ensures (Qed)
+[wp] [Valid] typed_qed_assigns_exit (Qed)
+[wp] [Valid] typed_qed_assigns_normal (Qed)
+[wp] [Valid] typed_prover_assigns_exit (Alt-Ergo) (Cached)
+[wp] [Valid] typed_prover_assigns_normal (Alt-Ergo) (Cached)
[wp] Proved goals: 9 / 9
Qed: 5
Alt-Ergo: 4
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/old-assigns.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/old-assigns.res.oracle
index a0da8037a94..f398d04ca23 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/old-assigns.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/old-assigns.res.oracle
@@ -3,8 +3,8 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 2 goals scheduled
-[wp] [Qed] Goal typed_old_assigns_exit : Valid
-[wp] [Qed] Goal typed_old_assigns_normal : Valid
+[wp] [Valid] typed_old_assigns_exit (Qed)
+[wp] [Valid] typed_old_assigns_normal (Qed)
[wp] Proved goals: 2 / 2
Qed: 2
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/opaque_struct.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/opaque_struct.res.oracle
index 7ce463d9349..cbb7c2292b6 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/opaque_struct.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/opaque_struct.res.oracle
@@ -10,21 +10,21 @@
[kernel:annot:missing-spec] opaque_struct.i:79: Warning:
Neither code nor specification for function use, generating default assigns from the prototype
[wp] 15 goals scheduled
-[wp] [Alt-Ergo] Goal typed_check_lemma_fail : Unsuccess
-[wp] [Qed] Goal typed_check_lemma_succeed_L1 : Valid
-[wp] [Alt-Ergo] Goal typed_check_lemma_succeed_L2 : Valid
-[wp] [Alt-Ergo] Goal typed_assigns_check_fail : Unsuccess
-[wp] [Qed] Goal typed_assigns_check_succeed : Valid
-[wp] [Alt-Ergo] Goal typed_initialized_assigns_check_fails : Unsuccess
-[wp] [Alt-Ergo] Goal typed_initialized_assigns_check_succeed : Valid
-[wp] [Alt-Ergo] Goal typed_uninitialized_assigns_check_fail : Unsuccess
-[wp] [Alt-Ergo] Goal typed_uninitialized_assigns_check_fail_2 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_assigned_via_pointer_check_fail : Unsuccess
-[wp] [Alt-Ergo] Goal typed_assigns_effect_check_fail : Unsuccess
-[wp] [Alt-Ergo] Goal typed_assigns_effect_check_fail_2 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_assigns_effect_check_succeed : Valid
-[wp] [Qed] Goal typed_chunk_typing_assert_rte_mem_access : Valid
-[wp] [Qed] Goal typed_chunk_typing_assert_rte_mem_access_2 : Valid
+[wp] [Unknown] typed_check_lemma_fail (Alt-Ergo) (Cached)
+[wp] [Valid] typed_check_lemma_succeed_L1 (Qed)
+[wp] [Valid] typed_check_lemma_succeed_L2 (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_assigns_check_fail (Alt-Ergo) (Cached)
+[wp] [Valid] typed_assigns_check_succeed (Qed)
+[wp] [Unknown] typed_initialized_assigns_check_fails (Alt-Ergo) (Cached)
+[wp] [Valid] typed_initialized_assigns_check_succeed (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_uninitialized_assigns_check_fail (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_uninitialized_assigns_check_fail_2 (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_assigned_via_pointer_check_fail (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_assigns_effect_check_fail (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_assigns_effect_check_fail_2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_assigns_effect_check_succeed (Alt-Ergo) (Cached)
+[wp] [Valid] typed_chunk_typing_assert_rte_mem_access (Qed)
+[wp] [Valid] typed_chunk_typing_assert_rte_mem_access_2 (Qed)
[wp] Proved goals: 7 / 15
Qed: 4
Alt-Ergo: 3 (unsuccess: 8)
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.0.res.oracle
index 0d8dd2858e0..c9457824e0d 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.0.res.oracle
@@ -5,15 +5,15 @@
[wp] pointer.i:50: Warning: Uncomparable locations p_0 and mem:t.(0)
[wp] pointer.i:49: Warning: Uncomparable locations p_0 and mem:t.(0)
[wp] 9 goals scheduled
-[wp] [Qed] Goal typed_ref_array_ensures_Lt : Valid
-[wp] [Qed] Goal typed_ref_array_ensures_Le : Valid
-[wp] [Qed] Goal typed_ref_array_ensures_Eq : Valid
-[wp] [Alt-Ergo] Goal typed_ref_pointer_ensures_qed_ko_Le_oracle_ko : Unsuccess
-[wp] [Alt-Ergo] Goal typed_ref_pointer_ensures_qed_ko_Eq_oracle_ko : Unsuccess
-[wp] [Alt-Ergo] Goal typed_ref_mixed_array_pointer_ensures_qed_ko_Le_oracle_ko : Unsuccess (Stronger)
-[wp] [Alt-Ergo] Goal typed_ref_mixed_array_pointer_ensures_qed_ko_Lt_oracle_ko : Unsuccess (Stronger)
-[wp] [Alt-Ergo] Goal typed_ref_absurd_ensures_qed_ko_Base_oracle_ko : Unsuccess
-[wp] [Alt-Ergo] Goal typed_ref_absurd_ensures_qed_ko_Comp_oracle_ko : Unsuccess
+[wp] [Valid] typed_ref_array_ensures_Lt (Qed)
+[wp] [Valid] typed_ref_array_ensures_Le (Qed)
+[wp] [Valid] typed_ref_array_ensures_Eq (Qed)
+[wp] [Timeout] typed_ref_pointer_ensures_qed_ko_Le_oracle_ko (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_ref_pointer_ensures_qed_ko_Eq_oracle_ko (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_ref_mixed_array_pointer_ensures_qed_ko_Le_oracle_ko (Alt-Ergo) (Cached) (Stronger)
+[wp] [Unknown] typed_ref_mixed_array_pointer_ensures_qed_ko_Lt_oracle_ko (Alt-Ergo) (Cached) (Stronger)
+[wp] [Timeout] typed_ref_absurd_ensures_qed_ko_Base_oracle_ko (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_ref_absurd_ensures_qed_ko_Comp_oracle_ko (Alt-Ergo) (Cached)
[wp] Proved goals: 3 / 9
Qed: 3
Alt-Ergo: 0 (unsuccess: 6)
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.1.res.oracle
index 51fe02dafb6..5edb9a38024 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.1.res.oracle
@@ -5,15 +5,15 @@
[wp] pointer.i:50: Warning: Uncomparable locations p_0 and mem:t.(0)
[wp] pointer.i:49: Warning: Uncomparable locations p_0 and mem:t.(0)
[wp] 9 goals scheduled
-[wp] [Qed] Goal typed_array_ensures_Lt : Valid
-[wp] [Qed] Goal typed_array_ensures_Le : Valid
-[wp] [Qed] Goal typed_array_ensures_Eq : Valid
-[wp] [Alt-Ergo] Goal typed_pointer_ensures_qed_ko_Le_oracle_ko : Unsuccess
-[wp] [Alt-Ergo] Goal typed_pointer_ensures_qed_ko_Eq_oracle_ko : Unsuccess
-[wp] [Alt-Ergo] Goal typed_mixed_array_pointer_ensures_qed_ko_Le_oracle_ko : Unsuccess (Stronger)
-[wp] [Alt-Ergo] Goal typed_mixed_array_pointer_ensures_qed_ko_Lt_oracle_ko : Unsuccess (Stronger)
-[wp] [Alt-Ergo] Goal typed_absurd_ensures_qed_ko_Base_oracle_ko : Unsuccess
-[wp] [Alt-Ergo] Goal typed_absurd_ensures_qed_ko_Comp_oracle_ko : Unsuccess
+[wp] [Valid] typed_array_ensures_Lt (Qed)
+[wp] [Valid] typed_array_ensures_Le (Qed)
+[wp] [Valid] typed_array_ensures_Eq (Qed)
+[wp] [Timeout] typed_pointer_ensures_qed_ko_Le_oracle_ko (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_pointer_ensures_qed_ko_Eq_oracle_ko (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_mixed_array_pointer_ensures_qed_ko_Le_oracle_ko (Alt-Ergo) (Cached) (Stronger)
+[wp] [Unknown] typed_mixed_array_pointer_ensures_qed_ko_Lt_oracle_ko (Alt-Ergo) (Cached) (Stronger)
+[wp] [Timeout] typed_absurd_ensures_qed_ko_Base_oracle_ko (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_absurd_ensures_qed_ko_Comp_oracle_ko (Alt-Ergo) (Cached)
[wp] Proved goals: 3 / 9
Qed: 3
Alt-Ergo: 0 (unsuccess: 6)
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/post_result.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/post_result.res.oracle
index 0b383ccbb58..04b71c2bd1a 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/post_result.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/post_result.res.oracle
@@ -3,8 +3,8 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 2 goals scheduled
-[wp] [Qed] Goal typed_correct_assert_OK : Valid
-[wp] [Alt-Ergo] Goal typed_wrong_assert_KO : Unsuccess
+[wp] [Valid] typed_correct_assert_OK (Qed)
+[wp] [Stepout] typed_wrong_assert_KO (Alt-Ergo) (Cached)
[wp] Proved goals: 1 / 2
Qed: 1
Alt-Ergo: 0 (unsuccess: 1)
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/postassigns.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/postassigns.res.oracle
index 558c6e329de..d1f3bc41b93 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/postassigns.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/postassigns.res.oracle
@@ -3,33 +3,33 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 27 goals scheduled
-[wp] [Qed] Goal typed_job1_ensures : Valid
-[wp] [Qed] Goal typed_job1_assigns_part1 : Valid
-[wp] [Qed] Goal typed_job1_assigns_part2 : Valid
-[wp] [Qed] Goal typed_job1_assigns_part3 : Valid
-[wp] [Qed] Goal typed_job1_assigns_part4 : Valid
-[wp] [Qed] Goal typed_job1_assigns_part5 : Valid
-[wp] [Qed] Goal typed_job1_assigns_part6 : Valid
-[wp] [Qed] Goal typed_job1_assigns_part7 : Valid
-[wp] [Qed] Goal typed_job1_assigns_part8 : Valid
-[wp] [Qed] Goal typed_job1_assigns_part9 : Valid
-[wp] [Qed] Goal typed_job2_ensures : Valid
-[wp] [Qed] Goal typed_job2_assigns_part1 : Valid
-[wp] [Qed] Goal typed_job2_assigns_part2 : Valid
-[wp] [Qed] Goal typed_job2_assigns_part3 : Valid
-[wp] [Qed] Goal typed_job2_assigns_part4 : Valid
-[wp] [Alt-Ergo] Goal typed_job2_assigns_part5 : Valid
-[wp] [Qed] Goal typed_job2_assigns_part6 : Valid
-[wp] [Alt-Ergo] Goal typed_job2_assigns_part7 : Valid
-[wp] [Qed] Goal typed_job2_assigns_part8 : Valid
-[wp] [Qed] Goal typed_job2_assigns_part9 : Valid
-[wp] [Qed] Goal typed_job3_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_job3_loop_invariant_established : Valid
-[wp] [Qed] Goal typed_job3_loop_assigns_part1 : Valid
-[wp] [Qed] Goal typed_job3_loop_assigns_part2 : Valid
-[wp] [Alt-Ergo] Goal typed_job3_loop_assigns_part3 : Valid
-[wp] [Qed] Goal typed_job3_assigns_part1 : Valid
-[wp] [Qed] Goal typed_job3_assigns_part2 : Valid
+[wp] [Valid] typed_job1_ensures (Qed)
+[wp] [Valid] typed_job1_assigns_part1 (Qed)
+[wp] [Valid] typed_job1_assigns_part2 (Qed)
+[wp] [Valid] typed_job1_assigns_part3 (Qed)
+[wp] [Valid] typed_job1_assigns_part4 (Qed)
+[wp] [Valid] typed_job1_assigns_part5 (Qed)
+[wp] [Valid] typed_job1_assigns_part6 (Qed)
+[wp] [Valid] typed_job1_assigns_part7 (Qed)
+[wp] [Valid] typed_job1_assigns_part8 (Qed)
+[wp] [Valid] typed_job1_assigns_part9 (Qed)
+[wp] [Valid] typed_job2_ensures (Qed)
+[wp] [Valid] typed_job2_assigns_part1 (Qed)
+[wp] [Valid] typed_job2_assigns_part2 (Qed)
+[wp] [Valid] typed_job2_assigns_part3 (Qed)
+[wp] [Valid] typed_job2_assigns_part4 (Qed)
+[wp] [Valid] typed_job2_assigns_part5 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_job2_assigns_part6 (Qed)
+[wp] [Valid] typed_job2_assigns_part7 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_job2_assigns_part8 (Qed)
+[wp] [Valid] typed_job2_assigns_part9 (Qed)
+[wp] [Valid] typed_job3_loop_invariant_preserved (Qed)
+[wp] [Valid] typed_job3_loop_invariant_established (Qed)
+[wp] [Valid] typed_job3_loop_assigns_part1 (Qed)
+[wp] [Valid] typed_job3_loop_assigns_part2 (Qed)
+[wp] [Valid] typed_job3_loop_assigns_part3 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_job3_assigns_part1 (Qed)
+[wp] [Valid] typed_job3_assigns_part2 (Qed)
[wp] Proved goals: 27 / 27
Qed: 24
Alt-Ergo: 3
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/postassigns2.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/postassigns2.res.oracle
index 5f5605585c9..f9002beb333 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/postassigns2.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/postassigns2.res.oracle
@@ -3,9 +3,9 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 3 goals scheduled
-[wp] [Qed] Goal typed_mess1_exits : Valid
-[wp] [Qed] Goal typed_mess1_assigns_exit : Valid
-[wp] [Qed] Goal typed_mess1_assigns_normal : Valid
+[wp] [Valid] typed_mess1_exits (Qed)
+[wp] [Valid] typed_mess1_assigns_exit (Qed)
+[wp] [Valid] typed_mess1_assigns_normal (Qed)
[wp] Proved goals: 3 / 3
Qed: 3
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.0.res.oracle
index 5f9156c6e2e..50e7a63aadd 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.0.res.oracle
@@ -23,58 +23,58 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 52 goals scheduled
-[wp] [Qed] Goal typed_predicate_ensures_r_precedence_and_xor : Valid
-[wp] [Qed] Goal typed_predicate_ensures_l_precedence_and_xor : Valid
-[wp] [Qed] Goal typed_predicate_ensures_r_precedence_xor_or : Valid
-[wp] [Qed] Goal typed_predicate_ensures_l_precedence_xor_or : Valid
-[wp] [Qed] Goal typed_predicate_ensures_r_precedence_or_implies : Valid
-[wp] [Qed] Goal typed_predicate_ensures_l_precedence_or_implies : Valid
-[wp] [Alt-Ergo] Goal typed_predicate_ensures_ok_r_precedence_implies_or : Valid
-[wp] [Qed] Goal typed_predicate_ensures_ok_since : Valid
-[wp] [Qed] Goal typed_predicate_ensures_r_assoc_implies : Valid
-[wp] [Qed] Goal typed_predicate_ensures_r_precedence_implies_equiv : Valid
-[wp] [Qed] Goal typed_predicate_ensures_l_precedence_implies_equiv : Valid
-[wp] [Qed] Goal typed_predicate_ensures_r_precedence_equiv_ite : Valid
-[wp] [Qed] Goal typed_predicate_ensures_m_precedence_equiv_ite : Valid
-[wp] [Qed] Goal typed_predicate_ensures_l_precedence_equiv_ite : Valid
-[wp] [Qed] Goal typed_predicate_ensures_r_assoc_ite : Valid
-[wp] [Qed] Goal typed_predicate_ensures_r_precedence_ite_forall : Valid
-[wp] [Qed] Goal typed_predicate_ensures_m_precedence_ite_forall : Valid
-[wp] [Qed] Goal typed_predicate_ensures_l_precedence_ite_forall : Valid
-[wp] [Qed] Goal typed_predicate_ensures_r_assoc_forall : Valid
-[wp] [Qed] Goal typed_predicate_ensures_r_precedence_ite_exists : Valid
-[wp] [Qed] Goal typed_predicate_ensures_m_precedence_ite_exists : Valid
-[wp] [Qed] Goal typed_predicate_ensures_l_precedence_ite_exists : Valid
-[wp] [Qed] Goal typed_predicate_ensures_r_assoc_exist : Valid
-[wp] [Qed] Goal typed_predicate_ensures_r_precedence_ite_let : Valid
-[wp] [Qed] Goal typed_predicate_ensures_m_precedence_ite_let : Valid
-[wp] [Qed] Goal typed_predicate_ensures_l_precedence_ite_let : Valid
-[wp] [Qed] Goal typed_predicate_ensures_r_assoc_let : Valid
-[wp] [Qed] Goal typed_predicate_ensures_scope_let : Valid
-[wp] [Qed] Goal typed_predicate_ensures_scope_let_2 : Valid
-[wp] [Qed] Goal typed_predicate_ensures_r_precedence_ite_naming : Valid
-[wp] [Qed] Goal typed_comparison_ensures_chainable_lt_lt : Valid
-[wp] [Qed] Goal typed_comparison_ensures_chainable_le_le : Valid
-[wp] [Qed] Goal typed_comparison_ensures_chainable_gt_gt : Valid
-[wp] [Qed] Goal typed_comparison_ensures_chainable_ge_ge : Valid
-[wp] [Qed] Goal typed_comparison_ensures_chainable_eq_eq : Valid
-[wp] [Qed] Goal typed_comparison_ensures_r_precedence_eq_and : Valid
-[wp] [Qed] Goal typed_comparison_ensures_l_precedence_eq_and : Valid
-[wp] [Qed] Goal typed_comparison_ensures_r_precedence_neq_and : Valid
-[wp] [Qed] Goal typed_comparison_ensures_l_precedence_neq_and : Valid
-[wp] [Qed] Goal typed_bitwise_ensures_r_precedence_and_xor : Valid
-[wp] [Qed] Goal typed_bitwise_ensures_l_precedence_and_xor : Valid
-[wp] [Qed] Goal typed_bitwise_ensures_r_precedence_xor_or : Valid
-[wp] [Qed] Goal typed_bitwise_ensures_l_precedence_xor_or : Valid
-[wp] [Qed] Goal typed_bitwise_ensures_r_precedence_or_implies : Valid
-[wp] [Qed] Goal typed_bitwise_ensures_l_precedence_or_implies : Valid
-[wp] [Qed] Goal typed_bitwise_ensures_ok_r_precedence_implies_or : Valid
-[wp] [Qed] Goal typed_bitwise_ensures_ok_since : Valid
-[wp] [Qed] Goal typed_bitwise_ensures_r_assoc_implies : Valid
-[wp] [Qed] Goal typed_bitwise_ensures_r_precedence_implies_equiv : Valid
-[wp] [Qed] Goal typed_bitwise_ensures_l_precedence_implies_equiv : Valid
-[wp] [Qed] Goal typed_predicate_bitwise_ensures_r_precedence_equiv_Pand : Valid
-[wp] [Qed] Goal typed_predicate_bitwise_ensures_l_precedence_equiv_Pand : Valid
+[wp] [Valid] typed_predicate_ensures_r_precedence_and_xor (Qed)
+[wp] [Valid] typed_predicate_ensures_l_precedence_and_xor (Qed)
+[wp] [Valid] typed_predicate_ensures_r_precedence_xor_or (Qed)
+[wp] [Valid] typed_predicate_ensures_l_precedence_xor_or (Qed)
+[wp] [Valid] typed_predicate_ensures_r_precedence_or_implies (Qed)
+[wp] [Valid] typed_predicate_ensures_l_precedence_or_implies (Qed)
+[wp] [Valid] typed_predicate_ensures_ok_r_precedence_implies_or (Alt-Ergo) (Cached)
+[wp] [Valid] typed_predicate_ensures_ok_since (Qed)
+[wp] [Valid] typed_predicate_ensures_r_assoc_implies (Qed)
+[wp] [Valid] typed_predicate_ensures_r_precedence_implies_equiv (Qed)
+[wp] [Valid] typed_predicate_ensures_l_precedence_implies_equiv (Qed)
+[wp] [Valid] typed_predicate_ensures_r_precedence_equiv_ite (Qed)
+[wp] [Valid] typed_predicate_ensures_m_precedence_equiv_ite (Qed)
+[wp] [Valid] typed_predicate_ensures_l_precedence_equiv_ite (Qed)
+[wp] [Valid] typed_predicate_ensures_r_assoc_ite (Qed)
+[wp] [Valid] typed_predicate_ensures_r_precedence_ite_forall (Qed)
+[wp] [Valid] typed_predicate_ensures_m_precedence_ite_forall (Qed)
+[wp] [Valid] typed_predicate_ensures_l_precedence_ite_forall (Qed)
+[wp] [Valid] typed_predicate_ensures_r_assoc_forall (Qed)
+[wp] [Valid] typed_predicate_ensures_r_precedence_ite_exists (Qed)
+[wp] [Valid] typed_predicate_ensures_m_precedence_ite_exists (Qed)
+[wp] [Valid] typed_predicate_ensures_l_precedence_ite_exists (Qed)
+[wp] [Valid] typed_predicate_ensures_r_assoc_exist (Qed)
+[wp] [Valid] typed_predicate_ensures_r_precedence_ite_let (Qed)
+[wp] [Valid] typed_predicate_ensures_m_precedence_ite_let (Qed)
+[wp] [Valid] typed_predicate_ensures_l_precedence_ite_let (Qed)
+[wp] [Valid] typed_predicate_ensures_r_assoc_let (Qed)
+[wp] [Valid] typed_predicate_ensures_scope_let (Qed)
+[wp] [Valid] typed_predicate_ensures_scope_let_2 (Qed)
+[wp] [Valid] typed_predicate_ensures_r_precedence_ite_naming (Qed)
+[wp] [Valid] typed_comparison_ensures_chainable_lt_lt (Qed)
+[wp] [Valid] typed_comparison_ensures_chainable_le_le (Qed)
+[wp] [Valid] typed_comparison_ensures_chainable_gt_gt (Qed)
+[wp] [Valid] typed_comparison_ensures_chainable_ge_ge (Qed)
+[wp] [Valid] typed_comparison_ensures_chainable_eq_eq (Qed)
+[wp] [Valid] typed_comparison_ensures_r_precedence_eq_and (Qed)
+[wp] [Valid] typed_comparison_ensures_l_precedence_eq_and (Qed)
+[wp] [Valid] typed_comparison_ensures_r_precedence_neq_and (Qed)
+[wp] [Valid] typed_comparison_ensures_l_precedence_neq_and (Qed)
+[wp] [Valid] typed_bitwise_ensures_r_precedence_and_xor (Qed)
+[wp] [Valid] typed_bitwise_ensures_l_precedence_and_xor (Qed)
+[wp] [Valid] typed_bitwise_ensures_r_precedence_xor_or (Qed)
+[wp] [Valid] typed_bitwise_ensures_l_precedence_xor_or (Qed)
+[wp] [Valid] typed_bitwise_ensures_r_precedence_or_implies (Qed)
+[wp] [Valid] typed_bitwise_ensures_l_precedence_or_implies (Qed)
+[wp] [Valid] typed_bitwise_ensures_ok_r_precedence_implies_or (Qed)
+[wp] [Valid] typed_bitwise_ensures_ok_since (Qed)
+[wp] [Valid] typed_bitwise_ensures_r_assoc_implies (Qed)
+[wp] [Valid] typed_bitwise_ensures_r_precedence_implies_equiv (Qed)
+[wp] [Valid] typed_bitwise_ensures_l_precedence_implies_equiv (Qed)
+[wp] [Valid] typed_predicate_bitwise_ensures_r_precedence_equiv_Pand (Qed)
+[wp] [Valid] typed_predicate_bitwise_ensures_l_precedence_equiv_Pand (Qed)
[wp] Proved goals: 52 / 52
Qed: 51
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.res.oracle
index 16e3d0be136..8883e54d3fb 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.res.oracle
@@ -23,43 +23,43 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 37 goals scheduled
-[wp] [Alt-Ergo] Goal typed_predicate_ensures_ko_l_precedence_xor_and : Unsuccess
-[wp] [Alt-Ergo] Goal typed_predicate_ensures_ko_r_precedence_xor_and : Unsuccess
-[wp] [Alt-Ergo] Goal typed_predicate_ensures_ko_l_precedence_or_xor : Unsuccess
-[wp] [Alt-Ergo] Goal typed_predicate_ensures_ko_r_precedence_or_xor : Unsuccess
-[wp] [Alt-Ergo] Goal typed_predicate_ensures_ko_l_precedence_implies_or : Unsuccess
-[wp] [Alt-Ergo] Goal typed_predicate_ensures_ko_l_assoc_implies : Unsuccess
-[wp] [Alt-Ergo] Goal typed_predicate_ensures_ko_r_precedence_equiv_implies : Unsuccess
-[wp] [Alt-Ergo] Goal typed_predicate_ensures_ko_l_precedence_equiv_implies : Unsuccess
-[wp] [Alt-Ergo] Goal typed_predicate_ensures_ko_r_precedence_ite_equiv : Unsuccess
-[wp] [Alt-Ergo] Goal typed_predicate_ensures_ko_l_precedence_ite_equiv : Unsuccess
-[wp] [Alt-Ergo] Goal typed_predicate_ensures_ko_l_assoc_ite : Unsuccess
-[wp] [Alt-Ergo] Goal typed_predicate_ensures_ko_r_precedence_forall_ite : Unsuccess
-[wp] [Alt-Ergo] Goal typed_predicate_ensures_ko_m_precedence_forall_ite : Unsuccess
-[wp] [Alt-Ergo] Goal typed_predicate_ensures_ko_l_precedence_forall_ite : Unsuccess
-[wp] [Alt-Ergo] Goal typed_predicate_ensures_ko_r_assoc_forall : Unsuccess
-[wp] [Alt-Ergo] Goal typed_predicate_ensures_ko_r_precedence_exists_ite : Unsuccess
-[wp] [Alt-Ergo] Goal typed_predicate_ensures_ko_m_precedence_exists_ite : Unsuccess
-[wp] [Alt-Ergo] Goal typed_predicate_ensures_ko_l_precedence_exists_ite : Unsuccess
-[wp] [Alt-Ergo] Goal typed_predicate_ensures_ko_r_assoc_exist : Unsuccess
-[wp] [Alt-Ergo] Goal typed_predicate_ensures_ko_r_precedence_let_ite : Unsuccess
-[wp] [Alt-Ergo] Goal typed_predicate_ensures_ko_m_precedence_let_ite : Unsuccess
-[wp] [Alt-Ergo] Goal typed_predicate_ensures_ko_l_precedence_let_ite : Unsuccess
-[wp] [Alt-Ergo] Goal typed_predicate_ensures_ko_l_assoc_naming : Unsuccess
-[wp] [Alt-Ergo] Goal typed_comparison_ensures_ko_r_precedence_and_eq : Unsuccess
-[wp] [Alt-Ergo] Goal typed_comparison_ensures_ko_l_precedence_and_eq : Unsuccess
-[wp] [Alt-Ergo] Goal typed_comparison_ensures_ko_l_nonassoc_eq : Unsuccess
-[wp] [Alt-Ergo] Goal typed_comparison_ensures_ko_r_nonassoc_eq : Unsuccess
-[wp] [Alt-Ergo] Goal typed_comparison_ensures_ko_r_precedence_and_neq : Unsuccess
-[wp] [Alt-Ergo] Goal typed_comparison_ensures_ko_l_precedence_and_neq : Unsuccess
-[wp] [Alt-Ergo] Goal typed_bitwise_ensures_ko_l_precedence_xor_and : Unsuccess
-[wp] [Alt-Ergo] Goal typed_bitwise_ensures_ko_r_precedence_xor_and : Unsuccess
-[wp] [Alt-Ergo] Goal typed_bitwise_ensures_ko_l_precedence_or_xor : Unsuccess
-[wp] [Alt-Ergo] Goal typed_bitwise_ensures_ko_r_precedence_or_xor : Unsuccess
-[wp] [Alt-Ergo] Goal typed_bitwise_ensures_ko_l_precedence_implies_or : Unsuccess
-[wp] [Alt-Ergo] Goal typed_bitwise_ensures_ko_l_assoc_implies : Unsuccess
-[wp] [Alt-Ergo] Goal typed_bitwise_ensures_ko_r_precedence_equiv_implies : Unsuccess
-[wp] [Alt-Ergo] Goal typed_bitwise_ensures_ko_l_precedence_equiv_implies : Unsuccess
+[wp] [Unknown] typed_predicate_ensures_ko_l_precedence_xor_and (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_predicate_ensures_ko_r_precedence_xor_and (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_predicate_ensures_ko_l_precedence_or_xor (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_predicate_ensures_ko_r_precedence_or_xor (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_predicate_ensures_ko_l_precedence_implies_or (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_predicate_ensures_ko_l_assoc_implies (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_predicate_ensures_ko_r_precedence_equiv_implies (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_predicate_ensures_ko_l_precedence_equiv_implies (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_predicate_ensures_ko_r_precedence_ite_equiv (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_predicate_ensures_ko_l_precedence_ite_equiv (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_predicate_ensures_ko_l_assoc_ite (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_predicate_ensures_ko_r_precedence_forall_ite (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_predicate_ensures_ko_m_precedence_forall_ite (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_predicate_ensures_ko_l_precedence_forall_ite (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_predicate_ensures_ko_r_assoc_forall (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_predicate_ensures_ko_r_precedence_exists_ite (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_predicate_ensures_ko_m_precedence_exists_ite (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_predicate_ensures_ko_l_precedence_exists_ite (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_predicate_ensures_ko_r_assoc_exist (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_predicate_ensures_ko_r_precedence_let_ite (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_predicate_ensures_ko_m_precedence_let_ite (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_predicate_ensures_ko_l_precedence_let_ite (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_predicate_ensures_ko_l_assoc_naming (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_comparison_ensures_ko_r_precedence_and_eq (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_comparison_ensures_ko_l_precedence_and_eq (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_comparison_ensures_ko_l_nonassoc_eq (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_comparison_ensures_ko_r_nonassoc_eq (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_comparison_ensures_ko_r_precedence_and_neq (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_comparison_ensures_ko_l_precedence_and_neq (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_bitwise_ensures_ko_l_precedence_xor_and (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_bitwise_ensures_ko_r_precedence_xor_and (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_bitwise_ensures_ko_l_precedence_or_xor (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_bitwise_ensures_ko_r_precedence_or_xor (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_bitwise_ensures_ko_l_precedence_implies_or (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_bitwise_ensures_ko_l_assoc_implies (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_bitwise_ensures_ko_r_precedence_equiv_implies (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_bitwise_ensures_ko_l_precedence_equiv_implies (Alt-Ergo) (Cached)
[wp] Proved goals: 0 / 37
Alt-Ergo: 0 (unsuccess: 37)
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/range.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/range.res.oracle
index ec9aaa9da55..6dad2f63130 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/range.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/range.res.oracle
@@ -3,10 +3,10 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 4 goals scheduled
-[wp] [Qed] Goal typed_test_ensures_P1_ok : Valid
-[wp] [Qed] Goal typed_test_ensures_P2_ok : Valid
-[wp] [Qed] Goal typed_test_call_val_assigns_p_requires_HP_ok : Valid
-[wp] [Qed] Goal typed_test_call_val_assigns_q_requires_HQ_ok : Valid
+[wp] [Valid] typed_test_ensures_P1_ok (Qed)
+[wp] [Valid] typed_test_ensures_P2_ok (Qed)
+[wp] [Valid] typed_test_call_val_assigns_p_requires_HP_ok (Qed)
+[wp] [Valid] typed_test_call_val_assigns_q_requires_HQ_ok (Qed)
[wp] Proved goals: 4 / 4
Qed: 4
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.0.res.oracle
index 5bc26fcefec..2d81f47441e 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.0.res.oracle
@@ -3,13 +3,13 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 7 goals scheduled
-[wp] [Alt-Ergo] Goal typed_f_ensures_qed_ok : Valid
-[wp] [Alt-Ergo] Goal typed_g_ensures_qed_ok : Valid
-[wp] [Qed] Goal typed_modifies_y_ensures_qed_ok_F_OK : Valid
-[wp] [Qed] Goal typed_modifies_y_ensures_qed_ok_G_OK : Valid
-[wp] [Alt-Ergo] Goal typed_modifies_y_ensures_qed_ok_W_OK_todo : Unsuccess
-[wp] [Qed] Goal typed_modifies_x_ensures_qed_ok_F_OK : Valid
-[wp] [Alt-Ergo] Goal typed_modifies_x_ensures_qed_ok_W_OK_todo : Unsuccess
+[wp] [Valid] typed_f_ensures_qed_ok (Alt-Ergo) (Cached)
+[wp] [Valid] typed_g_ensures_qed_ok (Alt-Ergo) (Cached)
+[wp] [Valid] typed_modifies_y_ensures_qed_ok_F_OK (Qed)
+[wp] [Valid] typed_modifies_y_ensures_qed_ok_G_OK (Qed)
+[wp] [Timeout] typed_modifies_y_ensures_qed_ok_W_OK_todo (Alt-Ergo) (Cached)
+[wp] [Valid] typed_modifies_x_ensures_qed_ok_F_OK (Qed)
+[wp] [Timeout] typed_modifies_x_ensures_qed_ok_W_OK_todo (Alt-Ergo) (Cached)
[wp] Proved goals: 5 / 7
Qed: 3
Alt-Ergo: 2 (unsuccess: 2)
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.1.res.oracle
index d7762f73d15..593f439f33e 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.1.res.oracle
@@ -3,9 +3,9 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 3 goals scheduled
-[wp] [Alt-Ergo] Goal typed_modifies_y_ensures_qed_ko_H_KO : Unsuccess
-[wp] [Alt-Ergo] Goal typed_modifies_x_ensures_qed_ko_G_KO : Unsuccess
-[wp] [Alt-Ergo] Goal typed_modifies_x_ensures_qed_ko_H_KO : Unsuccess
+[wp] [Stepout] typed_modifies_y_ensures_qed_ko_H_KO (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_modifies_x_ensures_qed_ko_G_KO (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_modifies_x_ensures_qed_ko_H_KO (Alt-Ergo) (Cached)
[wp] Proved goals: 0 / 3
Alt-Ergo: 0 (unsuccess: 3)
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/record.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/record.0.res.oracle
index a12022bdc95..2a370f7d04e 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/record.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/record.0.res.oracle
@@ -3,17 +3,17 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 11 goals scheduled
-[wp] [Alt-Ergo] Goal typed_f_ensures_M1_qed_ok : Valid
-[wp] [Qed] Goal typed_f_ensures_M2_qed_ok : Valid
-[wp] [Qed] Goal typed_f_ensures_M3_qed_ok : Valid
-[wp] [Qed] Goal typed_f_ensures_M4_qed_ok : Valid
-[wp] [Qed] Goal typed_f_ensures_M5_qed_ok : Valid
-[wp] [Qed] Goal typed_f_ensures_M6_qed_ok : Valid
-[wp] [Qed] Goal typed_f_ensures_P1_qed_ok : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_P2_qed_ok : Valid
-[wp] [Qed] Goal typed_f_ensures_P3_qed_ok : Valid
-[wp] [Qed] Goal typed_f_ensures_P4_qed_ok : Valid
-[wp] [Qed] Goal typed_f_ensures_P5_qed_ok : Valid
+[wp] [Valid] typed_f_ensures_M1_qed_ok (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_ensures_M2_qed_ok (Qed)
+[wp] [Valid] typed_f_ensures_M3_qed_ok (Qed)
+[wp] [Valid] typed_f_ensures_M4_qed_ok (Qed)
+[wp] [Valid] typed_f_ensures_M5_qed_ok (Qed)
+[wp] [Valid] typed_f_ensures_M6_qed_ok (Qed)
+[wp] [Valid] typed_f_ensures_P1_qed_ok (Qed)
+[wp] [Valid] typed_f_ensures_P2_qed_ok (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_ensures_P3_qed_ok (Qed)
+[wp] [Valid] typed_f_ensures_P4_qed_ok (Qed)
+[wp] [Valid] typed_f_ensures_P5_qed_ok (Qed)
[wp] Proved goals: 11 / 11
Qed: 9
Alt-Ergo: 2
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/record.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/record.1.res.oracle
index cf42c84adc3..2c36ef28fbd 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/record.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/record.1.res.oracle
@@ -3,7 +3,7 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_f_ensures_KP5_qed_ko : Unsuccess
+[wp] [Unknown] typed_f_ensures_KP5_qed_ko (Alt-Ergo) (Cached)
[wp] Proved goals: 0 / 1
Alt-Ergo: 0 (unsuccess: 1)
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.res.oracle
index ae73c30ff13..00a1e727fde 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.res.oracle
@@ -3,24 +3,24 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 18 goals scheduled
-[wp] [Alt-Ergo] Goal typed_f_ensures : Valid
-[wp] [Qed] Goal typed_f_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_f_loop_invariant_established : Valid
-[wp] [Alt-Ergo] Goal typed_f_loop_invariant_2_preserved : Valid
-[wp] [Qed] Goal typed_f_loop_invariant_2_established : Valid
-[wp] [Alt-Ergo] Goal typed_f_loop_invariant_3_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_f_loop_invariant_3_established : Valid
-[wp] [Qed] Goal typed_f_loop_assigns_part1 : Valid
-[wp] [Alt-Ergo] Goal typed_f_loop_assigns_part2 : Valid
-[wp] [Alt-Ergo] Goal typed_g_ensures : Valid
-[wp] [Qed] Goal typed_g_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_g_loop_invariant_established : Valid
-[wp] [Alt-Ergo] Goal typed_g_loop_invariant_2_preserved : Valid
-[wp] [Qed] Goal typed_g_loop_invariant_2_established : Valid
-[wp] [Qed] Goal typed_g_loop_assigns : Valid
-[wp] [Alt-Ergo] Goal typed_check_acsl_check_ok_C1_absurd_is_cint : Valid
-[wp] [Alt-Ergo] Goal typed_check_acsl_check_ok_C2_absurd_is_cint : Valid
-[wp] [Qed] Goal typed_check_acsl_check_ok_C5_absurd_cmp : Valid
+[wp] [Valid] typed_f_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_loop_invariant_preserved (Qed)
+[wp] [Valid] typed_f_loop_invariant_established (Qed)
+[wp] [Valid] typed_f_loop_invariant_2_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_loop_invariant_2_established (Qed)
+[wp] [Valid] typed_f_loop_invariant_3_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_loop_invariant_3_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_loop_assigns_part1 (Qed)
+[wp] [Valid] typed_f_loop_assigns_part2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_g_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_g_loop_invariant_preserved (Qed)
+[wp] [Valid] typed_g_loop_invariant_established (Qed)
+[wp] [Valid] typed_g_loop_invariant_2_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_g_loop_invariant_2_established (Qed)
+[wp] [Valid] typed_g_loop_assigns (Qed)
+[wp] [Valid] typed_check_acsl_check_ok_C1_absurd_is_cint (Alt-Ergo) (Cached)
+[wp] [Valid] typed_check_acsl_check_ok_C2_absurd_is_cint (Alt-Ergo) (Cached)
+[wp] [Valid] typed_check_acsl_check_ok_C5_absurd_cmp (Qed)
[wp] Proved goals: 18 / 18
Qed: 9
Alt-Ergo: 9
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/sizeof.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/sizeof.res.oracle
index 22981e00257..5401e552305 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/sizeof.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/sizeof.res.oracle
@@ -3,8 +3,8 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 2 goals scheduled
-[wp] [Alt-Ergo] Goal typed_foo_assert_A : Valid
-[wp] [Alt-Ergo] Goal typed_foo_assert_B : Valid
+[wp] [Valid] typed_foo_assert_A (Alt-Ergo) (Cached)
+[wp] [Valid] typed_foo_assert_B (Alt-Ergo)
[wp] Proved goals: 2 / 2
Qed: 0
Alt-Ergo: 2
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/sqrt_builtins.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/sqrt_builtins.0.res.oracle
index 0c1e537432b..3cde9309edd 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/sqrt_builtins.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/sqrt_builtins.0.res.oracle
@@ -3,8 +3,8 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 2 goals scheduled
-[wp] [Alt-Ergo] Goal typed_test_sqrtf_assert_KO : Unsuccess
-[wp] [Alt-Ergo] Goal typed_test_sqrt_assert_KO : Unsuccess
+[wp] [Timeout] typed_test_sqrtf_assert_KO (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_test_sqrt_assert_KO (Alt-Ergo) (Cached)
[wp] Proved goals: 0 / 2
Alt-Ergo: 0 (unsuccess: 2)
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/sqrt_builtins.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/sqrt_builtins.1.res.oracle
index 2ec3dcbbe7a..9dcd3b655a0 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/sqrt_builtins.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/sqrt_builtins.1.res.oracle
@@ -3,8 +3,8 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 2 goals scheduled
-[wp] [Alt-Ergo] Goal typed_real_test_sqrtf_assert_KO : Unsuccess
-[wp] [Alt-Ergo] Goal typed_real_test_sqrt_assert_KO : Unsuccess
+[wp] [Timeout] typed_real_test_sqrtf_assert_KO (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_real_test_sqrt_assert_KO (Alt-Ergo) (Cached)
[wp] Proved goals: 0 / 2
Alt-Ergo: 0 (unsuccess: 2)
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/struct_use_case.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/struct_use_case.0.res.oracle
index 1efc688a87a..a0851670edf 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/struct_use_case.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/struct_use_case.0.res.oracle
@@ -3,8 +3,8 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 2 goals scheduled
-[wp] [Alt-Ergo] Goal typed_caveat_f_ensures_ok : Valid
-[wp] [Qed] Goal typed_caveat_g_ensures_ok : Valid
+[wp] [Valid] typed_caveat_f_ensures_ok (Alt-Ergo) (Cached)
+[wp] [Valid] typed_caveat_g_ensures_ok (Qed)
[wp] Proved goals: 2 / 2
Qed: 1
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/struct_use_case.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/struct_use_case.1.res.oracle
index 8ac28e497ac..2a3d5f75f3e 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/struct_use_case.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/struct_use_case.1.res.oracle
@@ -3,8 +3,8 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 2 goals scheduled
-[wp] [Alt-Ergo] Goal typed_caveat_f_ensures_ko : Unsuccess
-[wp] [Alt-Ergo] Goal typed_caveat_g_ensures_ko : Unsuccess
+[wp] [Stepout] typed_caveat_f_ensures_ko (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_caveat_g_ensures_ko (Alt-Ergo) (Cached)
[wp] Proved goals: 0 / 2
Alt-Ergo: 0 (unsuccess: 2)
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/terminates_call_options.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/terminates_call_options.0.res.oracle
index 3228e5701f1..246066db189 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/terminates_call_options.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/terminates_call_options.0.res.oracle
@@ -11,11 +11,11 @@
[wp] terminates_call_options.c:38: Warning:
Missing terminates clause on call to div, defaults to \false
[wp] 5 goals scheduled
-[wp] [Qed] Goal typed_definition_assigns : Valid
-[wp] [Alt-Ergo] Goal typed_call_declaration_terminates : Unsuccess
-[wp] [Alt-Ergo] Goal typed_call_definition_terminates : Unsuccess
-[wp] [Alt-Ergo] Goal typed_libc_call_terminates_part1 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_libc_call_terminates_part2 : Unsuccess
+[wp] [Valid] typed_definition_assigns (Qed)
+[wp] [Unknown] typed_call_declaration_terminates (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_call_definition_terminates (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_libc_call_terminates_part1 (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_libc_call_terminates_part2 (Alt-Ergo) (Cached)
[wp] Proved goals: 1 / 5
Qed: 1
Alt-Ergo: 0 (unsuccess: 4)
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/terminates_call_options.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/terminates_call_options.1.res.oracle
index 255e0df6d99..203214fe325 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/terminates_call_options.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/terminates_call_options.1.res.oracle
@@ -16,11 +16,11 @@
[wp] FRAMAC_SHARE/libc/stdlib.h:641: Warning:
Missing terminates clause for div, populates 'terminates \true'
[wp] 5 goals scheduled
-[wp] [Qed] Goal typed_definition_assigns : Valid
-[wp] [Qed] Goal typed_call_declaration_terminates : Valid
-[wp] [Qed] Goal typed_call_definition_terminates : Valid
-[wp] [Alt-Ergo] Goal typed_no_spec_generates_goal_terminates : Unsuccess
-[wp] [Qed] Goal typed_libc_call_terminates : Valid
+[wp] [Valid] typed_definition_assigns (Qed)
+[wp] [Valid] typed_call_declaration_terminates (Qed)
+[wp] [Valid] typed_call_definition_terminates (Qed)
+[wp] [Unknown] typed_no_spec_generates_goal_terminates (Alt-Ergo) (Cached)
+[wp] [Valid] typed_libc_call_terminates (Qed)
[wp] Proved goals: 5 / 6
Qed: 4
Alt-Ergo: 0 (unsuccess: 1)
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/terminates_formulae.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/terminates_formulae.res.oracle
index cb8634fd614..7f6463c2ea7 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/terminates_formulae.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/terminates_formulae.res.oracle
@@ -11,24 +11,24 @@
[wp] terminates_formulae.i:90: Warning:
No 'decreases' clause on recursive function 'no_decreases', cannot prove termination
[wp] 18 goals scheduled
-[wp] [Alt-Ergo] Goal typed_base_call_terminates : Unsuccess
-[wp] [Qed] Goal typed_call_same_terminates : Valid
-[wp] [Alt-Ergo] Goal typed_call_change_terminates : Unsuccess
-[wp] [Qed] Goal typed_call_param_same_terminates : Valid
-[wp] [Alt-Ergo] Goal typed_call_param_change_terminates : Unsuccess
-[wp] [Qed] Goal typed_variant_loop_assigns : Valid
-[wp] [Alt-Ergo] Goal typed_variant_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_variant_loop_variant_positive : Valid
-[wp] [Qed] Goal typed_general_variant_loop_assigns : Valid
-[wp] [Alt-Ergo] Goal typed_general_variant_loop_variant_relation : Valid
-[wp] [Alt-Ergo] Goal typed_no_variant_terminates : Unsuccess
-[wp] [Qed] Goal typed_no_variant_loop_assigns : Valid
-[wp] [Qed] Goal typed_decreases_terminates : Valid
-[wp] [Alt-Ergo] Goal typed_decreases_variant : Valid
-[wp] [Qed] Goal typed_general_decreases_terminates : Valid
-[wp] [Alt-Ergo] Goal typed_general_decreases_variant : Valid
-[wp] [Qed] Goal typed_no_decreases_terminates_part1 : Valid
-[wp] [Alt-Ergo] Goal typed_no_decreases_terminates_part2 : Unsuccess
+[wp] [Timeout] typed_base_call_terminates (Alt-Ergo) (Cached)
+[wp] [Valid] typed_call_same_terminates (Qed)
+[wp] [Timeout] typed_call_change_terminates (Alt-Ergo) (Cached)
+[wp] [Valid] typed_call_param_same_terminates (Qed)
+[wp] [Timeout] typed_call_param_change_terminates (Alt-Ergo) (Cached)
+[wp] [Valid] typed_variant_loop_assigns (Qed)
+[wp] [Valid] typed_variant_loop_variant_decrease (Alt-Ergo) (Cached)
+[wp] [Valid] typed_variant_loop_variant_positive (Qed)
+[wp] [Valid] typed_general_variant_loop_assigns (Qed)
+[wp] [Valid] typed_general_variant_loop_variant_relation (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_no_variant_terminates (Alt-Ergo) (Cached)
+[wp] [Valid] typed_no_variant_loop_assigns (Qed)
+[wp] [Valid] typed_decreases_terminates (Qed)
+[wp] [Valid] typed_decreases_variant (Alt-Ergo) (Cached)
+[wp] [Valid] typed_general_decreases_terminates (Qed)
+[wp] [Valid] typed_general_decreases_variant (Alt-Ergo) (Cached)
+[wp] [Valid] typed_no_decreases_terminates_part1 (Qed)
+[wp] [Unknown] typed_no_decreases_terminates_part2 (Alt-Ergo) (Cached)
[wp] Proved goals: 15 / 20
Qed: 9
Alt-Ergo: 4 (unsuccess: 5)
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/terminates_fp.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/terminates_fp.res.oracle
index 20266aea5b3..3c682dbb4bd 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/terminates_fp.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/terminates_fp.res.oracle
@@ -28,35 +28,35 @@
[wp] terminates_fp.i:78: Warning:
No 'decreases' clause on recursive function 'warns_recursive', cannot prove termination
[wp] 29 goals scheduled
-[wp] [Qed] Goal typed_t_spec_call_point_gt_ht_s2 : Valid
-[wp] [Qed] Goal typed_t_spec_terminates : Valid
-[wp] [Alt-Ergo] Goal typed_t_spec_in_bhv_call_point_gt_hnt_s6 : Valid
-[wp] [Qed] Goal typed_t_spec_in_bhv_complete_B1_B2 : Valid
-[wp] [Qed] Goal typed_t_spec_in_bhv_disjoint_B1_B2 : Valid
-[wp] [Qed] Goal typed_t_spec_in_bhv_terminates_part1 : Valid
-[wp] [Qed] Goal typed_t_spec_in_bhv_terminates_part2 : Valid
-[wp] [Qed] Goal typed_t_spec_in_bhv_call_point_gt_hnt_s6 : Valid
-[wp] [Qed] Goal typed_t_spec_in_bhv_call_point_gt_hnt_s6 : Valid
-[wp] [Qed] Goal typed_no_t_spec_call_point_gnt_hnt_s10 : Valid
-[wp] [Qed] Goal typed_no_t_spec_terminates_part1 : Valid
-[wp] [Alt-Ergo] Goal typed_no_t_spec_terminates_part2 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_no_t_spec_in_bhv_call_point_gnt_hnt_s14 : Valid
-[wp] [Qed] Goal typed_no_t_spec_in_bhv_complete_B1_B2 : Valid
-[wp] [Qed] Goal typed_no_t_spec_in_bhv_disjoint_B1_B2 : Valid
-[wp] [Qed] Goal typed_no_t_spec_in_bhv_terminates_part1 : Valid
-[wp] [Alt-Ergo] Goal typed_no_t_spec_in_bhv_terminates_part2 : Unsuccess
-[wp] [Qed] Goal typed_no_t_spec_in_bhv_call_point_gnt_hnt_s14 : Valid
-[wp] [Qed] Goal typed_no_t_spec_in_bhv_call_point_gnt_hnt_s14 : Valid
-[wp] [Qed] Goal typed_no_t_spec_cond_call_point_gt_hnt_s18 : Valid
-[wp] [Qed] Goal typed_no_t_spec_cond_terminates_part1 : Valid
-[wp] [Alt-Ergo] Goal typed_no_t_spec_cond_terminates_part2 : Unsuccess
-[wp] [Qed] Goal typed_no_t_spec_cond_m_call_point_gt_ht_s22 : Valid
-[wp] [Qed] Goal typed_no_t_spec_cond_m_call_point_hnt_s24_part1 : Valid
-[wp] [Qed] Goal typed_no_t_spec_cond_m_call_point_hnt_s24_part2 : Valid
-[wp] [Qed] Goal typed_no_t_spec_cond_m_terminates_part1 : Valid
-[wp] [Alt-Ergo] Goal typed_no_t_spec_cond_m_terminates_part2 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_no_t_spec_cond_m_terminates_part3 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_warns_recursive_terminates : Unsuccess
+[wp] [Valid] typed_t_spec_call_point_gt_ht_s2 (Qed)
+[wp] [Valid] typed_t_spec_terminates (Qed)
+[wp] [Valid] typed_t_spec_in_bhv_call_point_gt_hnt_s6 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_t_spec_in_bhv_complete_B1_B2 (Qed)
+[wp] [Valid] typed_t_spec_in_bhv_disjoint_B1_B2 (Qed)
+[wp] [Valid] typed_t_spec_in_bhv_terminates_part1 (Qed)
+[wp] [Valid] typed_t_spec_in_bhv_terminates_part2 (Qed)
+[wp] [Valid] typed_t_spec_in_bhv_call_point_gt_hnt_s6 (Qed)
+[wp] [Valid] typed_t_spec_in_bhv_call_point_gt_hnt_s6 (Qed)
+[wp] [Valid] typed_no_t_spec_call_point_gnt_hnt_s10 (Qed)
+[wp] [Valid] typed_no_t_spec_terminates_part1 (Qed)
+[wp] [Unknown] typed_no_t_spec_terminates_part2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_no_t_spec_in_bhv_call_point_gnt_hnt_s14 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_no_t_spec_in_bhv_complete_B1_B2 (Qed)
+[wp] [Valid] typed_no_t_spec_in_bhv_disjoint_B1_B2 (Qed)
+[wp] [Valid] typed_no_t_spec_in_bhv_terminates_part1 (Qed)
+[wp] [Unknown] typed_no_t_spec_in_bhv_terminates_part2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_no_t_spec_in_bhv_call_point_gnt_hnt_s14 (Qed)
+[wp] [Valid] typed_no_t_spec_in_bhv_call_point_gnt_hnt_s14 (Qed)
+[wp] [Valid] typed_no_t_spec_cond_call_point_gt_hnt_s18 (Qed)
+[wp] [Valid] typed_no_t_spec_cond_terminates_part1 (Qed)
+[wp] [Unknown] typed_no_t_spec_cond_terminates_part2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_no_t_spec_cond_m_call_point_gt_ht_s22 (Qed)
+[wp] [Valid] typed_no_t_spec_cond_m_call_point_hnt_s24_part1 (Qed)
+[wp] [Valid] typed_no_t_spec_cond_m_call_point_hnt_s24_part2 (Qed)
+[wp] [Valid] typed_no_t_spec_cond_m_terminates_part1 (Qed)
+[wp] [Unknown] typed_no_t_spec_cond_m_terminates_part2 (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_no_t_spec_cond_m_terminates_part3 (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_warns_recursive_terminates (Alt-Ergo) (Cached)
[wp] Proved goals: 23 / 29
Qed: 21
Alt-Ergo: 2 (unsuccess: 6)
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/terminates_variant_option.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/terminates_variant_option.0.res.oracle
index fe129db3e55..c4107f3d09f 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/terminates_variant_option.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/terminates_variant_option.0.res.oracle
@@ -7,26 +7,26 @@
[wp] [CFG] Goal fails_positive_terminates : Valid (Trivial)
[wp] [CFG] Goal trivial_variant_terminates : Valid (Trivial)
[wp] 20 goals scheduled
-[wp] [Alt-Ergo] Goal typed_fails_positive_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_fails_positive_loop_invariant_established : Valid
-[wp] [Qed] Goal typed_fails_positive_loop_assigns_part1 : Valid
-[wp] [Qed] Goal typed_fails_positive_loop_assigns_part2 : Valid
-[wp] [Qed] Goal typed_fails_positive_loop_variant_decrease : Valid
-[wp] [Alt-Ergo] Goal typed_fails_positive_loop_variant_positive : Unsuccess
-[wp] [Qed] Goal typed_fails_decreases_loop_assigns : Valid
-[wp] [Alt-Ergo] Goal typed_fails_decreases_loop_variant_decrease : Unsuccess
-[wp] [Qed] Goal typed_fails_decreases_loop_variant_positive : Valid
-[wp] [Alt-Ergo] Goal typed_f1_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_f1_loop_invariant_established : Valid
-[wp] [Qed] Goal typed_f1_loop_assigns : Valid
-[wp] [Alt-Ergo] Goal typed_f1_loop_variant_decrease : Unsuccess
-[wp] [Alt-Ergo] Goal typed_f1_loop_variant_positive : Valid
-[wp] [Qed] Goal typed_trivial_variant_loop_assigns : Valid
-[wp] [Alt-Ergo] Goal typed_trivial_variant_loop_variant_decrease : Unsuccess
-[wp] [Alt-Ergo] Goal typed_trivial_variant_loop_variant_positive : Unsuccess
-[wp] [Qed] Goal typed_trivial_variant_default_loop_assigns : Valid
-[wp] [Alt-Ergo] Goal typed_trivial_variant_default_loop_variant_decrease : Unsuccess
-[wp] [Alt-Ergo] Goal typed_trivial_variant_default_loop_variant_positive : Unsuccess
+[wp] [Valid] typed_fails_positive_loop_invariant_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_fails_positive_loop_invariant_established (Qed)
+[wp] [Valid] typed_fails_positive_loop_assigns_part1 (Qed)
+[wp] [Valid] typed_fails_positive_loop_assigns_part2 (Qed)
+[wp] [Valid] typed_fails_positive_loop_variant_decrease (Qed)
+[wp] [Timeout] typed_fails_positive_loop_variant_positive (Alt-Ergo) (Cached)
+[wp] [Valid] typed_fails_decreases_loop_assigns (Qed)
+[wp] [Timeout] typed_fails_decreases_loop_variant_decrease (Alt-Ergo) (Cached)
+[wp] [Valid] typed_fails_decreases_loop_variant_positive (Qed)
+[wp] [Valid] typed_f1_loop_invariant_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f1_loop_invariant_established (Qed)
+[wp] [Valid] typed_f1_loop_assigns (Qed)
+[wp] [Timeout] typed_f1_loop_variant_decrease (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f1_loop_variant_positive (Alt-Ergo) (Cached)
+[wp] [Valid] typed_trivial_variant_loop_assigns (Qed)
+[wp] [Unknown] typed_trivial_variant_loop_variant_decrease (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_trivial_variant_loop_variant_positive (Alt-Ergo) (Cached)
+[wp] [Valid] typed_trivial_variant_default_loop_assigns (Qed)
+[wp] [Unknown] typed_trivial_variant_default_loop_variant_decrease (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_trivial_variant_default_loop_variant_positive (Alt-Ergo) (Cached)
[wp] Proved goals: 17 / 24
Qed: 10
Alt-Ergo: 3 (unsuccess: 7)
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/terminates_variant_option.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/terminates_variant_option.1.res.oracle
index 192d6abde3b..f1754b07c84 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/terminates_variant_option.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/terminates_variant_option.1.res.oracle
@@ -11,26 +11,26 @@
[wp] terminates_variant_option.i:59: Warning:
Loop variant is always trivially verified (terminates \false)
[wp] 20 goals scheduled
-[wp] [Alt-Ergo] Goal typed_fails_positive_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_fails_positive_loop_invariant_established : Valid
-[wp] [Qed] Goal typed_fails_positive_loop_assigns_part1 : Valid
-[wp] [Qed] Goal typed_fails_positive_loop_assigns_part2 : Valid
-[wp] [Qed] Goal typed_fails_positive_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_fails_positive_loop_variant_positive : Valid
-[wp] [Qed] Goal typed_fails_decreases_loop_assigns : Valid
-[wp] [Alt-Ergo] Goal typed_fails_decreases_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_fails_decreases_loop_variant_positive : Valid
-[wp] [Alt-Ergo] Goal typed_f1_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_f1_loop_invariant_established : Valid
-[wp] [Qed] Goal typed_f1_loop_assigns : Valid
-[wp] [Qed] Goal typed_f1_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_f1_loop_variant_positive : Valid
-[wp] [Qed] Goal typed_trivial_variant_loop_assigns : Valid
-[wp] [Qed] Goal typed_trivial_variant_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_trivial_variant_loop_variant_positive : Valid
-[wp] [Qed] Goal typed_trivial_variant_default_loop_assigns : Valid
-[wp] [Qed] Goal typed_trivial_variant_default_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_trivial_variant_default_loop_variant_positive : Valid
+[wp] [Valid] typed_fails_positive_loop_invariant_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_fails_positive_loop_invariant_established (Qed)
+[wp] [Valid] typed_fails_positive_loop_assigns_part1 (Qed)
+[wp] [Valid] typed_fails_positive_loop_assigns_part2 (Qed)
+[wp] [Valid] typed_fails_positive_loop_variant_decrease (Qed)
+[wp] [Valid] typed_fails_positive_loop_variant_positive (Qed)
+[wp] [Valid] typed_fails_decreases_loop_assigns (Qed)
+[wp] [Valid] typed_fails_decreases_loop_variant_decrease (Alt-Ergo) (Cached)
+[wp] [Valid] typed_fails_decreases_loop_variant_positive (Qed)
+[wp] [Valid] typed_f1_loop_invariant_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f1_loop_invariant_established (Qed)
+[wp] [Valid] typed_f1_loop_assigns (Qed)
+[wp] [Valid] typed_f1_loop_variant_decrease (Qed)
+[wp] [Valid] typed_f1_loop_variant_positive (Qed)
+[wp] [Valid] typed_trivial_variant_loop_assigns (Qed)
+[wp] [Valid] typed_trivial_variant_loop_variant_decrease (Qed)
+[wp] [Valid] typed_trivial_variant_loop_variant_positive (Qed)
+[wp] [Valid] typed_trivial_variant_default_loop_assigns (Qed)
+[wp] [Valid] typed_trivial_variant_default_loop_variant_decrease (Qed)
+[wp] [Valid] typed_trivial_variant_default_loop_variant_positive (Qed)
[wp] Proved goals: 24 / 24
Qed: 17
Alt-Ergo: 3
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/tset.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/tset.res.oracle
index 09696132705..6c5d020023d 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/tset.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/tset.res.oracle
@@ -2,10 +2,10 @@
[kernel] Parsing tset.i (no preprocessing)
[wp] Running WP plugin...
[wp] 4 goals scheduled
-[wp] [Qed] Goal typed_lemma_UNION_DESCR : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_UNION_EQ : Valid
-[wp] [Qed] Goal typed_lemma_UNION_LIFT : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_UNION_RANGE : Valid
+[wp] [Valid] typed_lemma_UNION_DESCR (Qed)
+[wp] [Valid] typed_lemma_UNION_EQ (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_UNION_LIFT (Qed)
+[wp] [Valid] typed_lemma_UNION_RANGE (Alt-Ergo) (Cached)
[wp] Proved goals: 4 / 4
Qed: 2
Alt-Ergo: 2
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/type_guard.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/type_guard.0.res.oracle
index 171329197f0..c487ec99314 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/type_guard.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/type_guard.0.res.oracle
@@ -3,7 +3,7 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_f_ensures_qed_ok : Valid
+[wp] [Valid] typed_f_ensures_qed_ok (Alt-Ergo) (Cached)
[wp] Proved goals: 1 / 1
Qed: 0
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/type_guard.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/type_guard.1.res.oracle
index f3b30166b51..34bccc4f088 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/type_guard.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/type_guard.1.res.oracle
@@ -3,7 +3,7 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_f_ensures_qed_ko : Unsuccess
+[wp] [Stepout] typed_f_ensures_qed_ko (Alt-Ergo) (Cached)
[wp] Proved goals: 0 / 1
Alt-Ergo: 0 (unsuccess: 1)
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/unit_bit_test.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/unit_bit_test.res.oracle
index 7d027492563..e6f0109138a 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/unit_bit_test.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/unit_bit_test.res.oracle
@@ -3,10 +3,10 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 4 goals scheduled
-[wp] [Qed] Goal typed_sum_ensures_ok : Valid
-[wp] [Alt-Ergo] Goal typed_sum_ensures_ko : Unsuccess
-[wp] [Qed] Goal typed_rotate_left_ensures_bit_zero : Valid
-[wp] [Alt-Ergo] Goal typed_rotate_left_ensures_other_bits : Valid
+[wp] [Valid] typed_sum_ensures_ok (Qed)
+[wp] [Timeout] typed_sum_ensures_ko (Alt-Ergo) (Cached)
+[wp] [Valid] typed_rotate_left_ensures_bit_zero (Qed)
+[wp] [Valid] typed_rotate_left_ensures_other_bits (Alt-Ergo) (Cached)
[wp] Proved goals: 3 / 4
Qed: 2
Alt-Ergo: 1 (unsuccess: 1)
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/unit_bool.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/unit_bool.res.oracle
index 2d38dce7159..3730097b6b3 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/unit_bool.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/unit_bool.res.oracle
@@ -3,21 +3,21 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 15 goals scheduled
-[wp] [Alt-Ergo] Goal typed_lemma_f_1 : Valid
-[wp] [Qed] Goal typed_boolean_casts_check_C0 : Valid
-[wp] [Qed] Goal typed_boolean_casts_check_C1 : Valid
-[wp] [Qed] Goal typed_boolean_casts_check_c0 : Valid
-[wp] [Qed] Goal typed_boolean_casts_check_c1 : Valid
-[wp] [Qed] Goal typed_boolean_casts_check_c2 : Valid
-[wp] [Qed] Goal typed_boolean_casts_check_X0 : Valid
-[wp] [Qed] Goal typed_boolean_casts_check_X1 : Valid
-[wp] [Qed] Goal typed_boolean_casts_check_x0 : Valid
-[wp] [Qed] Goal typed_boolean_casts_check_x1 : Valid
-[wp] [Qed] Goal typed_boolean_casts_check_x2 : Valid
-[wp] [Qed] Goal typed_boolean_casts_check_B0 : Valid
-[wp] [Qed] Goal typed_boolean_casts_check_B1 : Valid
-[wp] [Qed] Goal typed_boolean_casts_check_b0 : Valid
-[wp] [Qed] Goal typed_boolean_casts_check_b1 : Valid
+[wp] [Valid] typed_lemma_f_1 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_boolean_casts_check_C0 (Qed)
+[wp] [Valid] typed_boolean_casts_check_C1 (Qed)
+[wp] [Valid] typed_boolean_casts_check_c0 (Qed)
+[wp] [Valid] typed_boolean_casts_check_c1 (Qed)
+[wp] [Valid] typed_boolean_casts_check_c2 (Qed)
+[wp] [Valid] typed_boolean_casts_check_X0 (Qed)
+[wp] [Valid] typed_boolean_casts_check_X1 (Qed)
+[wp] [Valid] typed_boolean_casts_check_x0 (Qed)
+[wp] [Valid] typed_boolean_casts_check_x1 (Qed)
+[wp] [Valid] typed_boolean_casts_check_x2 (Qed)
+[wp] [Valid] typed_boolean_casts_check_B0 (Qed)
+[wp] [Valid] typed_boolean_casts_check_B1 (Qed)
+[wp] [Valid] typed_boolean_casts_check_b0 (Qed)
+[wp] [Valid] typed_boolean_casts_check_b1 (Qed)
[wp] Proved goals: 15 / 15
Qed: 14
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/user_def_type_guard.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/user_def_type_guard.0.res.oracle
index 421d5032376..3e057a637fa 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/user_def_type_guard.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/user_def_type_guard.0.res.oracle
@@ -3,7 +3,7 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_f_ensures_qed_ok : Valid
+[wp] [Valid] typed_f_ensures_qed_ok (Alt-Ergo) (Cached)
[wp] Proved goals: 1 / 1
Qed: 0
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/user_def_type_guard.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/user_def_type_guard.1.res.oracle
index 0b69f7daf85..b250d9f4c45 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/user_def_type_guard.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/user_def_type_guard.1.res.oracle
@@ -3,7 +3,7 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_f_ensures_qed_ko : Unsuccess
+[wp] [Stepout] typed_f_ensures_qed_ko (Alt-Ergo) (Cached)
[wp] Proved goals: 0 / 1
Alt-Ergo: 0 (unsuccess: 1)
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts0708.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts0708.res.oracle
index 249f9cac609..b8ed1640d54 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts0708.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts0708.res.oracle
@@ -3,7 +3,7 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_f_ensures_A : Valid
+[wp] [Valid] typed_f_ensures_A (Alt-Ergo) (Cached)
[wp] Proved goals: 1 / 1
Qed: 0
Alt-Ergo: 1
@@ -13,7 +13,7 @@
------------------------------------------------------------
[wp] Running WP plugin...
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_f_ensures_B : Valid
+[wp] [Valid] typed_f_ensures_B (Alt-Ergo) (Cached)
[wp] Proved goals: 1 / 1
Qed: 0
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts0843.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts0843.res.oracle
index 0802c5dbaa9..7cc44e2d2b3 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts0843.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts0843.res.oracle
@@ -3,10 +3,10 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 4 goals scheduled
-[wp] [Qed] Goal typed_f3_assigns : Valid
-[wp] [Alt-Ergo] Goal typed_g3_assigns_exit : Valid
-[wp] [Alt-Ergo] Goal typed_g3_assigns_normal : Valid
-[wp] [Qed] Goal typed_g3_call_f3_requires : Valid
+[wp] [Valid] typed_f3_assigns (Qed)
+[wp] [Valid] typed_g3_assigns_exit (Alt-Ergo)
+[wp] [Valid] typed_g3_assigns_normal (Alt-Ergo)
+[wp] [Valid] typed_g3_call_f3_requires (Qed)
[wp] Proved goals: 4 / 4
Qed: 2
Alt-Ergo: 2
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts779.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts779.res.oracle
index 8faeff06e9f..f31ddb2fcd4 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts779.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts779.res.oracle
@@ -3,8 +3,8 @@
[wp] Running WP plugin...
[rte:annot] annotating function f
[wp] 2 goals scheduled
-[wp] [Qed] Goal typed_f_assert : Valid
-[wp] [Alt-Ergo] Goal typed_f_assert_rte_mem_access : Unsuccess
+[wp] [Valid] typed_f_assert (Qed)
+[wp] [Timeout] typed_f_assert_rte_mem_access (Alt-Ergo) (Cached)
[wp] Proved goals: 1 / 2
Qed: 1
Alt-Ergo: 0 (unsuccess: 1)
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts788.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts788.res.oracle
index 2554eb42731..16ef3ee8df3 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts788.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts788.res.oracle
@@ -3,9 +3,9 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 3 goals scheduled
-[wp] [Qed] Goal typed_ref_main_ensures_I0 : Valid
-[wp] [Alt-Ergo] Goal typed_ref_main_ensures_I1 : Valid
-[wp] [Alt-Ergo] Goal typed_ref_main_ensures_I2 : Valid
+[wp] [Valid] typed_ref_main_ensures_I0 (Qed)
+[wp] [Valid] typed_ref_main_ensures_I1 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_main_ensures_I2 (Alt-Ergo) (Cached)
[wp] Proved goals: 3 / 3
Qed: 1
Alt-Ergo: 2
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts986.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts986.res.oracle
index 0ef4130fb85..e39168bc79c 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts986.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts986.res.oracle
@@ -3,7 +3,7 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_f_assert_A : Valid
+[wp] [Valid] typed_f_assert_A (Alt-Ergo) (Cached)
[wp] Proved goals: 1 / 1
Qed: 0
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1174.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1174.res.oracle
index 288a484c71d..9bd0a0c1912 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1174.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1174.res.oracle
@@ -3,7 +3,7 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_real_job_assert_qed_ok : Valid
+[wp] [Valid] typed_real_job_assert_qed_ok (Alt-Ergo) (Cached)
[wp] Proved goals: 1 / 1
Qed: 0
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1176.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1176.res.oracle
index e8fdfc5b1a2..313906f6488 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1176.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1176.res.oracle
@@ -3,7 +3,7 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 1 goal scheduled
-[wp] [Qed] Goal typed_f_assert_qed_ok : Valid
+[wp] [Valid] typed_f_assert_qed_ok (Qed)
[wp] Proved goals: 1 / 1
Qed: 1
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1360.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1360.res.oracle
index 92f813ec7b9..81cb35e5ff9 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1360.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1360.res.oracle
@@ -4,16 +4,16 @@
[rte:annot] annotating function foo_correct
[rte:annot] annotating function foo_wrong
[wp] 10 goals scheduled
-[wp] [Qed] Goal typed_foo_wrong_ensures : Valid
-[wp] [Qed] Goal typed_foo_wrong_assert_rte_mem_access : Valid
-[wp] [Qed] Goal typed_foo_wrong_assert_rte_mem_access_2 : Valid
-[wp] [Alt-Ergo] Goal typed_foo_wrong_assert_rte_mem_access_3 : Unsuccess
-[wp] [Qed] Goal typed_foo_wrong_assigns : Valid
-[wp] [Qed] Goal typed_foo_correct_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_foo_correct_assert_rte_mem_access : Valid
-[wp] [Qed] Goal typed_foo_correct_assert_rte_mem_access_2 : Valid
-[wp] [Qed] Goal typed_foo_correct_assert_rte_mem_access_3 : Valid
-[wp] [Qed] Goal typed_foo_correct_assigns : Valid
+[wp] [Valid] typed_foo_wrong_ensures (Qed)
+[wp] [Valid] typed_foo_wrong_assert_rte_mem_access (Qed)
+[wp] [Valid] typed_foo_wrong_assert_rte_mem_access_2 (Qed)
+[wp] [Timeout] typed_foo_wrong_assert_rte_mem_access_3 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_foo_wrong_assigns (Qed)
+[wp] [Valid] typed_foo_correct_ensures (Qed)
+[wp] [Valid] typed_foo_correct_assert_rte_mem_access (Alt-Ergo) (Cached)
+[wp] [Valid] typed_foo_correct_assert_rte_mem_access_2 (Qed)
+[wp] [Valid] typed_foo_correct_assert_rte_mem_access_3 (Qed)
+[wp] [Valid] typed_foo_correct_assigns (Qed)
[wp] Proved goals: 9 / 10
Qed: 8
Alt-Ergo: 1 (unsuccess: 1)
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1462.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1462.res.oracle
index 53303432f91..aede83fc10c 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1462.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1462.res.oracle
@@ -3,19 +3,19 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 13 goals scheduled
-[wp] [Alt-Ergo] Goal typed_wrong_assert_for_value : Valid
-[wp] [Alt-Ergo] Goal typed_wrong_loop_invariant_A_KO_preserved : Unsuccess
-[wp] [Qed] Goal typed_wrong_loop_invariant_A_KO_established : Valid
-[wp] [Qed] Goal typed_wrong_loop_invariant_B_preserved : Valid
-[wp] [Qed] Goal typed_wrong_loop_invariant_B_established : Valid
-[wp] [Qed] Goal typed_wrong_loop_invariant_C_preserved : Valid
-[wp] [Qed] Goal typed_wrong_loop_invariant_C_established : Valid
-[wp] [Alt-Ergo] Goal typed_wrong_assert_consequence_of_false_invariant : Valid
-[wp] [Qed] Goal typed_wrong_loop_assigns : Valid
-[wp] [Qed] Goal typed_local_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_local_loop_invariant_established : Valid
-[wp] [Qed] Goal typed_local_loop_assigns_part1 : Valid
-[wp] [Qed] Goal typed_local_loop_assigns_part2 : Valid
+[wp] [Valid] typed_wrong_assert_for_value (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_wrong_loop_invariant_A_KO_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_wrong_loop_invariant_A_KO_established (Qed)
+[wp] [Valid] typed_wrong_loop_invariant_B_preserved (Qed)
+[wp] [Valid] typed_wrong_loop_invariant_B_established (Qed)
+[wp] [Valid] typed_wrong_loop_invariant_C_preserved (Qed)
+[wp] [Valid] typed_wrong_loop_invariant_C_established (Qed)
+[wp] [Valid] typed_wrong_assert_consequence_of_false_invariant (Alt-Ergo) (Cached)
+[wp] [Valid] typed_wrong_loop_assigns (Qed)
+[wp] [Valid] typed_local_loop_invariant_preserved (Qed)
+[wp] [Valid] typed_local_loop_invariant_established (Qed)
+[wp] [Valid] typed_local_loop_assigns_part1 (Qed)
+[wp] [Valid] typed_local_loop_assigns_part2 (Qed)
[wp] Proved goals: 12 / 13
Qed: 10
Alt-Ergo: 2 (unsuccess: 1)
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1586.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1586.res.oracle
index 326de6e3cf4..06ba1333f31 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1586.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1586.res.oracle
@@ -3,10 +3,10 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 4 goals scheduled
-[wp] [Qed] Goal typed_compute_bizarre_Bizarre_ensures_TRANS : Valid
-[wp] [Qed] Goal typed_compute_normal_Normal_ensures_TRANS : Valid
-[wp] [Alt-Ergo] Goal typed_main_bizarre_KO_assert_FALSE : Unsuccess
-[wp] [Alt-Ergo] Goal typed_main_normal_KO_assert_FALSE : Unsuccess
+[wp] [Valid] typed_compute_bizarre_Bizarre_ensures_TRANS (Qed)
+[wp] [Valid] typed_compute_normal_Normal_ensures_TRANS (Qed)
+[wp] [Unknown] typed_main_bizarre_KO_assert_FALSE (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_main_normal_KO_assert_FALSE (Alt-Ergo) (Cached)
[wp] Proved goals: 2 / 4
Qed: 2
Alt-Ergo: 0 (unsuccess: 2)
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1588.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1588.res.oracle
index 5e2c4f9562f..cd15d16ee5f 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1588.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1588.res.oracle
@@ -7,9 +7,9 @@
[wp] bts_1588.i:5: Warning:
Missing assigns clause (assigns 'everything' instead)
[wp] 3 goals scheduled
-[wp] [Qed] Goal typed_f_loop_invariant_l1_2_preserved : Valid
-[wp] [Qed] Goal typed_f_loop_invariant_l1_2_established : Valid
-[wp] [Qed] Goal typed_f_assert_a1 : Valid
+[wp] [Valid] typed_f_loop_invariant_l1_2_preserved (Qed)
+[wp] [Valid] typed_f_loop_invariant_l1_2_established (Qed)
+[wp] [Valid] typed_f_assert_a1 (Qed)
[wp] Proved goals: 3 / 3
Qed: 3
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1601.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1601.res.oracle
index c27e58cfd85..70e2286bc86 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1601.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1601.res.oracle
@@ -3,14 +3,14 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 8 goals scheduled
-[wp] [Alt-Ergo] Goal typed_foo_assert : Valid
-[wp] [Qed] Goal typed_foo_assert_2 : Valid
-[wp] [Qed] Goal typed_foo_assert_3 : Valid
-[wp] [Qed] Goal typed_foo_assert_4 : Valid
-[wp] [Qed] Goal typed_foo_assert_5 : Valid
-[wp] [Qed] Goal typed_foo_assert_6 : Valid
-[wp] [Qed] Goal typed_foo_assert_7 : Valid
-[wp] [Qed] Goal typed_foo_basic_ensures : Valid
+[wp] [Valid] typed_foo_assert (Alt-Ergo) (Cached)
+[wp] [Valid] typed_foo_assert_2 (Qed)
+[wp] [Valid] typed_foo_assert_3 (Qed)
+[wp] [Valid] typed_foo_assert_4 (Qed)
+[wp] [Valid] typed_foo_assert_5 (Qed)
+[wp] [Valid] typed_foo_assert_6 (Qed)
+[wp] [Valid] typed_foo_assert_7 (Qed)
+[wp] [Valid] typed_foo_basic_ensures (Qed)
[wp] Proved goals: 8 / 8
Qed: 7
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1828.0.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1828.0.res.oracle
index 139697cf571..9ef06ef07a1 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1828.0.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1828.0.res.oracle
@@ -3,12 +3,12 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 6 goals scheduled
-[wp] [Alt-Ergo] Goal typed_local_frame_assert_ok : Valid
-[wp] [Alt-Ergo] Goal typed_global_frame_ensures_sep_iff_ref : Unsuccess
-[wp] [Alt-Ergo] Goal typed_global_frame_ensures_one_iff_ref : Unsuccess
-[wp] [Qed] Goal typed_global_frame_ensures_zero_always : Valid
-[wp] [Qed] Goal typed_global_frame_assert_ok : Valid
-[wp] [Qed] Goal typed_global_frame_assert_ok_2 : Valid
+[wp] [Valid] typed_local_frame_assert_ok (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_global_frame_ensures_sep_iff_ref (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_global_frame_ensures_one_iff_ref (Alt-Ergo) (Cached)
+[wp] [Valid] typed_global_frame_ensures_zero_always (Qed)
+[wp] [Valid] typed_global_frame_assert_ok (Qed)
+[wp] [Valid] typed_global_frame_assert_ok_2 (Qed)
[wp] Proved goals: 4 / 6
Qed: 3
Alt-Ergo: 1 (unsuccess: 2)
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1828.1.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1828.1.res.oracle
index 5a6c637d9f6..dfaff659223 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1828.1.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1828.1.res.oracle
@@ -3,12 +3,12 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 6 goals scheduled
-[wp] [Alt-Ergo] Goal typed_ref_local_frame_assert_ok : Valid
-[wp] [Qed] Goal typed_ref_global_frame_ensures_sep_iff_ref : Valid
-[wp] [Qed] Goal typed_ref_global_frame_ensures_one_iff_ref : Valid
-[wp] [Qed] Goal typed_ref_global_frame_ensures_zero_always : Valid
-[wp] [Qed] Goal typed_ref_global_frame_assert_ok : Valid
-[wp] [Qed] Goal typed_ref_global_frame_assert_ok_2 : Valid
+[wp] [Valid] typed_ref_local_frame_assert_ok (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_global_frame_ensures_sep_iff_ref (Qed)
+[wp] [Valid] typed_ref_global_frame_ensures_one_iff_ref (Qed)
+[wp] [Valid] typed_ref_global_frame_ensures_zero_always (Qed)
+[wp] [Valid] typed_ref_global_frame_assert_ok (Qed)
+[wp] [Valid] typed_ref_global_frame_assert_ok_2 (Qed)
[wp] Proved goals: 6 / 6
Qed: 5
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_2040.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_2040.res.oracle
index a407bf2ca06..5d12d15b5e6 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_2040.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_2040.res.oracle
@@ -3,7 +3,7 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 1 goal scheduled
-[wp] [Qed] Goal typed_call_assert : Valid
+[wp] [Valid] typed_call_assert (Qed)
[wp] Proved goals: 1 / 1
Qed: 1
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_2079.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_2079.res.oracle
index cb6c2c3d0f1..02b2ed5961d 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_2079.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_2079.res.oracle
@@ -3,8 +3,8 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 2 goals scheduled
-[wp] [Qed] Goal typed_main_ensures_Eval_P : Valid
-[wp] [Qed] Goal typed_main_ensures_Eval_Q : Valid
+[wp] [Valid] typed_main_ensures_Eval_P (Qed)
+[wp] [Valid] typed_main_ensures_Eval_Q (Qed)
[wp] Proved goals: 2 / 2
Qed: 2
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_2159.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_2159.res.oracle
index 786136c4a21..71cc141c287 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_2159.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_2159.res.oracle
@@ -3,7 +3,7 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_job_ensures : Valid
+[wp] [Valid] typed_job_ensures (Alt-Ergo) (Cached)
[wp] Proved goals: 1 / 1
Qed: 0
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_2471.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_2471.res.oracle
index 7aee840f3b3..309be1fbe5b 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_2471.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_2471.res.oracle
@@ -3,7 +3,7 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_foo_assert_ko : Unsuccess
+[wp] [Timeout] typed_foo_assert_ko (Alt-Ergo) (Cached)
[wp] Proved goals: 0 / 1
Alt-Ergo: 0 (unsuccess: 1)
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/ergo_typecheck.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/ergo_typecheck.res.oracle
index 6f05d1615c3..564c7efdea5 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/ergo_typecheck.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/ergo_typecheck.res.oracle
@@ -3,14 +3,14 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 8 goals scheduled
-[wp] [Qed] Goal typed_f_ensures_var_divded : Valid
-[wp] [Qed] Goal typed_f_ensures_var_inline : Valid
-[wp] [Qed] Goal typed_f_ensures_var_unit0 : Valid
-[wp] [Qed] Goal typed_f_ensures_var_unit1 : Valid
-[wp] [Qed] Goal typed_f_ensures_var_unit2 : Valid
-[wp] [Qed] Goal typed_f_ensures_var_unit3 : Valid
-[wp] [Qed] Goal typed_f_ensures_var_unit4 : Valid
-[wp] [Qed] Goal typed_f_assigns : Valid
+[wp] [Valid] typed_f_ensures_var_divded (Qed)
+[wp] [Valid] typed_f_ensures_var_inline (Qed)
+[wp] [Valid] typed_f_ensures_var_unit0 (Qed)
+[wp] [Valid] typed_f_ensures_var_unit1 (Qed)
+[wp] [Valid] typed_f_ensures_var_unit2 (Qed)
+[wp] [Valid] typed_f_ensures_var_unit3 (Qed)
+[wp] [Valid] typed_f_ensures_var_unit4 (Qed)
+[wp] [Valid] typed_f_assigns (Qed)
[wp] Proved goals: 8 / 8
Qed: 8
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue-364.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue-364.res.oracle
index 41b0c6bc783..d8dbbb2fe5a 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue-364.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue-364.res.oracle
@@ -3,8 +3,8 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 2 goals scheduled
-[wp] [Alt-Ergo] Goal typed_main_assert_ZERO : Valid
-[wp] [Alt-Ergo] Goal typed_main_assert_OVER : Valid
+[wp] [Valid] typed_main_assert_ZERO (Alt-Ergo) (Cached)
+[wp] [Valid] typed_main_assert_OVER (Alt-Ergo) (Cached)
[wp] Proved goals: 2 / 2
Qed: 0
Alt-Ergo: 2
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue-684-exit.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue-684-exit.res.oracle
index 8792b49802b..ad15f4f295e 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue-684-exit.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue-684-exit.res.oracle
@@ -3,10 +3,10 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 4 goals scheduled
-[wp] [Qed] Goal typed_inconditional_exit_ensures : Valid
-[wp] [Qed] Goal typed_inconditional_exit_exits : Valid
-[wp] [Qed] Goal typed_inconditional_exit_assigns_exit : Valid
-[wp] [Qed] Goal typed_inconditional_exit_assigns_normal : Valid
+[wp] [Valid] typed_inconditional_exit_ensures (Qed)
+[wp] [Valid] typed_inconditional_exit_exits (Qed)
+[wp] [Valid] typed_inconditional_exit_assigns_exit (Qed)
+[wp] [Valid] typed_inconditional_exit_assigns_normal (Qed)
[wp] Proved goals: 4 / 4
Qed: 4
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_198.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_198.res.oracle
index ca918c67e92..9c9178bd14e 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_198.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_198.res.oracle
@@ -2,7 +2,7 @@
[kernel] Parsing issue_198.i (no preprocessing)
[wp] Running WP plugin...
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_lemma_broken : Valid
+[wp] [Valid] typed_lemma_broken (Alt-Ergo) (Cached)
[wp] Proved goals: 1 / 1
Qed: 0
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_259.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_259.res.oracle
index ecae06baa07..9c4292aa4d8 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_259.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_259.res.oracle
@@ -3,13 +3,13 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 7 goals scheduled
-[wp] [Qed] Goal typed_f_assigns : Valid
-[wp] [Qed] Goal typed_g_assigns_exit : Valid
-[wp] [Qed] Goal typed_g_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_g_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_g_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_g_assigns_normal_part4 : Valid
-[wp] [Qed] Goal typed_g_assigns_normal_part5 : Valid
+[wp] [Valid] typed_f_assigns (Qed)
+[wp] [Valid] typed_g_assigns_exit (Qed)
+[wp] [Valid] typed_g_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_g_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_g_assigns_normal_part3 (Qed)
+[wp] [Valid] typed_g_assigns_normal_part4 (Qed)
+[wp] [Valid] typed_g_assigns_normal_part5 (Qed)
[wp] Proved goals: 7 / 7
Qed: 7
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_447.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_447.res.oracle
index 819ed2e218d..913f8afed00 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_447.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_447.res.oracle
@@ -2,7 +2,7 @@
[kernel] Parsing issue_447.i (no preprocessing)
[wp] Running WP plugin...
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_lemma_foo : Valid
+[wp] [Valid] typed_lemma_foo (Alt-Ergo)
[wp] Proved goals: 1 / 1
Qed: 0
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_494.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_494.res.oracle
index ac23b5b748d..8fcd310c965 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_494.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_494.res.oracle
@@ -3,9 +3,9 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 3 goals scheduled
-[wp] [Alt-Ergo] Goal typed_f_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_job_ko_fixed_assert_Wrong : Unsuccess
-[wp] [Alt-Ergo] Goal typed_job_ko_success_assert_Wrong : Unsuccess
+[wp] [Valid] typed_f_ensures (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_job_ko_fixed_assert_Wrong (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_job_ko_success_assert_Wrong (Alt-Ergo) (Cached)
[wp] Proved goals: 1 / 3
Qed: 0
Alt-Ergo: 1 (unsuccess: 2)
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_508.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_508.res.oracle
index 75201f17f42..de95b285618 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_508.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_508.res.oracle
@@ -3,9 +3,9 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 3 goals scheduled
-[wp] [Alt-Ergo] Goal typed_add_assigns_part1 : Valid
-[wp] [Qed] Goal typed_add_assigns_part2 : Valid
-[wp] [Qed] Goal typed_add_assigns_part3 : Valid
+[wp] [Valid] typed_add_assigns_part1 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_add_assigns_part2 (Qed)
+[wp] [Valid] typed_add_assigns_part3 (Qed)
[wp] Proved goals: 3 / 3
Qed: 2
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_711.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_711.res.oracle
index 9a296ca593e..61fc80ca400 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_711.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_711.res.oracle
@@ -2,7 +2,7 @@
[kernel] Parsing issue_711.i (no preprocessing)
[wp] Running WP plugin...
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_lemma_A : Valid
+[wp] [Valid] typed_lemma_A (Alt-Ergo) (Cached)
[wp] Proved goals: 1 / 1
Qed: 0
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_715_a.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_715_a.res.oracle
index f9c7a0b4763..295a361966c 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_715_a.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_715_a.res.oracle
@@ -5,7 +5,7 @@
No code nor implicit assigns clause for function dummy, generating default assigns from the prototype
[wp] Warning: Missing RTE guards
[wp] 1 goal scheduled
-[wp] [Qed] Goal typed_foo_call_dummy_requires : Valid
+[wp] [Valid] typed_foo_call_dummy_requires (Qed)
[wp] Proved goals: 1 / 1
Qed: 1
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_715_b.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_715_b.res.oracle
index 301704e67cd..37fd36bfb08 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_715_b.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_715_b.res.oracle
@@ -5,8 +5,8 @@
No code nor implicit assigns clause for function dummy, generating default assigns from the prototype
[wp] Warning: Missing RTE guards
[wp] 2 goals scheduled
-[wp] [Alt-Ergo] Goal typed_foo_call_dummy_requires : Valid
-[wp] [Qed] Goal typed_foo_call_dummy_requires_2 : Valid
+[wp] [Valid] typed_foo_call_dummy_requires (Alt-Ergo) (Cached)
+[wp] [Valid] typed_foo_call_dummy_requires_2 (Qed)
[wp] Proved goals: 2 / 2
Qed: 1
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_751.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_751.res.oracle
index 6631c35af9b..8154e13bad6 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_751.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_751.res.oracle
@@ -3,46 +3,46 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 40 goals scheduled
-[wp] [Qed] Goal typed_acquire_loop_invariant_RANGE_preserved : Valid
-[wp] [Qed] Goal typed_acquire_loop_invariant_RANGE_established : Valid
-[wp] [Qed] Goal typed_acquire_loop_assigns_part1 : Valid
-[wp] [Alt-Ergo] Goal typed_acquire_loop_assigns_part2 : Valid
-[wp] [Qed] Goal typed_issue_751_check : Valid
-[wp] [Qed] Goal typed_issue_751_check_2 : Valid
-[wp] [Qed] Goal typed_issue_751_check_3 : Valid
-[wp] [Qed] Goal typed_issue_751_check_4 : Valid
-[wp] [Qed] Goal typed_issue_751_call_checks_requires_pos_max : Valid
-[wp] [Qed] Goal typed_issue_751_call_checks_requires_neg_max : Valid
-[wp] [Qed] Goal typed_issue_751_call_checks_requires_pos_min : Valid
-[wp] [Qed] Goal typed_issue_751_call_checks_requires_neg_min : Valid
-[wp] [Qed] Goal typed_issue_751_call_checks_requires_strict_pos_max : Valid
-[wp] [Qed] Goal typed_issue_751_call_checks_requires_strict_neg_max : Valid
-[wp] [Qed] Goal typed_issue_751_call_checks_requires_strict_pos_min : Valid
-[wp] [Qed] Goal typed_issue_751_call_checks_requires_strict_neg_min : Valid
-[wp] [Alt-Ergo] Goal typed_issue_751_call_checks_2_requires_pos_max : Valid
-[wp] [Qed] Goal typed_issue_751_call_checks_2_requires_neg_max : Valid
-[wp] [Alt-Ergo] Goal typed_issue_751_call_checks_2_requires_pos_min : Valid
-[wp] [Qed] Goal typed_issue_751_call_checks_2_requires_neg_min : Valid
-[wp] [Alt-Ergo] Goal typed_issue_751_call_checks_2_requires_strict_pos_max : Valid
-[wp] [Qed] Goal typed_issue_751_call_checks_2_requires_strict_neg_max : Valid
-[wp] [Alt-Ergo] Goal typed_issue_751_call_checks_2_requires_strict_pos_min : Valid
-[wp] [Qed] Goal typed_issue_751_call_checks_2_requires_strict_neg_min : Valid
-[wp] [Qed] Goal typed_issue_751_call_checks_3_requires_pos_max : Valid
-[wp] [Alt-Ergo] Goal typed_issue_751_call_checks_3_requires_neg_max : Valid
-[wp] [Qed] Goal typed_issue_751_call_checks_3_requires_pos_min : Valid
-[wp] [Alt-Ergo] Goal typed_issue_751_call_checks_3_requires_neg_min : Valid
-[wp] [Qed] Goal typed_issue_751_call_checks_3_requires_strict_pos_max : Valid
-[wp] [Alt-Ergo] Goal typed_issue_751_call_checks_3_requires_strict_neg_max : Valid
-[wp] [Qed] Goal typed_issue_751_call_checks_3_requires_strict_pos_min : Valid
-[wp] [Alt-Ergo] Goal typed_issue_751_call_checks_3_requires_strict_neg_min : Valid
-[wp] [Alt-Ergo] Goal typed_issue_751_call_checks_4_requires_pos_max : Valid
-[wp] [Qed] Goal typed_issue_751_call_checks_4_requires_neg_max : Valid
-[wp] [Alt-Ergo] Goal typed_issue_751_call_checks_4_requires_pos_min : Valid
-[wp] [Qed] Goal typed_issue_751_call_checks_4_requires_neg_min : Valid
-[wp] [Alt-Ergo] Goal typed_issue_751_call_checks_4_requires_strict_pos_max : Valid
-[wp] [Qed] Goal typed_issue_751_call_checks_4_requires_strict_neg_max : Valid
-[wp] [Alt-Ergo] Goal typed_issue_751_call_checks_4_requires_strict_pos_min : Valid
-[wp] [Qed] Goal typed_issue_751_call_checks_4_requires_strict_neg_min : Valid
+[wp] [Valid] typed_acquire_loop_invariant_RANGE_preserved (Qed)
+[wp] [Valid] typed_acquire_loop_invariant_RANGE_established (Qed)
+[wp] [Valid] typed_acquire_loop_assigns_part1 (Qed)
+[wp] [Valid] typed_acquire_loop_assigns_part2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_issue_751_check (Qed)
+[wp] [Valid] typed_issue_751_check_2 (Qed)
+[wp] [Valid] typed_issue_751_check_3 (Qed)
+[wp] [Valid] typed_issue_751_check_4 (Qed)
+[wp] [Valid] typed_issue_751_call_checks_requires_pos_max (Qed)
+[wp] [Valid] typed_issue_751_call_checks_requires_neg_max (Qed)
+[wp] [Valid] typed_issue_751_call_checks_requires_pos_min (Qed)
+[wp] [Valid] typed_issue_751_call_checks_requires_neg_min (Qed)
+[wp] [Valid] typed_issue_751_call_checks_requires_strict_pos_max (Qed)
+[wp] [Valid] typed_issue_751_call_checks_requires_strict_neg_max (Qed)
+[wp] [Valid] typed_issue_751_call_checks_requires_strict_pos_min (Qed)
+[wp] [Valid] typed_issue_751_call_checks_requires_strict_neg_min (Qed)
+[wp] [Valid] typed_issue_751_call_checks_2_requires_pos_max (Alt-Ergo) (Cached)
+[wp] [Valid] typed_issue_751_call_checks_2_requires_neg_max (Qed)
+[wp] [Valid] typed_issue_751_call_checks_2_requires_pos_min (Alt-Ergo) (Cached)
+[wp] [Valid] typed_issue_751_call_checks_2_requires_neg_min (Qed)
+[wp] [Valid] typed_issue_751_call_checks_2_requires_strict_pos_max (Alt-Ergo) (Cached)
+[wp] [Valid] typed_issue_751_call_checks_2_requires_strict_neg_max (Qed)
+[wp] [Valid] typed_issue_751_call_checks_2_requires_strict_pos_min (Alt-Ergo) (Cached)
+[wp] [Valid] typed_issue_751_call_checks_2_requires_strict_neg_min (Qed)
+[wp] [Valid] typed_issue_751_call_checks_3_requires_pos_max (Qed)
+[wp] [Valid] typed_issue_751_call_checks_3_requires_neg_max (Alt-Ergo) (Cached)
+[wp] [Valid] typed_issue_751_call_checks_3_requires_pos_min (Qed)
+[wp] [Valid] typed_issue_751_call_checks_3_requires_neg_min (Alt-Ergo) (Cached)
+[wp] [Valid] typed_issue_751_call_checks_3_requires_strict_pos_max (Qed)
+[wp] [Valid] typed_issue_751_call_checks_3_requires_strict_neg_max (Alt-Ergo) (Cached)
+[wp] [Valid] typed_issue_751_call_checks_3_requires_strict_pos_min (Qed)
+[wp] [Valid] typed_issue_751_call_checks_3_requires_strict_neg_min (Alt-Ergo) (Cached)
+[wp] [Valid] typed_issue_751_call_checks_4_requires_pos_max (Alt-Ergo) (Cached)
+[wp] [Valid] typed_issue_751_call_checks_4_requires_neg_max (Qed)
+[wp] [Valid] typed_issue_751_call_checks_4_requires_pos_min (Alt-Ergo) (Cached)
+[wp] [Valid] typed_issue_751_call_checks_4_requires_neg_min (Qed)
+[wp] [Valid] typed_issue_751_call_checks_4_requires_strict_pos_max (Alt-Ergo) (Cached)
+[wp] [Valid] typed_issue_751_call_checks_4_requires_strict_neg_max (Qed)
+[wp] [Valid] typed_issue_751_call_checks_4_requires_strict_pos_min (Alt-Ergo) (Cached)
+[wp] [Valid] typed_issue_751_call_checks_4_requires_strict_neg_min (Qed)
[wp] Proved goals: 40 / 40
Qed: 27
Alt-Ergo: 13
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_801.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_801.res.oracle
index 0e6f8458a20..721fff3a9a7 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_801.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_801.res.oracle
@@ -3,12 +3,12 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 6 goals scheduled
-[wp] [Qed] Goal typed_LoopCurrent_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_LoopCurrent_loop_invariant_A_preserved : Unsuccess
-[wp] [Qed] Goal typed_LoopCurrent_loop_invariant_A_established : Valid
-[wp] [Qed] Goal typed_LoopCurrent_loop_assigns : Valid
-[wp] [Qed] Goal typed_LoopCurrent_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_LoopCurrent_loop_variant_positive : Valid
+[wp] [Valid] typed_LoopCurrent_ensures (Qed)
+[wp] [Timeout] typed_LoopCurrent_loop_invariant_A_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_LoopCurrent_loop_invariant_A_established (Qed)
+[wp] [Valid] typed_LoopCurrent_loop_assigns (Qed)
+[wp] [Valid] typed_LoopCurrent_loop_variant_decrease (Qed)
+[wp] [Valid] typed_LoopCurrent_loop_variant_positive (Qed)
[wp] Proved goals: 5 / 6
Qed: 5
Alt-Ergo: 0 (unsuccess: 1)
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_81.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_81.res.oracle
index bfa4234e9e1..c82a8abc367 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_81.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_81.res.oracle
@@ -3,7 +3,7 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_getMax_ensures : Valid
+[wp] [Valid] typed_getMax_ensures (Alt-Ergo) (Cached)
[wp] Proved goals: 1 / 1
Qed: 0
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_825.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_825.res.oracle
index da5dce9d62d..feeb19ad1ca 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_825.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_825.res.oracle
@@ -3,14 +3,14 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 8 goals scheduled
-[wp] [Alt-Ergo] Goal typed_job_ensures : Unsuccess
-[wp] [Qed] Goal typed_job_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_job_loop_invariant_established : Valid
-[wp] [Qed] Goal typed_job_loop_assigns_part1 : Valid
-[wp] [Alt-Ergo] Goal typed_job_loop_assigns_part2 : Unsuccess
-[wp] [Qed] Goal typed_job_assigns : Valid
-[wp] [Alt-Ergo] Goal typed_issue_check_ko : Unsuccess
-[wp] [Alt-Ergo] Goal typed_issue_check_ko_2 : Unsuccess
+[wp] [Timeout] typed_job_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_job_loop_invariant_preserved (Qed)
+[wp] [Valid] typed_job_loop_invariant_established (Qed)
+[wp] [Valid] typed_job_loop_assigns_part1 (Qed)
+[wp] [Timeout] typed_job_loop_assigns_part2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_job_assigns (Qed)
+[wp] [Unknown] typed_issue_check_ko (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_issue_check_ko_2 (Alt-Ergo) (Cached)
[wp] Proved goals: 4 / 8
Qed: 4
Alt-Ergo: 0 (unsuccess: 4)
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_837.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_837.res.oracle
index 4d1f4710759..96e28b34bc1 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_837.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_837.res.oracle
@@ -3,15 +3,15 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 9 goals scheduled
-[wp] [Qed] Goal typed_foo_assigns_part1 : Valid
-[wp] [Qed] Goal typed_foo_assigns_part2 : Valid
-[wp] [Qed] Goal typed_foo_assigns_part3 : Valid
-[wp] [Qed] Goal typed_foo_assigns_part4 : Valid
-[wp] [Qed] Goal typed_bar_assigns_part1 : Valid
-[wp] [Qed] Goal typed_bar_assigns_part2 : Valid
-[wp] [Qed] Goal typed_bar_assigns_part3 : Valid
-[wp] [Qed] Goal typed_bar_assigns_part4 : Valid
-[wp] [Qed] Goal typed_bar_assigns_part5 : Valid
+[wp] [Valid] typed_foo_assigns_part1 (Qed)
+[wp] [Valid] typed_foo_assigns_part2 (Qed)
+[wp] [Valid] typed_foo_assigns_part3 (Qed)
+[wp] [Valid] typed_foo_assigns_part4 (Qed)
+[wp] [Valid] typed_bar_assigns_part1 (Qed)
+[wp] [Valid] typed_bar_assigns_part2 (Qed)
+[wp] [Valid] typed_bar_assigns_part3 (Qed)
+[wp] [Valid] typed_bar_assigns_part4 (Qed)
+[wp] [Valid] typed_bar_assigns_part5 (Qed)
[wp] Proved goals: 9 / 9
Qed: 9
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_898.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_898.res.oracle
index ca195b3e2f0..5725094cc97 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_898.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_898.res.oracle
@@ -3,8 +3,8 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 2 goals scheduled
-[wp] [Alt-Ergo] Goal typed_job_ensures : Valid
-[wp] [Qed] Goal typed_job_assigns : Valid
+[wp] [Valid] typed_job_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_job_assigns (Qed)
[wp] Proved goals: 2 / 2
Qed: 1
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_pub_49.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_pub_49.res.oracle
index cbdf7760d6a..002c3c43a29 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_pub_49.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_pub_49.res.oracle
@@ -3,39 +3,39 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 33 goals scheduled
-[wp] [Qed] Goal typed_is_class_assigns_part1 : Valid
-[wp] [Qed] Goal typed_is_class_assigns_part2 : Valid
-[wp] [Alt-Ergo] Goal typed_caller1_ensures_postcs : Unsuccess
-[wp] [Qed] Goal typed_caller1_assigns_exit : Valid
-[wp] [Qed] Goal typed_caller1_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_caller1_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_caller1_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_caller1_assigns_normal_part4 : Valid
-[wp] [Qed] Goal typed_caller1_assigns_normal_part5 : Valid
-[wp] [Qed] Goal typed_caller1_assigns_normal_part6 : Valid
-[wp] [Alt-Ergo] Goal typed_caller2_ensures_postcs : Unsuccess
-[wp] [Qed] Goal typed_caller2_assigns_exit : Valid
-[wp] [Qed] Goal typed_caller2_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_caller2_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_caller2_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_caller2_assigns_normal_part4 : Valid
-[wp] [Qed] Goal typed_caller2_assigns_normal_part5 : Valid
-[wp] [Qed] Goal typed_caller2_assigns_normal_part6 : Valid
-[wp] [Alt-Ergo] Goal typed_caller3_ensures_postcs : Unsuccess
-[wp] [Qed] Goal typed_caller3_assigns_exit : Valid
-[wp] [Qed] Goal typed_caller3_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_caller3_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_caller3_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_caller3_assigns_normal_part4 : Valid
-[wp] [Qed] Goal typed_caller3_assigns_normal_part5 : Valid
-[wp] [Alt-Ergo] Goal typed_caller4_ensures_postcs : Unsuccess
-[wp] [Qed] Goal typed_caller4_assigns_exit : Valid
-[wp] [Qed] Goal typed_caller4_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_caller4_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_caller4_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_caller4_assigns_normal_part4 : Valid
-[wp] [Qed] Goal typed_caller4_assigns_normal_part5 : Valid
-[wp] [Qed] Goal typed_caller4_assigns_normal_part6 : Valid
+[wp] [Valid] typed_is_class_assigns_part1 (Qed)
+[wp] [Valid] typed_is_class_assigns_part2 (Qed)
+[wp] [Unknown] typed_caller1_ensures_postcs (Alt-Ergo) (Cached)
+[wp] [Valid] typed_caller1_assigns_exit (Qed)
+[wp] [Valid] typed_caller1_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_caller1_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_caller1_assigns_normal_part3 (Qed)
+[wp] [Valid] typed_caller1_assigns_normal_part4 (Qed)
+[wp] [Valid] typed_caller1_assigns_normal_part5 (Qed)
+[wp] [Valid] typed_caller1_assigns_normal_part6 (Qed)
+[wp] [Unknown] typed_caller2_ensures_postcs (Alt-Ergo) (Cached)
+[wp] [Valid] typed_caller2_assigns_exit (Qed)
+[wp] [Valid] typed_caller2_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_caller2_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_caller2_assigns_normal_part3 (Qed)
+[wp] [Valid] typed_caller2_assigns_normal_part4 (Qed)
+[wp] [Valid] typed_caller2_assigns_normal_part5 (Qed)
+[wp] [Valid] typed_caller2_assigns_normal_part6 (Qed)
+[wp] [Unknown] typed_caller3_ensures_postcs (Alt-Ergo) (Cached)
+[wp] [Valid] typed_caller3_assigns_exit (Qed)
+[wp] [Valid] typed_caller3_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_caller3_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_caller3_assigns_normal_part3 (Qed)
+[wp] [Valid] typed_caller3_assigns_normal_part4 (Qed)
+[wp] [Valid] typed_caller3_assigns_normal_part5 (Qed)
+[wp] [Unknown] typed_caller4_ensures_postcs (Alt-Ergo) (Cached)
+[wp] [Valid] typed_caller4_assigns_exit (Qed)
+[wp] [Valid] typed_caller4_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_caller4_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_caller4_assigns_normal_part3 (Qed)
+[wp] [Valid] typed_caller4_assigns_normal_part4 (Qed)
+[wp] [Valid] typed_caller4_assigns_normal_part5 (Qed)
+[wp] [Valid] typed_caller4_assigns_normal_part6 (Qed)
[wp] Proved goals: 29 / 33
Qed: 29
Alt-Ergo: 0 (unsuccess: 4)
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/nupw-bcl-bts1120.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/nupw-bcl-bts1120.res.oracle
index e9136390c00..f0e8375a281 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/nupw-bcl-bts1120.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/nupw-bcl-bts1120.res.oracle
@@ -3,12 +3,12 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 6 goals scheduled
-[wp] [Qed] Goal typed_g_exits_ok : Valid
-[wp] [Qed] Goal typed_g_loop_assigns : Valid
-[wp] [Qed] Goal typed_g_assigns_exit : Valid
-[wp] [Qed] Goal typed_g_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_g_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_g_assigns_normal_part3 : Valid
+[wp] [Valid] typed_g_exits_ok (Qed)
+[wp] [Valid] typed_g_loop_assigns (Qed)
+[wp] [Valid] typed_g_assigns_exit (Qed)
+[wp] [Valid] typed_g_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_g_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_g_assigns_normal_part3 (Qed)
[wp] Proved goals: 6 / 6
Qed: 6
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.res.oracle
index b91cab6038f..7a462e89fb4 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.res.oracle
@@ -3,22 +3,22 @@
[wp] Running WP plugin...
[rte:annot] annotating function BinaryMultiplication
[wp] 16 goals scheduled
-[wp] [Alt-Ergo] Goal typed_lemma_half : Valid
-[wp] [Qed] Goal typed_lemma_size : Valid
-[wp] [Alt-Ergo] Goal typed_BinaryMultiplication_ensures_product : Valid
-[wp] [Alt-Ergo] Goal typed_BinaryMultiplication_assert_a1_ok_deductible : Valid
-[wp] [Alt-Ergo] Goal typed_BinaryMultiplication_loop_invariant_inv1_ok_preserved : Valid
-[wp] [Qed] Goal typed_BinaryMultiplication_loop_invariant_inv1_ok_established : Valid
-[wp] [Alt-Ergo] Goal typed_BinaryMultiplication_loop_invariant_inv2_ok_deductible_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_BinaryMultiplication_loop_invariant_inv2_ok_deductible_established : Valid
-[wp] [Alt-Ergo] Goal typed_BinaryMultiplication_assert : Valid
-[wp] [Alt-Ergo] Goal typed_BinaryMultiplication_assert_rte_unsigned_overflow : Valid
-[wp] [Alt-Ergo] Goal typed_BinaryMultiplication_assert_rte_unsigned_overflow_2 : Valid
-[wp] [Qed] Goal typed_BinaryMultiplication_assert_rte_unsigned_overflow_3 : Valid
-[wp] [Alt-Ergo] Goal typed_BinaryMultiplication_assert_rte_unsigned_overflow_4 : Valid
-[wp] [Qed] Goal typed_BinaryMultiplication_loop_assigns : Valid
-[wp] [Alt-Ergo] Goal typed_BinaryMultiplication_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_BinaryMultiplication_loop_variant_positive : Valid
+[wp] [Valid] typed_lemma_half (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_size (Qed)
+[wp] [Valid] typed_BinaryMultiplication_ensures_product (Alt-Ergo) (Cached)
+[wp] [Valid] typed_BinaryMultiplication_assert_a1_ok_deductible (Alt-Ergo) (Cached)
+[wp] [Valid] typed_BinaryMultiplication_loop_invariant_inv1_ok_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_BinaryMultiplication_loop_invariant_inv1_ok_established (Qed)
+[wp] [Valid] typed_BinaryMultiplication_loop_invariant_inv2_ok_deductible_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_BinaryMultiplication_loop_invariant_inv2_ok_deductible_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_BinaryMultiplication_assert (Alt-Ergo) (Cached)
+[wp] [Valid] typed_BinaryMultiplication_assert_rte_unsigned_overflow (Alt-Ergo) (Cached)
+[wp] [Valid] typed_BinaryMultiplication_assert_rte_unsigned_overflow_2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_BinaryMultiplication_assert_rte_unsigned_overflow_3 (Qed)
+[wp] [Valid] typed_BinaryMultiplication_assert_rte_unsigned_overflow_4 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_BinaryMultiplication_loop_assigns (Qed)
+[wp] [Valid] typed_BinaryMultiplication_loop_variant_decrease (Alt-Ergo) (Cached)
+[wp] [Valid] typed_BinaryMultiplication_loop_variant_positive (Qed)
[wp] Proved goals: 16 / 16
Qed: 5
Alt-Ergo: 11
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.res.oracle
index c1ba4163554..03a05ff6f73 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.res.oracle
@@ -3,23 +3,23 @@
[wp] Running WP plugin...
[rte:annot] annotating function BinaryMultiplication
[wp] 17 goals scheduled
-[wp] [Alt-Ergo] Goal typed_lemma_ax4_ok : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_ax5_ok : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_ax7_ok : Valid
-[wp] [Qed] Goal typed_lemma_sizeof_ok_ok : Valid
-[wp] [Alt-Ergo] Goal typed_BinaryMultiplication_ensures_product : Valid
-[wp] [Alt-Ergo] Goal typed_BinaryMultiplication_assert_a1_ok_deductible : Valid
-[wp] [Qed] Goal typed_BinaryMultiplication_loop_invariant_inv1_ok_established : Valid
-[wp] [Alt-Ergo] Goal typed_BinaryMultiplication_loop_invariant_inv2_ok_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_BinaryMultiplication_loop_invariant_inv2_ok_established : Valid
-[wp] [Alt-Ergo] Goal typed_BinaryMultiplication_assert_a2_ok : Valid
-[wp] [Alt-Ergo] Goal typed_BinaryMultiplication_assert_a3_ok : Valid
-[wp] [Alt-Ergo] Goal typed_BinaryMultiplication_assert_a4_ok : Valid
-[wp] [Alt-Ergo] Goal typed_BinaryMultiplication_assert_a5_ok : Valid
-[wp] [Qed] Goal typed_BinaryMultiplication_loop_assigns : Valid
-[wp] [Alt-Ergo] Goal typed_BinaryMultiplication_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_BinaryMultiplication_loop_variant_positive : Valid
-[wp] [Script] Goal typed_BinaryMultiplication_loop_invariant_inv1_ok_preserved : Valid
+[wp] [Valid] typed_lemma_ax4_ok (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_ax5_ok (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_ax7_ok (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_sizeof_ok_ok (Qed)
+[wp] [Valid] typed_BinaryMultiplication_ensures_product (Alt-Ergo) (Cached)
+[wp] [Valid] typed_BinaryMultiplication_assert_a1_ok_deductible (Alt-Ergo) (Cached)
+[wp] [Valid] typed_BinaryMultiplication_loop_invariant_inv1_ok_established (Qed)
+[wp] [Valid] typed_BinaryMultiplication_loop_invariant_inv2_ok_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_BinaryMultiplication_loop_invariant_inv2_ok_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_BinaryMultiplication_assert_a2_ok (Alt-Ergo) (Cached)
+[wp] [Valid] typed_BinaryMultiplication_assert_a3_ok (Alt-Ergo) (Cached)
+[wp] [Valid] typed_BinaryMultiplication_assert_a4_ok (Alt-Ergo) (Cached)
+[wp] [Valid] typed_BinaryMultiplication_assert_a5_ok (Alt-Ergo) (Cached)
+[wp] [Valid] typed_BinaryMultiplication_loop_assigns (Qed)
+[wp] [Valid] typed_BinaryMultiplication_loop_variant_decrease (Alt-Ergo) (Cached)
+[wp] [Valid] typed_BinaryMultiplication_loop_variant_positive (Qed)
+[wp] [Valid] typed_BinaryMultiplication_loop_invariant_inv1_ok_preserved (Script)
[wp] Proved goals: 17 / 17
Qed: 4
Script: 1
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/bsearch.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle_qualif/bsearch.res.oracle
index a644fc380b7..14a3c030932 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle_qualif/bsearch.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/bsearch.res.oracle
@@ -3,34 +3,34 @@
[wp] Running WP plugin...
[rte:annot] annotating function binary_search
[wp] 28 goals scheduled
-[wp] [Passed] Smoke-test typed_binary_search_wp_smoke_default_requires
-[wp] [Passed] Smoke-test typed_binary_search_wp_smoke_dead_loop_s3
-[wp] [Passed] Smoke-test typed_binary_search_wp_smoke_dead_code_s8
-[wp] [Passed] Smoke-test typed_binary_search_wp_smoke_dead_code_s12
-[wp] [Passed] Smoke-test typed_binary_search_wp_smoke_dead_code_s16
-[wp] [Passed] Smoke-test typed_binary_search_wp_smoke_dead_code_s17
-[wp] [Passed] Smoke-test typed_binary_search_wp_smoke_dead_code_s18
-[wp] [Alt-Ergo] Goal typed_binary_search_ensures_Result : Valid
-[wp] [Qed] Goal typed_binary_search_ensures_Found : Valid
-[wp] [Alt-Ergo] Goal typed_binary_search_ensures_NotFound : Valid
-[wp] [Qed] Goal typed_binary_search_assert_rte_signed_overflow : Valid
-[wp] [Alt-Ergo] Goal typed_binary_search_loop_invariant_Left_preserved : Valid
-[wp] [Qed] Goal typed_binary_search_loop_invariant_Left_established : Valid
-[wp] [Alt-Ergo] Goal typed_binary_search_loop_invariant_Range_preserved : Valid
-[wp] [Qed] Goal typed_binary_search_loop_invariant_Range_established : Valid
-[wp] [Alt-Ergo] Goal typed_binary_search_loop_invariant_Right_preserved : Valid
-[wp] [Qed] Goal typed_binary_search_loop_invariant_Right_established : Valid
-[wp] [Alt-Ergo] Goal typed_binary_search_assert_rte_signed_overflow_2 : Valid
-[wp] [Alt-Ergo] Goal typed_binary_search_assert_rte_signed_overflow_3 : Valid
-[wp] [Alt-Ergo] Goal typed_binary_search_assert_rte_signed_overflow_4 : Valid
-[wp] [Alt-Ergo] Goal typed_binary_search_assert_rte_signed_overflow_5 : Valid
-[wp] [Alt-Ergo] Goal typed_binary_search_assert_rte_mem_access : Valid
-[wp] [Qed] Goal typed_binary_search_assert_rte_mem_access_2 : Valid
-[wp] [Alt-Ergo] Goal typed_binary_search_assert_rte_signed_overflow_6 : Valid
-[wp] [Alt-Ergo] Goal typed_binary_search_assert_rte_signed_overflow_7 : Valid
-[wp] [Qed] Goal typed_binary_search_loop_assigns : Valid
-[wp] [Alt-Ergo] Goal typed_binary_search_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_binary_search_loop_variant_positive : Valid
+[wp] [Failed (Doomed)] typed_binary_search_wp_smoke_default_requires (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_binary_search_wp_smoke_dead_loop_s3 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_binary_search_wp_smoke_dead_code_s8 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_binary_search_wp_smoke_dead_code_s12 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_binary_search_wp_smoke_dead_code_s16 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_binary_search_wp_smoke_dead_code_s17 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_binary_search_wp_smoke_dead_code_s18 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_binary_search_ensures_Result (Alt-Ergo) (Cached)
+[wp] [Valid] typed_binary_search_ensures_Found (Qed)
+[wp] [Valid] typed_binary_search_ensures_NotFound (Alt-Ergo) (Cached)
+[wp] [Valid] typed_binary_search_assert_rte_signed_overflow (Qed)
+[wp] [Valid] typed_binary_search_loop_invariant_Left_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_binary_search_loop_invariant_Left_established (Qed)
+[wp] [Valid] typed_binary_search_loop_invariant_Range_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_binary_search_loop_invariant_Range_established (Qed)
+[wp] [Valid] typed_binary_search_loop_invariant_Right_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_binary_search_loop_invariant_Right_established (Qed)
+[wp] [Valid] typed_binary_search_assert_rte_signed_overflow_2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_binary_search_assert_rte_signed_overflow_3 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_binary_search_assert_rte_signed_overflow_4 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_binary_search_assert_rte_signed_overflow_5 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_binary_search_assert_rte_mem_access (Alt-Ergo) (Cached)
+[wp] [Valid] typed_binary_search_assert_rte_mem_access_2 (Qed)
+[wp] [Valid] typed_binary_search_assert_rte_signed_overflow_6 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_binary_search_assert_rte_signed_overflow_7 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_binary_search_loop_assigns (Qed)
+[wp] [Valid] typed_binary_search_loop_variant_decrease (Alt-Ergo) (Cached)
+[wp] [Valid] typed_binary_search_loop_variant_positive (Qed)
[wp] Proved goals: 28 / 28
Qed: 8
Alt-Ergo: 20
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/euclid.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle_qualif/euclid.res.oracle
index d3aaf8ea83f..82d93e86a62 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle_qualif/euclid.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/euclid.res.oracle
@@ -3,22 +3,22 @@
[wp] Running WP plugin...
[rte:annot] annotating function euclid_gcd
[wp] 16 goals scheduled
-[wp] [Passed] Smoke-test typed_euclid_euclid_gcd_wp_smoke_default_requires
-[wp] [Passed] Smoke-test typed_euclid_euclid_gcd_wp_smoke_dead_loop_s1
-[wp] [Passed] Smoke-test typed_euclid_euclid_gcd_wp_smoke_dead_code_s6
-[wp] [Passed] Smoke-test typed_euclid_euclid_gcd_wp_smoke_dead_code_s11
-[wp] [Passed] Smoke-test typed_euclid_euclid_gcd_wp_smoke_dead_code_s12
-[wp] [Alt-Ergo] Goal typed_euclid_euclid_gcd_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_euclid_euclid_gcd_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_euclid_euclid_gcd_loop_invariant_established : Valid
-[wp] [Qed] Goal typed_euclid_euclid_gcd_assert_rte_division_by_zero : Valid
-[wp] [Alt-Ergo] Goal typed_euclid_euclid_gcd_assert_rte_signed_overflow : Valid
-[wp] [Qed] Goal typed_euclid_euclid_gcd_loop_assigns : Valid
-[wp] [Qed] Goal typed_euclid_euclid_gcd_assigns_part1 : Valid
-[wp] [Qed] Goal typed_euclid_euclid_gcd_assigns_part2 : Valid
-[wp] [Qed] Goal typed_euclid_euclid_gcd_assigns_part3 : Valid
-[wp] [Alt-Ergo] Goal typed_euclid_euclid_gcd_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_euclid_euclid_gcd_loop_variant_positive : Valid
+[wp] [Failed (Doomed)] typed_euclid_euclid_gcd_wp_smoke_default_requires (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_euclid_euclid_gcd_wp_smoke_dead_loop_s1 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_euclid_euclid_gcd_wp_smoke_dead_code_s6 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_euclid_euclid_gcd_wp_smoke_dead_code_s11 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_euclid_euclid_gcd_wp_smoke_dead_code_s12 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_euclid_euclid_gcd_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_euclid_euclid_gcd_loop_invariant_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_euclid_euclid_gcd_loop_invariant_established (Qed)
+[wp] [Valid] typed_euclid_euclid_gcd_assert_rte_division_by_zero (Qed)
+[wp] [Valid] typed_euclid_euclid_gcd_assert_rte_signed_overflow (Alt-Ergo) (Cached)
+[wp] [Valid] typed_euclid_euclid_gcd_loop_assigns (Qed)
+[wp] [Valid] typed_euclid_euclid_gcd_assigns_part1 (Qed)
+[wp] [Valid] typed_euclid_euclid_gcd_assigns_part2 (Qed)
+[wp] [Valid] typed_euclid_euclid_gcd_assigns_part3 (Qed)
+[wp] [Valid] typed_euclid_euclid_gcd_loop_variant_decrease (Alt-Ergo) (Cached)
+[wp] [Valid] typed_euclid_euclid_gcd_loop_variant_positive (Qed)
[wp] Proved goals: 16 / 16
Qed: 7
Alt-Ergo: 9
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/find.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle_qualif/find.res.oracle
index cf56af0792a..9833f5fe290 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle_qualif/find.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/find.res.oracle
@@ -3,47 +3,47 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 41 goals scheduled
-[wp] [Qed] Goal typed_find_complete_found_not_found : Valid
-[wp] [Qed] Goal typed_find_disjoint_found_not_found : Valid
-[wp] [Qed] Goal typed_find_ensures_Range : Valid
-[wp] [Qed] Goal typed_find_ensures_NoneBefore : Valid
-[wp] [Alt-Ergo] Goal typed_find_loop_invariant_NotFound_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_find_loop_invariant_NotFound_established : Valid
-[wp] [Alt-Ergo] Goal typed_find_loop_invariant_Range_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_find_loop_invariant_Range_established : Valid
-[wp] [Alt-Ergo] Goal typed_find_loop_invariant_Valid_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_find_loop_invariant_Valid_established : Valid
-[wp] [Qed] Goal typed_find_loop_assigns : Valid
-[wp] [Qed] Goal typed_find_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_find_loop_variant_positive : Valid
-[wp] [Alt-Ergo] Goal typed_find_not_found_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_find_found_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_find_found_ensures_2 : Valid
-[wp] [Qed] Goal typed_find_ptr_complete_found_not_found : Valid
-[wp] [Qed] Goal typed_find_ptr_disjoint_found_not_found : Valid
-[wp] [Qed] Goal typed_find_ptr_ensures_Range : Valid
-[wp] [Qed] Goal typed_find_ptr_ensures_NoneBefore : Valid
-[wp] [Alt-Ergo] Goal typed_find_ptr_loop_invariant_NotFound_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_find_ptr_loop_invariant_NotFound_established : Valid
-[wp] [Alt-Ergo] Goal typed_find_ptr_loop_invariant_Range_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_find_ptr_loop_invariant_Range_established : Valid
-[wp] [Alt-Ergo] Goal typed_find_ptr_loop_invariant_Valid_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_find_ptr_loop_invariant_Valid_established : Valid
-[wp] [Alt-Ergo] Goal typed_find_ptr_assert_Hack : Valid
-[wp] [Qed] Goal typed_find_ptr_loop_assigns : Valid
-[wp] [Qed] Goal typed_find_ptr_loop_variant_decrease : Valid
-[wp] [Alt-Ergo] Goal typed_find_ptr_loop_variant_positive : Valid
-[wp] [Alt-Ergo] Goal typed_find_ptr_not_found_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_find_ptr_found_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_find_ptr_found_ensures_2 : Valid
-[wp] [Alt-Ergo] Goal typed_iter_ptr_ensures_Last : Valid
-[wp] [Alt-Ergo] Goal typed_iter_ptr_loop_invariant_Range_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_iter_ptr_loop_invariant_Range_established : Valid
-[wp] [Alt-Ergo] Goal typed_iter_ptr_loop_invariant_Valid_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_iter_ptr_loop_invariant_Valid_established : Valid
-[wp] [Qed] Goal typed_iter_ptr_loop_assigns : Valid
-[wp] [Qed] Goal typed_iter_ptr_loop_variant_decrease : Valid
-[wp] [Alt-Ergo] Goal typed_iter_ptr_loop_variant_positive : Valid
+[wp] [Valid] typed_find_complete_found_not_found (Qed)
+[wp] [Valid] typed_find_disjoint_found_not_found (Qed)
+[wp] [Valid] typed_find_ensures_Range (Qed)
+[wp] [Valid] typed_find_ensures_NoneBefore (Qed)
+[wp] [Valid] typed_find_loop_invariant_NotFound_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_find_loop_invariant_NotFound_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_find_loop_invariant_Range_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_find_loop_invariant_Range_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_find_loop_invariant_Valid_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_find_loop_invariant_Valid_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_find_loop_assigns (Qed)
+[wp] [Valid] typed_find_loop_variant_decrease (Qed)
+[wp] [Valid] typed_find_loop_variant_positive (Qed)
+[wp] [Valid] typed_find_not_found_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_find_found_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_find_found_ensures_2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_find_ptr_complete_found_not_found (Qed)
+[wp] [Valid] typed_find_ptr_disjoint_found_not_found (Qed)
+[wp] [Valid] typed_find_ptr_ensures_Range (Qed)
+[wp] [Valid] typed_find_ptr_ensures_NoneBefore (Qed)
+[wp] [Valid] typed_find_ptr_loop_invariant_NotFound_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_find_ptr_loop_invariant_NotFound_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_find_ptr_loop_invariant_Range_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_find_ptr_loop_invariant_Range_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_find_ptr_loop_invariant_Valid_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_find_ptr_loop_invariant_Valid_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_find_ptr_assert_Hack (Alt-Ergo) (Cached)
+[wp] [Valid] typed_find_ptr_loop_assigns (Qed)
+[wp] [Valid] typed_find_ptr_loop_variant_decrease (Qed)
+[wp] [Valid] typed_find_ptr_loop_variant_positive (Alt-Ergo) (Cached)
+[wp] [Valid] typed_find_ptr_not_found_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_find_ptr_found_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_find_ptr_found_ensures_2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_iter_ptr_ensures_Last (Alt-Ergo) (Cached)
+[wp] [Valid] typed_iter_ptr_loop_invariant_Range_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_iter_ptr_loop_invariant_Range_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_iter_ptr_loop_invariant_Valid_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_iter_ptr_loop_invariant_Valid_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_iter_ptr_loop_assigns (Qed)
+[wp] [Valid] typed_iter_ptr_loop_variant_decrease (Qed)
+[wp] [Valid] typed_iter_ptr_loop_variant_positive (Alt-Ergo) (Cached)
[wp] Proved goals: 41 / 41
Qed: 15
Alt-Ergo: 26
@@ -58,9 +58,9 @@
[rte:annot] annotating function find_ptr
[rte:annot] annotating function iter_ptr
[wp] 3 goals scheduled
-[wp] [Alt-Ergo] Goal typed_find_assert_rte_mem_access : Valid
-[wp] [Qed] Goal typed_find_assert_rte_signed_overflow : Valid
-[wp] [Alt-Ergo] Goal typed_find_ptr_assert_rte_mem_access : Valid
+[wp] [Valid] typed_find_assert_rte_mem_access (Alt-Ergo) (Cached)
+[wp] [Valid] typed_find_assert_rte_signed_overflow (Qed)
+[wp] [Valid] typed_find_ptr_assert_rte_mem_access (Alt-Ergo) (Cached)
[wp] Proved goals: 3 / 3
Qed: 1
Alt-Ergo: 2
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo1_solved.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo1_solved.res.oracle
index e8de3999255..89508a9fbd5 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo1_solved.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo1_solved.res.oracle
@@ -3,16 +3,16 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 10 goals scheduled
-[wp] [Alt-Ergo] Goal typed_exo1_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_exo1_ensures_2 : Valid
-[wp] [Alt-Ergo] Goal typed_exo1_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_exo1_loop_invariant_established : Valid
-[wp] [Alt-Ergo] Goal typed_exo1_loop_invariant_2_preserved : Valid
-[wp] [Qed] Goal typed_exo1_loop_invariant_2_established : Valid
-[wp] [Qed] Goal typed_exo1_loop_assigns : Valid
-[wp] [Qed] Goal typed_exo1_assigns : Valid
-[wp] [Qed] Goal typed_exo1_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_exo1_loop_variant_positive : Valid
+[wp] [Valid] typed_exo1_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_exo1_ensures_2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_exo1_loop_invariant_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_exo1_loop_invariant_established (Qed)
+[wp] [Valid] typed_exo1_loop_invariant_2_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_exo1_loop_invariant_2_established (Qed)
+[wp] [Valid] typed_exo1_loop_assigns (Qed)
+[wp] [Valid] typed_exo1_assigns (Qed)
+[wp] [Valid] typed_exo1_loop_variant_decrease (Qed)
+[wp] [Valid] typed_exo1_loop_variant_positive (Qed)
[wp] Proved goals: 10 / 10
Qed: 6
Alt-Ergo: 4
@@ -23,11 +23,11 @@
[wp] Running WP plugin...
[rte:annot] annotating function exo1
[wp] 5 goals scheduled
-[wp] [Qed] Goal typed_exo1_assert_rte_signed_overflow : Valid
-[wp] [Alt-Ergo] Goal typed_exo1_assert_rte_mem_access : Valid
-[wp] [Alt-Ergo] Goal typed_exo1_assert_rte_mem_access_2 : Valid
-[wp] [Qed] Goal typed_exo1_assert_rte_signed_overflow_2 : Valid
-[wp] [Qed] Goal typed_exo1_assert_rte_signed_overflow_3 : Valid
+[wp] [Valid] typed_exo1_assert_rte_signed_overflow (Qed)
+[wp] [Valid] typed_exo1_assert_rte_mem_access (Alt-Ergo) (Cached)
+[wp] [Valid] typed_exo1_assert_rte_mem_access_2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_exo1_assert_rte_signed_overflow_2 (Qed)
+[wp] [Valid] typed_exo1_assert_rte_signed_overflow_3 (Qed)
[wp] Proved goals: 5 / 5
Qed: 3
Alt-Ergo: 2
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.res.oracle
index 0a3bf5e9d50..ef68448a8bd 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.res.oracle
@@ -3,28 +3,28 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 22 goals scheduled
-[wp] [Alt-Ergo] Goal typed_max_subarray_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_max_subarray_ensures_2 : Valid
-[wp] [Qed] Goal typed_max_subarray_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_max_subarray_loop_invariant_established : Valid
-[wp] [Alt-Ergo] Goal typed_max_subarray_loop_invariant_2_preserved : Valid
-[wp] [Qed] Goal typed_max_subarray_loop_invariant_2_established : Valid
-[wp] [Alt-Ergo] Goal typed_max_subarray_loop_invariant_3_preserved : Valid
-[wp] [Qed] Goal typed_max_subarray_loop_invariant_3_established : Valid
-[wp] [Qed] Goal typed_max_subarray_loop_invariant_4_preserved : Valid
-[wp] [Qed] Goal typed_max_subarray_loop_invariant_4_established : Valid
-[wp] [Alt-Ergo] Goal typed_max_subarray_loop_invariant_5_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_max_subarray_loop_invariant_5_established : Valid
-[wp] [Qed] Goal typed_max_subarray_loop_invariant_6_preserved : Valid
-[wp] [Qed] Goal typed_max_subarray_loop_invariant_6_established : Valid
-[wp] [Alt-Ergo] Goal typed_max_subarray_loop_invariant_7_preserved : Valid
-[wp] [Qed] Goal typed_max_subarray_loop_invariant_7_established : Valid
-[wp] [Alt-Ergo] Goal typed_max_subarray_loop_invariant_8_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_max_subarray_loop_invariant_8_established : Valid
-[wp] [Qed] Goal typed_max_subarray_loop_assigns : Valid
-[wp] [Qed] Goal typed_max_subarray_assigns : Valid
-[wp] [Qed] Goal typed_max_subarray_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_max_subarray_loop_variant_positive : Valid
+[wp] [Valid] typed_max_subarray_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_max_subarray_ensures_2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_max_subarray_loop_invariant_preserved (Qed)
+[wp] [Valid] typed_max_subarray_loop_invariant_established (Qed)
+[wp] [Valid] typed_max_subarray_loop_invariant_2_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_max_subarray_loop_invariant_2_established (Qed)
+[wp] [Valid] typed_max_subarray_loop_invariant_3_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_max_subarray_loop_invariant_3_established (Qed)
+[wp] [Valid] typed_max_subarray_loop_invariant_4_preserved (Qed)
+[wp] [Valid] typed_max_subarray_loop_invariant_4_established (Qed)
+[wp] [Valid] typed_max_subarray_loop_invariant_5_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_max_subarray_loop_invariant_5_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_max_subarray_loop_invariant_6_preserved (Qed)
+[wp] [Valid] typed_max_subarray_loop_invariant_6_established (Qed)
+[wp] [Valid] typed_max_subarray_loop_invariant_7_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_max_subarray_loop_invariant_7_established (Qed)
+[wp] [Valid] typed_max_subarray_loop_invariant_8_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_max_subarray_loop_invariant_8_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_max_subarray_loop_assigns (Qed)
+[wp] [Valid] typed_max_subarray_assigns (Qed)
+[wp] [Valid] typed_max_subarray_loop_variant_decrease (Qed)
+[wp] [Valid] typed_max_subarray_loop_variant_positive (Qed)
[wp] Proved goals: 22 / 22
Qed: 13
Alt-Ergo: 9
@@ -35,7 +35,7 @@
[wp] Running WP plugin...
[rte:annot] annotating function max_subarray
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_max_subarray_assert_rte_mem_access : Valid
+[wp] [Valid] typed_max_subarray_assert_rte_mem_access (Alt-Ergo) (Cached)
[wp] Proved goals: 1 / 1
Qed: 0
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.res.oracle
index 815f3a1cb7f..06490bd5c27 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.res.oracle
@@ -3,40 +3,40 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 34 goals scheduled
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_ensures_2 : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_ensures_3 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_invariant_established : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_2_preserved : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_invariant_2_established : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_invariant_3_preserved : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_invariant_3_established : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_invariant_4_preserved : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_invariant_4_established : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_5_preserved : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_invariant_5_established : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_6_preserved : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_invariant_6_established : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_invariant_7_preserved : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_invariant_7_established : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_8_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_8_established : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_9_preserved : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_invariant_9_established : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_10_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_10_established : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_assert : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_assert_2 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_assigns : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_assigns_2 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_assigns_part1 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_assigns_part2 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_assigns_part3 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_variant_positive : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_variant_2_decrease : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_variant_2_positive : Valid
+[wp] [Valid] typed_ref_equal_elements_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_equal_elements_ensures_2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_equal_elements_ensures_3 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_preserved (Qed)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_established (Qed)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_2_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_2_established (Qed)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_3_preserved (Qed)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_3_established (Qed)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_4_preserved (Qed)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_4_established (Qed)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_5_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_5_established (Qed)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_6_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_6_established (Qed)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_7_preserved (Qed)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_7_established (Qed)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_8_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_8_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_9_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_9_established (Qed)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_10_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_10_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_equal_elements_assert (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_equal_elements_assert_2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_equal_elements_loop_assigns (Qed)
+[wp] [Valid] typed_ref_equal_elements_loop_assigns_2 (Qed)
+[wp] [Valid] typed_ref_equal_elements_assigns_part1 (Qed)
+[wp] [Valid] typed_ref_equal_elements_assigns_part2 (Qed)
+[wp] [Valid] typed_ref_equal_elements_assigns_part3 (Qed)
+[wp] [Valid] typed_ref_equal_elements_loop_variant_decrease (Qed)
+[wp] [Valid] typed_ref_equal_elements_loop_variant_positive (Qed)
+[wp] [Valid] typed_ref_equal_elements_loop_variant_2_decrease (Qed)
+[wp] [Valid] typed_ref_equal_elements_loop_variant_2_positive (Qed)
[wp] Proved goals: 34 / 34
Qed: 21
Alt-Ergo: 13
@@ -56,22 +56,22 @@
[wp] Running WP plugin...
[rte:annot] annotating function equal_elements
[wp] 16 goals scheduled
-[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_mem_access : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_mem_access_2 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_index_bound : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_index_bound_2 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_signed_overflow : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_assert_rte_mem_access_3 : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_assert_rte_index_bound_3 : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_assert_rte_index_bound_4 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_mem_access_4 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_mem_access_5 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_mem_access_6 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_mem_access_7 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_mem_access_8 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_index_bound_5 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_index_bound_6 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_signed_overflow_2 : Valid
+[wp] [Valid] typed_ref_equal_elements_assert_rte_mem_access (Qed)
+[wp] [Valid] typed_ref_equal_elements_assert_rte_mem_access_2 (Qed)
+[wp] [Valid] typed_ref_equal_elements_assert_rte_index_bound (Qed)
+[wp] [Valid] typed_ref_equal_elements_assert_rte_index_bound_2 (Qed)
+[wp] [Valid] typed_ref_equal_elements_assert_rte_signed_overflow (Qed)
+[wp] [Valid] typed_ref_equal_elements_assert_rte_mem_access_3 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_equal_elements_assert_rte_index_bound_3 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_equal_elements_assert_rte_index_bound_4 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_equal_elements_assert_rte_mem_access_4 (Qed)
+[wp] [Valid] typed_ref_equal_elements_assert_rte_mem_access_5 (Qed)
+[wp] [Valid] typed_ref_equal_elements_assert_rte_mem_access_6 (Qed)
+[wp] [Valid] typed_ref_equal_elements_assert_rte_mem_access_7 (Qed)
+[wp] [Valid] typed_ref_equal_elements_assert_rte_mem_access_8 (Qed)
+[wp] [Valid] typed_ref_equal_elements_assert_rte_index_bound_5 (Qed)
+[wp] [Valid] typed_ref_equal_elements_assert_rte_index_bound_6 (Qed)
+[wp] [Valid] typed_ref_equal_elements_assert_rte_signed_overflow_2 (Qed)
[wp] Proved goals: 16 / 16
Qed: 13
Alt-Ergo: 3
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.res.oracle
index 2830d7a72a4..a2426606222 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.res.oracle
@@ -3,41 +3,41 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 35 goals scheduled
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_ensures_v1_good : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_ensures_v2_good : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_ensures_v1_v2_diff : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_invariant_established : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_set_at_0_preserved : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_invariant_set_at_0_established : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_assert_set_at_1 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_invariant_bound_preserved : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_invariant_bound_established : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_seen_sound1_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_seen_sound1_established : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_seen_sound2_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_seen_sound2_established : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_invariant_v1_first_preserved : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_invariant_v1_first_established : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_v1_sound1_preserved : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_invariant_v1_sound1_established : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_v1_sound2_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_v1_sound2_established : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_invariant_v1_v2_diff_preserved : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_invariant_v1_v2_diff_established : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_v2_sound1_preserved : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_invariant_v2_sound1_established : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_v2_sound2_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_v2_sound2_established : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_assigns : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_assigns_2 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_assigns_part1 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_assigns_part2 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_assigns_part3 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_variant_positive : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_variant_2_decrease : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_variant_2_positive : Valid
+[wp] [Valid] typed_ref_equal_elements_ensures_v1_good (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_equal_elements_ensures_v2_good (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_equal_elements_ensures_v1_v2_diff (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_preserved (Qed)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_established (Qed)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_set_at_0_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_set_at_0_established (Qed)
+[wp] [Valid] typed_ref_equal_elements_assert_set_at_1 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_bound_preserved (Qed)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_bound_established (Qed)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_seen_sound1_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_seen_sound1_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_seen_sound2_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_seen_sound2_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_v1_first_preserved (Qed)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_v1_first_established (Qed)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_v1_sound1_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_v1_sound1_established (Qed)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_v1_sound2_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_v1_sound2_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_v1_v2_diff_preserved (Qed)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_v1_v2_diff_established (Qed)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_v2_sound1_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_v2_sound1_established (Qed)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_v2_sound2_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_equal_elements_loop_invariant_v2_sound2_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_equal_elements_loop_assigns (Qed)
+[wp] [Valid] typed_ref_equal_elements_loop_assigns_2 (Qed)
+[wp] [Valid] typed_ref_equal_elements_assigns_part1 (Qed)
+[wp] [Valid] typed_ref_equal_elements_assigns_part2 (Qed)
+[wp] [Valid] typed_ref_equal_elements_assigns_part3 (Qed)
+[wp] [Valid] typed_ref_equal_elements_loop_variant_decrease (Qed)
+[wp] [Valid] typed_ref_equal_elements_loop_variant_positive (Qed)
+[wp] [Valid] typed_ref_equal_elements_loop_variant_2_decrease (Qed)
+[wp] [Valid] typed_ref_equal_elements_loop_variant_2_positive (Qed)
[wp] Proved goals: 35 / 35
Qed: 20
Alt-Ergo: 15
@@ -57,22 +57,22 @@
[wp] Running WP plugin...
[rte:annot] annotating function equal_elements
[wp] 16 goals scheduled
-[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_mem_access : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_mem_access_2 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_index_bound : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_index_bound_2 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_signed_overflow : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_assert_rte_mem_access_3 : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_assert_rte_index_bound_3 : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_assert_rte_index_bound_4 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_mem_access_4 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_mem_access_5 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_mem_access_6 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_mem_access_7 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_mem_access_8 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_index_bound_5 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_index_bound_6 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_signed_overflow_2 : Valid
+[wp] [Valid] typed_ref_equal_elements_assert_rte_mem_access (Qed)
+[wp] [Valid] typed_ref_equal_elements_assert_rte_mem_access_2 (Qed)
+[wp] [Valid] typed_ref_equal_elements_assert_rte_index_bound (Qed)
+[wp] [Valid] typed_ref_equal_elements_assert_rte_index_bound_2 (Qed)
+[wp] [Valid] typed_ref_equal_elements_assert_rte_signed_overflow (Qed)
+[wp] [Valid] typed_ref_equal_elements_assert_rte_mem_access_3 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_equal_elements_assert_rte_index_bound_3 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_equal_elements_assert_rte_index_bound_4 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_equal_elements_assert_rte_mem_access_4 (Qed)
+[wp] [Valid] typed_ref_equal_elements_assert_rte_mem_access_5 (Qed)
+[wp] [Valid] typed_ref_equal_elements_assert_rte_mem_access_6 (Qed)
+[wp] [Valid] typed_ref_equal_elements_assert_rte_mem_access_7 (Qed)
+[wp] [Valid] typed_ref_equal_elements_assert_rte_mem_access_8 (Qed)
+[wp] [Valid] typed_ref_equal_elements_assert_rte_index_bound_5 (Qed)
+[wp] [Valid] typed_ref_equal_elements_assert_rte_index_bound_6 (Qed)
+[wp] [Valid] typed_ref_equal_elements_assert_rte_signed_overflow_2 (Qed)
[wp] Proved goals: 16 / 16
Qed: 13
Alt-Ergo: 3
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.res.oracle
index 630af9b9198..a07cecd0e37 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.res.oracle
@@ -3,32 +3,32 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 26 goals scheduled
-[wp] [Qed] Goal typed_pair_complete_has_pair_no_pair : Valid
-[wp] [Qed] Goal typed_pair_disjoint_has_pair_no_pair : Valid
-[wp] [Qed] Goal typed_pair_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_pair_loop_invariant_established : Valid
-[wp] [Alt-Ergo] Goal typed_pair_loop_invariant_2_preserved : Valid
-[wp] [Qed] Goal typed_pair_loop_invariant_2_established : Valid
-[wp] [Qed] Goal typed_pair_loop_invariant_3_preserved : Valid
-[wp] [Qed] Goal typed_pair_loop_invariant_3_established : Valid
-[wp] [Alt-Ergo] Goal typed_pair_loop_invariant_4_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_pair_loop_invariant_4_established : Valid
-[wp] [Alt-Ergo] Goal typed_pair_loop_invariant_5_preserved : Valid
-[wp] [Qed] Goal typed_pair_loop_invariant_5_established : Valid
-[wp] [Alt-Ergo] Goal typed_pair_loop_invariant_6_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_pair_loop_invariant_6_established : Valid
-[wp] [Qed] Goal typed_pair_loop_assigns : Valid
-[wp] [Qed] Goal typed_pair_loop_assigns_2 : Valid
-[wp] [Qed] Goal typed_pair_assigns_part1 : Valid
-[wp] [Qed] Goal typed_pair_assigns_part2 : Valid
-[wp] [Qed] Goal typed_pair_assigns_part3 : Valid
-[wp] [Qed] Goal typed_pair_assigns_part4 : Valid
-[wp] [Qed] Goal typed_pair_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_pair_loop_variant_positive : Valid
-[wp] [Qed] Goal typed_pair_loop_variant_2_decrease : Valid
-[wp] [Qed] Goal typed_pair_loop_variant_2_positive : Valid
-[wp] [Alt-Ergo] Goal typed_pair_no_pair_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_pair_has_pair_ensures : Valid
+[wp] [Valid] typed_pair_complete_has_pair_no_pair (Qed)
+[wp] [Valid] typed_pair_disjoint_has_pair_no_pair (Qed)
+[wp] [Valid] typed_pair_loop_invariant_preserved (Qed)
+[wp] [Valid] typed_pair_loop_invariant_established (Qed)
+[wp] [Valid] typed_pair_loop_invariant_2_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_pair_loop_invariant_2_established (Qed)
+[wp] [Valid] typed_pair_loop_invariant_3_preserved (Qed)
+[wp] [Valid] typed_pair_loop_invariant_3_established (Qed)
+[wp] [Valid] typed_pair_loop_invariant_4_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_pair_loop_invariant_4_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_pair_loop_invariant_5_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_pair_loop_invariant_5_established (Qed)
+[wp] [Valid] typed_pair_loop_invariant_6_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_pair_loop_invariant_6_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_pair_loop_assigns (Qed)
+[wp] [Valid] typed_pair_loop_assigns_2 (Qed)
+[wp] [Valid] typed_pair_assigns_part1 (Qed)
+[wp] [Valid] typed_pair_assigns_part2 (Qed)
+[wp] [Valid] typed_pair_assigns_part3 (Qed)
+[wp] [Valid] typed_pair_assigns_part4 (Qed)
+[wp] [Valid] typed_pair_loop_variant_decrease (Qed)
+[wp] [Valid] typed_pair_loop_variant_positive (Qed)
+[wp] [Valid] typed_pair_loop_variant_2_decrease (Qed)
+[wp] [Valid] typed_pair_loop_variant_2_positive (Qed)
+[wp] [Valid] typed_pair_no_pair_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_pair_has_pair_ensures (Alt-Ergo) (Cached)
[wp] Proved goals: 26 / 26
Qed: 18
Alt-Ergo: 8
@@ -39,15 +39,15 @@
[wp] Running WP plugin...
[rte:annot] annotating function pair
[wp] 9 goals scheduled
-[wp] [Qed] Goal typed_pair_assert_rte_index_bound : Valid
-[wp] [Qed] Goal typed_pair_assert_rte_index_bound_2 : Valid
-[wp] [Qed] Goal typed_pair_assert_rte_signed_overflow : Valid
-[wp] [Alt-Ergo] Goal typed_pair_assert_rte_mem_access : Valid
-[wp] [Alt-Ergo] Goal typed_pair_assert_rte_index_bound_3 : Valid
-[wp] [Alt-Ergo] Goal typed_pair_assert_rte_index_bound_4 : Valid
-[wp] [Qed] Goal typed_pair_assert_rte_index_bound_5 : Valid
-[wp] [Qed] Goal typed_pair_assert_rte_index_bound_6 : Valid
-[wp] [Qed] Goal typed_pair_assert_rte_signed_overflow_2 : Valid
+[wp] [Valid] typed_pair_assert_rte_index_bound (Qed)
+[wp] [Valid] typed_pair_assert_rte_index_bound_2 (Qed)
+[wp] [Valid] typed_pair_assert_rte_signed_overflow (Qed)
+[wp] [Valid] typed_pair_assert_rte_mem_access (Alt-Ergo) (Cached)
+[wp] [Valid] typed_pair_assert_rte_index_bound_3 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_pair_assert_rte_index_bound_4 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_pair_assert_rte_index_bound_5 (Qed)
+[wp] [Valid] typed_pair_assert_rte_index_bound_6 (Qed)
+[wp] [Valid] typed_pair_assert_rte_signed_overflow_2 (Qed)
[wp] Proved goals: 9 / 9
Qed: 6
Alt-Ergo: 3
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/string-compare.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle_qualif/string-compare.res.oracle
index d6ad1f485b3..5da41edc198 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle_qualif/string-compare.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/string-compare.res.oracle
@@ -5,58 +5,58 @@
[wp] [CFG] Goal stringCompare_exits_never : Valid (Unreachable)
[wp] [CFG] Goal stringLength_exits_never : Valid (Unreachable)
[wp] 52 goals scheduled
-[wp] [Qed] Goal typed_stringCompare_complete_SomeDifferent_allEqual : Valid
-[wp] [Qed] Goal typed_stringCompare_disjoint_SomeDifferent_allEqual : Valid
-[wp] [Alt-Ergo] Goal typed_stringCompare_loop_invariant_equal_preserved : Valid
-[wp] [Qed] Goal typed_stringCompare_loop_invariant_equal_established : Valid
-[wp] [Alt-Ergo] Goal typed_stringCompare_loop_invariant_gauge_preserved : Valid
-[wp] [Qed] Goal typed_stringCompare_loop_invariant_gauge_established : Valid
-[wp] [Alt-Ergo] Goal typed_stringCompare_loop_invariant_gauge_s1_preserved : Valid
-[wp] [Qed] Goal typed_stringCompare_loop_invariant_gauge_s1_established : Valid
-[wp] [Alt-Ergo] Goal typed_stringCompare_loop_invariant_gauge_s2_preserved : Valid
-[wp] [Qed] Goal typed_stringCompare_loop_invariant_gauge_s2_established : Valid
-[wp] [Alt-Ergo] Goal typed_stringCompare_loop_invariant_not_eos_preserved : Valid
-[wp] [Qed] Goal typed_stringCompare_loop_invariant_not_eos_established : Valid
-[wp] [Alt-Ergo] Goal typed_stringCompare_loop_invariant_strlen_s1_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_stringCompare_loop_invariant_strlen_s1_established : Valid
-[wp] [Alt-Ergo] Goal typed_stringCompare_loop_invariant_strlen_s2_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_stringCompare_loop_invariant_strlen_s2_established : Valid
-[wp] [Alt-Ergo] Goal typed_stringCompare_assert_length : Valid
-[wp] [Alt-Ergo] Goal typed_stringCompare_assert_different : Valid
-[wp] [Qed] Goal typed_stringCompare_loop_assigns_part1 : Valid
-[wp] [Qed] Goal typed_stringCompare_loop_assigns_part2 : Valid
-[wp] [Qed] Goal typed_stringCompare_loop_assigns_part3 : Valid
-[wp] [Qed] Goal typed_stringCompare_assigns_part1 : Valid
-[wp] [Qed] Goal typed_stringCompare_assigns_part2 : Valid
-[wp] [Qed] Goal typed_stringCompare_assigns_part3 : Valid
-[wp] [Qed] Goal typed_stringCompare_assigns_part4 : Valid
-[wp] [Qed] Goal typed_stringCompare_assigns_part5 : Valid
-[wp] [Qed] Goal typed_stringCompare_assigns_part6 : Valid
-[wp] [Qed] Goal typed_stringCompare_assigns_part7 : Valid
-[wp] [Qed] Goal typed_stringCompare_assigns_part8 : Valid
-[wp] [Qed] Goal typed_stringCompare_assigns_part9 : Valid
-[wp] [Alt-Ergo] Goal typed_stringCompare_allEqual_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_stringCompare_SomeDifferent_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_stringLength_ensures_rightResult : Valid
-[wp] [Alt-Ergo] Goal typed_stringLength_ensures_rightEndCharacter : Valid
-[wp] [Alt-Ergo] Goal typed_stringLength_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_stringLength_loop_invariant_established : Valid
-[wp] [Alt-Ergo] Goal typed_stringLength_loop_invariant_2_preserved : Valid
-[wp] [Qed] Goal typed_stringLength_loop_invariant_2_established : Valid
-[wp] [Qed] Goal typed_stringLength_loop_assigns_part1 : Valid
-[wp] [Qed] Goal typed_stringLength_loop_assigns_part2 : Valid
-[wp] [Qed] Goal typed_stringLength_assigns_part1 : Valid
-[wp] [Qed] Goal typed_stringLength_assigns_part2 : Valid
-[wp] [Qed] Goal typed_stringLength_assigns_part3 : Valid
-[wp] [Qed] Goal typed_stringLength_assigns_part4 : Valid
-[wp] [Qed] Goal typed_stringLength_assigns_part5 : Valid
-[wp] [Alt-Ergo] Goal typed_main_ensures : Valid
-[wp] [Qed] Goal typed_main_exits_never : Valid
-[wp] [Qed] Goal typed_main_assert : Valid
-[wp] [Qed] Goal typed_main_assigns_exit : Valid
-[wp] [Qed] Goal typed_main_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_main_assigns_normal_part2 : Valid
-[wp] [Alt-Ergo] Goal typed_main_call_stringCompare_requires_validStrings : Valid
+[wp] [Valid] typed_stringCompare_complete_SomeDifferent_allEqual (Qed)
+[wp] [Valid] typed_stringCompare_disjoint_SomeDifferent_allEqual (Qed)
+[wp] [Valid] typed_stringCompare_loop_invariant_equal_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_stringCompare_loop_invariant_equal_established (Qed)
+[wp] [Valid] typed_stringCompare_loop_invariant_gauge_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_stringCompare_loop_invariant_gauge_established (Qed)
+[wp] [Valid] typed_stringCompare_loop_invariant_gauge_s1_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_stringCompare_loop_invariant_gauge_s1_established (Qed)
+[wp] [Valid] typed_stringCompare_loop_invariant_gauge_s2_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_stringCompare_loop_invariant_gauge_s2_established (Qed)
+[wp] [Valid] typed_stringCompare_loop_invariant_not_eos_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_stringCompare_loop_invariant_not_eos_established (Qed)
+[wp] [Valid] typed_stringCompare_loop_invariant_strlen_s1_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_stringCompare_loop_invariant_strlen_s1_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_stringCompare_loop_invariant_strlen_s2_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_stringCompare_loop_invariant_strlen_s2_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_stringCompare_assert_length (Alt-Ergo) (Cached)
+[wp] [Valid] typed_stringCompare_assert_different (Alt-Ergo) (Cached)
+[wp] [Valid] typed_stringCompare_loop_assigns_part1 (Qed)
+[wp] [Valid] typed_stringCompare_loop_assigns_part2 (Qed)
+[wp] [Valid] typed_stringCompare_loop_assigns_part3 (Qed)
+[wp] [Valid] typed_stringCompare_assigns_part1 (Qed)
+[wp] [Valid] typed_stringCompare_assigns_part2 (Qed)
+[wp] [Valid] typed_stringCompare_assigns_part3 (Qed)
+[wp] [Valid] typed_stringCompare_assigns_part4 (Qed)
+[wp] [Valid] typed_stringCompare_assigns_part5 (Qed)
+[wp] [Valid] typed_stringCompare_assigns_part6 (Qed)
+[wp] [Valid] typed_stringCompare_assigns_part7 (Qed)
+[wp] [Valid] typed_stringCompare_assigns_part8 (Qed)
+[wp] [Valid] typed_stringCompare_assigns_part9 (Qed)
+[wp] [Valid] typed_stringCompare_allEqual_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_stringCompare_SomeDifferent_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_stringLength_ensures_rightResult (Alt-Ergo) (Cached)
+[wp] [Valid] typed_stringLength_ensures_rightEndCharacter (Alt-Ergo) (Cached)
+[wp] [Valid] typed_stringLength_loop_invariant_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_stringLength_loop_invariant_established (Qed)
+[wp] [Valid] typed_stringLength_loop_invariant_2_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_stringLength_loop_invariant_2_established (Qed)
+[wp] [Valid] typed_stringLength_loop_assigns_part1 (Qed)
+[wp] [Valid] typed_stringLength_loop_assigns_part2 (Qed)
+[wp] [Valid] typed_stringLength_assigns_part1 (Qed)
+[wp] [Valid] typed_stringLength_assigns_part2 (Qed)
+[wp] [Valid] typed_stringLength_assigns_part3 (Qed)
+[wp] [Valid] typed_stringLength_assigns_part4 (Qed)
+[wp] [Valid] typed_stringLength_assigns_part5 (Qed)
+[wp] [Valid] typed_main_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_main_exits_never (Qed)
+[wp] [Valid] typed_main_assert (Qed)
+[wp] [Valid] typed_main_assigns_exit (Qed)
+[wp] [Valid] typed_main_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_main_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_main_call_stringCompare_requires_validStrings (Alt-Ergo) (Cached)
[wp] Proved goals: 54 / 54
Qed: 33
Alt-Ergo: 19
@@ -71,14 +71,14 @@
[rte:annot] annotating function stringCompare
[rte:annot] annotating function stringLength
[wp] 8 goals scheduled
-[wp] [Alt-Ergo] Goal typed_stringCompare_assert_rte_mem_access : Valid
-[wp] [Alt-Ergo] Goal typed_stringCompare_assert_rte_mem_access_2 : Valid
-[wp] [Qed] Goal typed_stringCompare_assert_rte_mem_access_3 : Valid
-[wp] [Qed] Goal typed_stringCompare_assert_rte_mem_access_4 : Valid
-[wp] [Alt-Ergo] Goal typed_stringCompare_assert_rte_mem_access_5 : Valid
-[wp] [Alt-Ergo] Goal typed_stringCompare_assert_rte_signed_overflow : Valid
-[wp] [Alt-Ergo] Goal typed_stringCompare_assert_rte_signed_overflow_2 : Valid
-[wp] [Alt-Ergo] Goal typed_stringLength_assert_rte_mem_access : Valid
+[wp] [Valid] typed_stringCompare_assert_rte_mem_access (Alt-Ergo) (Cached)
+[wp] [Valid] typed_stringCompare_assert_rte_mem_access_2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_stringCompare_assert_rte_mem_access_3 (Qed)
+[wp] [Valid] typed_stringCompare_assert_rte_mem_access_4 (Qed)
+[wp] [Valid] typed_stringCompare_assert_rte_mem_access_5 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_stringCompare_assert_rte_signed_overflow (Alt-Ergo) (Cached)
+[wp] [Valid] typed_stringCompare_assert_rte_signed_overflow_2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_stringLength_assert_rte_mem_access (Alt-Ergo) (Cached)
[wp] Proved goals: 8 / 8
Qed: 2
Alt-Ergo: 6
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/alias_assigns_hypotheses.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle_qualif/alias_assigns_hypotheses.res.oracle
index 2c0c83b734f..a6a2f704535 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle_qualif/alias_assigns_hypotheses.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/alias_assigns_hypotheses.res.oracle
@@ -3,36 +3,36 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 30 goals scheduled
-[wp] [Qed] Goal typed_global_alias_ensures : Valid
-[wp] [Qed] Goal typed_global_alias_ensures_2 : Valid
-[wp] [Qed] Goal typed_global_alias_assigns : Valid
-[wp] [Qed] Goal typed_global_no_alias_ensures : Valid
-[wp] [Qed] Goal typed_global_no_alias_assigns : Valid
-[wp] [Qed] Goal typed_formal_alias_ensures : Valid
-[wp] [Qed] Goal typed_formal_alias_ensures_2 : Valid
-[wp] [Qed] Goal typed_formal_alias_assigns : Valid
-[wp] [Qed] Goal typed_formal_no_alias_ensures : Valid
-[wp] [Qed] Goal typed_formal_no_alias_assigns : Valid
-[wp] [Qed] Goal typed_formal_alias_array_ensures : Valid
-[wp] [Qed] Goal typed_formal_alias_array_ensures_2 : Valid
-[wp] [Qed] Goal typed_formal_alias_array_ensures_3 : Valid
-[wp] [Qed] Goal typed_formal_alias_array_assigns_part1 : Valid
-[wp] [Qed] Goal typed_formal_alias_array_assigns_part2 : Valid
-[wp] [Qed] Goal typed_field_alias_ensures : Valid
-[wp] [Qed] Goal typed_field_alias_ensures_2 : Valid
-[wp] [Qed] Goal typed_field_alias_assigns : Valid
-[wp] [Qed] Goal typed_field_range_alias_ensures : Valid
-[wp] [Qed] Goal typed_field_range_alias_ensures_2 : Valid
-[wp] [Qed] Goal typed_field_range_alias_assigns : Valid
-[wp] [Qed] Goal typed_set_alias_ensures : Valid
-[wp] [Qed] Goal typed_set_alias_ensures_2 : Valid
-[wp] [Qed] Goal typed_set_alias_assigns : Valid
-[wp] [Qed] Goal typed_comprehension_alias_ensures : Valid
-[wp] [Qed] Goal typed_comprehension_alias_ensures_2 : Valid
-[wp] [Qed] Goal typed_comprehension_alias_assigns : Valid
-[wp] [Qed] Goal typed_union_alias_ensures : Valid
-[wp] [Qed] Goal typed_union_alias_ensures_2 : Valid
-[wp] [Qed] Goal typed_union_alias_assigns : Valid
+[wp] [Valid] typed_global_alias_ensures (Qed)
+[wp] [Valid] typed_global_alias_ensures_2 (Qed)
+[wp] [Valid] typed_global_alias_assigns (Qed)
+[wp] [Valid] typed_global_no_alias_ensures (Qed)
+[wp] [Valid] typed_global_no_alias_assigns (Qed)
+[wp] [Valid] typed_formal_alias_ensures (Qed)
+[wp] [Valid] typed_formal_alias_ensures_2 (Qed)
+[wp] [Valid] typed_formal_alias_assigns (Qed)
+[wp] [Valid] typed_formal_no_alias_ensures (Qed)
+[wp] [Valid] typed_formal_no_alias_assigns (Qed)
+[wp] [Valid] typed_formal_alias_array_ensures (Qed)
+[wp] [Valid] typed_formal_alias_array_ensures_2 (Qed)
+[wp] [Valid] typed_formal_alias_array_ensures_3 (Qed)
+[wp] [Valid] typed_formal_alias_array_assigns_part1 (Qed)
+[wp] [Valid] typed_formal_alias_array_assigns_part2 (Qed)
+[wp] [Valid] typed_field_alias_ensures (Qed)
+[wp] [Valid] typed_field_alias_ensures_2 (Qed)
+[wp] [Valid] typed_field_alias_assigns (Qed)
+[wp] [Valid] typed_field_range_alias_ensures (Qed)
+[wp] [Valid] typed_field_range_alias_ensures_2 (Qed)
+[wp] [Valid] typed_field_range_alias_assigns (Qed)
+[wp] [Valid] typed_set_alias_ensures (Qed)
+[wp] [Valid] typed_set_alias_ensures_2 (Qed)
+[wp] [Valid] typed_set_alias_assigns (Qed)
+[wp] [Valid] typed_comprehension_alias_ensures (Qed)
+[wp] [Valid] typed_comprehension_alias_ensures_2 (Qed)
+[wp] [Valid] typed_comprehension_alias_assigns (Qed)
+[wp] [Valid] typed_union_alias_ensures (Qed)
+[wp] [Valid] typed_union_alias_ensures_2 (Qed)
+[wp] [Valid] typed_union_alias_assigns (Qed)
[wp] Proved goals: 30 / 30
Qed: 30
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/byref.0.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle_qualif/byref.0.res.oracle
index 2ee1cf41475..fc2dd129695 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle_qualif/byref.0.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/byref.0.res.oracle
@@ -3,18 +3,18 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 12 goals scheduled
-[wp] [Qed] Goal typed_f_ensures : Valid
-[wp] [Qed] Goal typed_f_assigns : Valid
-[wp] [Qed] Goal typed_wrong_without_ref_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_wrong_without_ref_call_f_requires : Unsuccess
-[wp] [Qed] Goal typed_pointer_ensures : Valid
-[wp] [Qed] Goal typed_pointer_call_f_requires : Valid
-[wp] [Qed] Goal typed_local_ensures : Valid
-[wp] [Qed] Goal typed_local_call_f_requires : Valid
-[wp] [Qed] Goal typed_formal_ensures : Valid
-[wp] [Qed] Goal typed_formal_call_f_requires : Valid
-[wp] [Qed] Goal typed_global_ensures : Valid
-[wp] [Qed] Goal typed_global_call_f_requires : Valid
+[wp] [Valid] typed_f_ensures (Qed)
+[wp] [Valid] typed_f_assigns (Qed)
+[wp] [Valid] typed_wrong_without_ref_ensures (Qed)
+[wp] [Timeout] typed_wrong_without_ref_call_f_requires (Alt-Ergo) (Cached)
+[wp] [Valid] typed_pointer_ensures (Qed)
+[wp] [Valid] typed_pointer_call_f_requires (Qed)
+[wp] [Valid] typed_local_ensures (Qed)
+[wp] [Valid] typed_local_call_f_requires (Qed)
+[wp] [Valid] typed_formal_ensures (Qed)
+[wp] [Valid] typed_formal_call_f_requires (Qed)
+[wp] [Valid] typed_global_ensures (Qed)
+[wp] [Valid] typed_global_call_f_requires (Qed)
[wp] Proved goals: 11 / 12
Qed: 11
Alt-Ergo: 0 (unsuccess: 1)
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/byref.1.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle_qualif/byref.1.res.oracle
index b23cd67ea5f..d25fd1d97dd 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle_qualif/byref.1.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/byref.1.res.oracle
@@ -3,18 +3,18 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 12 goals scheduled
-[wp] [Qed] Goal typed_ref_f_ensures : Valid
-[wp] [Qed] Goal typed_ref_f_assigns : Valid
-[wp] [Qed] Goal typed_ref_wrong_without_ref_ensures : Valid
-[wp] [Qed] Goal typed_ref_wrong_without_ref_call_f_requires : Valid
-[wp] [Qed] Goal typed_ref_pointer_ensures : Valid
-[wp] [Qed] Goal typed_ref_pointer_call_f_requires : Valid
-[wp] [Qed] Goal typed_ref_local_ensures : Valid
-[wp] [Qed] Goal typed_ref_local_call_f_requires : Valid
-[wp] [Qed] Goal typed_ref_formal_ensures : Valid
-[wp] [Qed] Goal typed_ref_formal_call_f_requires : Valid
-[wp] [Qed] Goal typed_ref_global_ensures : Valid
-[wp] [Qed] Goal typed_ref_global_call_f_requires : Valid
+[wp] [Valid] typed_ref_f_ensures (Qed)
+[wp] [Valid] typed_ref_f_assigns (Qed)
+[wp] [Valid] typed_ref_wrong_without_ref_ensures (Qed)
+[wp] [Valid] typed_ref_wrong_without_ref_call_f_requires (Qed)
+[wp] [Valid] typed_ref_pointer_ensures (Qed)
+[wp] [Valid] typed_ref_pointer_call_f_requires (Qed)
+[wp] [Valid] typed_ref_local_ensures (Qed)
+[wp] [Valid] typed_ref_local_call_f_requires (Qed)
+[wp] [Valid] typed_ref_formal_ensures (Qed)
+[wp] [Valid] typed_ref_formal_call_f_requires (Qed)
+[wp] [Valid] typed_ref_global_ensures (Qed)
+[wp] [Valid] typed_ref_global_call_f_requires (Qed)
[wp] Proved goals: 12 / 12
Qed: 12
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/dispatch_var.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle_qualif/dispatch_var.res.oracle
index d1128fcc03c..ff3743ef09e 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle_qualif/dispatch_var.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/dispatch_var.res.oracle
@@ -3,84 +3,84 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 78 goals scheduled
-[wp] [Qed] Goal typed_ref_call_ref_ctr_ensures_Ref_r1 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_ctr_assigns_exit : Valid
-[wp] [Qed] Goal typed_ref_call_ref_ctr_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_ctr_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_ctr2_ensures_Mem_n1 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_ctr2_assigns_exit_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_ctr2_assigns_exit_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_ctr2_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_ctr2_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_ctr2_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_ctr2_assigns_normal_part4 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_ctr2_assigns_normal_part5 : Valid
-[wp] [Qed] Goal typed_ref_ref_bd_ensures : Valid
-[wp] [Qed] Goal typed_ref_ref_bd_assigns : Valid
-[wp] [Qed] Goal typed_ref_call_ref_bd_ensures_Ref_r2 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_bd_assigns_exit : Valid
-[wp] [Qed] Goal typed_ref_call_ref_bd_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_bd_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_bd2_ensures_Mem_n2 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_bd2_assigns_exit_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_bd2_assigns_exit_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_bd2_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_bd2_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_bd2_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_bd2_assigns_normal_part4 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_bd2_assigns_normal_part5 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_valid_ensures_R7_N4 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_valid_assigns_exit_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_valid_assigns_exit_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_valid_assigns_exit_part3 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_valid_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_valid_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_valid_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_valid_assigns_normal_part4 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_valid_assigns_normal_part5 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_valid_call_ref_valid_requires : Valid
-[wp] [Qed] Goal typed_ref_call_ref_valid_call_ref_valid_2_requires : Valid
-[wp] [Qed] Goal typed_ref_no_ref_bd_ensures : Valid
-[wp] [Qed] Goal typed_ref_no_ref_bd_assigns_part1 : Valid
-[wp] [Qed] Goal typed_ref_no_ref_bd_assigns_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_no_ref_bd_ensures_Mem_n5_nr6 : Valid
-[wp] [Qed] Goal typed_ref_call_no_ref_bd_assigns_exit_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_no_ref_bd_assigns_exit_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_no_ref_bd_assigns_exit_part3 : Valid
-[wp] [Qed] Goal typed_ref_call_no_ref_bd_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_no_ref_bd_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_no_ref_bd_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_ref_call_no_ref_bd_assigns_normal_part4 : Valid
-[wp] [Qed] Goal typed_ref_call_no_ref_bd_assigns_normal_part5 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_ctr_nr_ensures_R_R_R : Valid
-[wp] [Qed] Goal typed_ref_call_ref_ctr_nr_ensures_R_R_R_2 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_ctr_nr_assigns_exit_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_ctr_nr_assigns_exit_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_ctr_nr_assigns_exit_part3 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_ctr_nr_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_ctr_nr_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_ctr_nr_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_ctr_nr_assigns_normal_part4 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_ctr_nr_call_ref_ctr_nr_requires : Valid
-[wp] [Qed] Goal typed_ref_call_ref_ctr_nstars_ensures : Valid
-[wp] [Qed] Goal typed_ref_call_ref_ctr_nstars_assigns_exit_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_ctr_nstars_assigns_exit_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_ctr_nstars_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_ctr_nstars_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_ctr_nstars_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_ref_call_two_ref_ensures : Valid
-[wp] [Qed] Goal typed_ref_call_two_ref_assigns_exit_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_two_ref_assigns_exit_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_two_ref_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_two_ref_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_two_ref_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_ref_call_two_ref_assigns_normal_part4 : Valid
-[wp] [Qed] Goal typed_ref_g_ensures : Valid
-[wp] [Qed] Goal typed_ref_g_assigns_exit : Valid
-[wp] [Qed] Goal typed_ref_g_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_ref_g_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_ref_array_in_struct_param_ensures_Pload2 : Valid
-[wp] [Qed] Goal typed_ref_array_in_struct_param_assigns : Valid
+[wp] [Valid] typed_ref_call_ref_ctr_ensures_Ref_r1 (Qed)
+[wp] [Valid] typed_ref_call_ref_ctr_assigns_exit (Qed)
+[wp] [Valid] typed_ref_call_ref_ctr_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_ref_call_ref_ctr_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_ref_call_ref_ctr2_ensures_Mem_n1 (Qed)
+[wp] [Valid] typed_ref_call_ref_ctr2_assigns_exit_part1 (Qed)
+[wp] [Valid] typed_ref_call_ref_ctr2_assigns_exit_part2 (Qed)
+[wp] [Valid] typed_ref_call_ref_ctr2_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_ref_call_ref_ctr2_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_ref_call_ref_ctr2_assigns_normal_part3 (Qed)
+[wp] [Valid] typed_ref_call_ref_ctr2_assigns_normal_part4 (Qed)
+[wp] [Valid] typed_ref_call_ref_ctr2_assigns_normal_part5 (Qed)
+[wp] [Valid] typed_ref_ref_bd_ensures (Qed)
+[wp] [Valid] typed_ref_ref_bd_assigns (Qed)
+[wp] [Valid] typed_ref_call_ref_bd_ensures_Ref_r2 (Qed)
+[wp] [Valid] typed_ref_call_ref_bd_assigns_exit (Qed)
+[wp] [Valid] typed_ref_call_ref_bd_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_ref_call_ref_bd_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_ref_call_ref_bd2_ensures_Mem_n2 (Qed)
+[wp] [Valid] typed_ref_call_ref_bd2_assigns_exit_part1 (Qed)
+[wp] [Valid] typed_ref_call_ref_bd2_assigns_exit_part2 (Qed)
+[wp] [Valid] typed_ref_call_ref_bd2_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_ref_call_ref_bd2_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_ref_call_ref_bd2_assigns_normal_part3 (Qed)
+[wp] [Valid] typed_ref_call_ref_bd2_assigns_normal_part4 (Qed)
+[wp] [Valid] typed_ref_call_ref_bd2_assigns_normal_part5 (Qed)
+[wp] [Valid] typed_ref_call_ref_valid_ensures_R7_N4 (Qed)
+[wp] [Valid] typed_ref_call_ref_valid_assigns_exit_part1 (Qed)
+[wp] [Valid] typed_ref_call_ref_valid_assigns_exit_part2 (Qed)
+[wp] [Valid] typed_ref_call_ref_valid_assigns_exit_part3 (Qed)
+[wp] [Valid] typed_ref_call_ref_valid_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_ref_call_ref_valid_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_ref_call_ref_valid_assigns_normal_part3 (Qed)
+[wp] [Valid] typed_ref_call_ref_valid_assigns_normal_part4 (Qed)
+[wp] [Valid] typed_ref_call_ref_valid_assigns_normal_part5 (Qed)
+[wp] [Valid] typed_ref_call_ref_valid_call_ref_valid_requires (Qed)
+[wp] [Valid] typed_ref_call_ref_valid_call_ref_valid_2_requires (Qed)
+[wp] [Valid] typed_ref_no_ref_bd_ensures (Qed)
+[wp] [Valid] typed_ref_no_ref_bd_assigns_part1 (Qed)
+[wp] [Valid] typed_ref_no_ref_bd_assigns_part2 (Qed)
+[wp] [Valid] typed_ref_call_no_ref_bd_ensures_Mem_n5_nr6 (Qed)
+[wp] [Valid] typed_ref_call_no_ref_bd_assigns_exit_part1 (Qed)
+[wp] [Valid] typed_ref_call_no_ref_bd_assigns_exit_part2 (Qed)
+[wp] [Valid] typed_ref_call_no_ref_bd_assigns_exit_part3 (Qed)
+[wp] [Valid] typed_ref_call_no_ref_bd_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_ref_call_no_ref_bd_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_ref_call_no_ref_bd_assigns_normal_part3 (Qed)
+[wp] [Valid] typed_ref_call_no_ref_bd_assigns_normal_part4 (Qed)
+[wp] [Valid] typed_ref_call_no_ref_bd_assigns_normal_part5 (Qed)
+[wp] [Valid] typed_ref_call_ref_ctr_nr_ensures_R_R_R (Qed)
+[wp] [Valid] typed_ref_call_ref_ctr_nr_ensures_R_R_R_2 (Qed)
+[wp] [Valid] typed_ref_call_ref_ctr_nr_assigns_exit_part1 (Qed)
+[wp] [Valid] typed_ref_call_ref_ctr_nr_assigns_exit_part2 (Qed)
+[wp] [Valid] typed_ref_call_ref_ctr_nr_assigns_exit_part3 (Qed)
+[wp] [Valid] typed_ref_call_ref_ctr_nr_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_ref_call_ref_ctr_nr_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_ref_call_ref_ctr_nr_assigns_normal_part3 (Qed)
+[wp] [Valid] typed_ref_call_ref_ctr_nr_assigns_normal_part4 (Qed)
+[wp] [Valid] typed_ref_call_ref_ctr_nr_call_ref_ctr_nr_requires (Qed)
+[wp] [Valid] typed_ref_call_ref_ctr_nstars_ensures (Qed)
+[wp] [Valid] typed_ref_call_ref_ctr_nstars_assigns_exit_part1 (Qed)
+[wp] [Valid] typed_ref_call_ref_ctr_nstars_assigns_exit_part2 (Qed)
+[wp] [Valid] typed_ref_call_ref_ctr_nstars_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_ref_call_ref_ctr_nstars_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_ref_call_ref_ctr_nstars_assigns_normal_part3 (Qed)
+[wp] [Valid] typed_ref_call_two_ref_ensures (Qed)
+[wp] [Valid] typed_ref_call_two_ref_assigns_exit_part1 (Qed)
+[wp] [Valid] typed_ref_call_two_ref_assigns_exit_part2 (Qed)
+[wp] [Valid] typed_ref_call_two_ref_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_ref_call_two_ref_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_ref_call_two_ref_assigns_normal_part3 (Qed)
+[wp] [Valid] typed_ref_call_two_ref_assigns_normal_part4 (Qed)
+[wp] [Valid] typed_ref_g_ensures (Qed)
+[wp] [Valid] typed_ref_g_assigns_exit (Qed)
+[wp] [Valid] typed_ref_g_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_ref_g_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_ref_array_in_struct_param_ensures_Pload2 (Qed)
+[wp] [Valid] typed_ref_array_in_struct_param_assigns (Qed)
[wp] Proved goals: 78 / 78
Qed: 78
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/dispatch_var2.0.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle_qualif/dispatch_var2.0.res.oracle
index f39092e695c..b4a4eb8afb2 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle_qualif/dispatch_var2.0.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/dispatch_var2.0.res.oracle
@@ -3,40 +3,40 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 34 goals scheduled
-[wp] [Qed] Goal typed_ref_reset_ensures : Valid
-[wp] [Qed] Goal typed_ref_reset_assigns : Valid
-[wp] [Qed] Goal typed_ref_incr_ensures : Valid
-[wp] [Qed] Goal typed_ref_incr_assigns : Valid
-[wp] [Qed] Goal typed_ref_load_ensures : Valid
-[wp] [Qed] Goal typed_ref_load_assigns : Valid
-[wp] [Qed] Goal typed_ref_call_global_ensures : Valid
-[wp] [Qed] Goal typed_ref_call_global_assigns_exit : Valid
-[wp] [Qed] Goal typed_ref_call_global_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_global_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_global_call_reset_requires : Valid
-[wp] [Qed] Goal typed_ref_call_global_call_load_requires : Valid
-[wp] [Qed] Goal typed_ref_call_param_ensures : Valid
-[wp] [Qed] Goal typed_ref_call_param_assigns_exit_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_param_assigns_exit_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_param_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_param_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_param_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_ref_call_param_call_reset_requires : Valid
-[wp] [Qed] Goal typed_ref_call_param_call_load_requires : Valid
-[wp] [Qed] Goal typed_ref_call_local_ensures : Valid
-[wp] [Qed] Goal typed_ref_call_local_assigns_exit_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_local_assigns_exit_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_local_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_local_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_local_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_ref_call_local_call_reset_requires : Valid
-[wp] [Qed] Goal typed_ref_call_local_call_load_requires : Valid
-[wp] [Qed] Goal typed_ref_call_param_ref_ensures : Valid
-[wp] [Qed] Goal typed_ref_call_param_ref_assigns_exit : Valid
-[wp] [Qed] Goal typed_ref_call_param_ref_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_param_ref_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_param_ref_call_reset_requires : Valid
-[wp] [Qed] Goal typed_ref_call_param_ref_call_load_requires : Valid
+[wp] [Valid] typed_ref_reset_ensures (Qed)
+[wp] [Valid] typed_ref_reset_assigns (Qed)
+[wp] [Valid] typed_ref_incr_ensures (Qed)
+[wp] [Valid] typed_ref_incr_assigns (Qed)
+[wp] [Valid] typed_ref_load_ensures (Qed)
+[wp] [Valid] typed_ref_load_assigns (Qed)
+[wp] [Valid] typed_ref_call_global_ensures (Qed)
+[wp] [Valid] typed_ref_call_global_assigns_exit (Qed)
+[wp] [Valid] typed_ref_call_global_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_ref_call_global_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_ref_call_global_call_reset_requires (Qed)
+[wp] [Valid] typed_ref_call_global_call_load_requires (Qed)
+[wp] [Valid] typed_ref_call_param_ensures (Qed)
+[wp] [Valid] typed_ref_call_param_assigns_exit_part1 (Qed)
+[wp] [Valid] typed_ref_call_param_assigns_exit_part2 (Qed)
+[wp] [Valid] typed_ref_call_param_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_ref_call_param_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_ref_call_param_assigns_normal_part3 (Qed)
+[wp] [Valid] typed_ref_call_param_call_reset_requires (Qed)
+[wp] [Valid] typed_ref_call_param_call_load_requires (Qed)
+[wp] [Valid] typed_ref_call_local_ensures (Qed)
+[wp] [Valid] typed_ref_call_local_assigns_exit_part1 (Qed)
+[wp] [Valid] typed_ref_call_local_assigns_exit_part2 (Qed)
+[wp] [Valid] typed_ref_call_local_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_ref_call_local_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_ref_call_local_assigns_normal_part3 (Qed)
+[wp] [Valid] typed_ref_call_local_call_reset_requires (Qed)
+[wp] [Valid] typed_ref_call_local_call_load_requires (Qed)
+[wp] [Valid] typed_ref_call_param_ref_ensures (Qed)
+[wp] [Valid] typed_ref_call_param_ref_assigns_exit (Qed)
+[wp] [Valid] typed_ref_call_param_ref_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_ref_call_param_ref_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_ref_call_param_ref_call_reset_requires (Qed)
+[wp] [Valid] typed_ref_call_param_ref_call_load_requires (Qed)
[wp] Proved goals: 34 / 34
Qed: 34
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/dispatch_var2.1.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle_qualif/dispatch_var2.1.res.oracle
index e2c82e02c90..63e7e9f7e76 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle_qualif/dispatch_var2.1.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/dispatch_var2.1.res.oracle
@@ -3,40 +3,40 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 34 goals scheduled
-[wp] [Qed] Goal typed_ref_reset_ensures : Valid
-[wp] [Qed] Goal typed_ref_reset_assigns : Valid
-[wp] [Qed] Goal typed_ref_incr_ensures : Valid
-[wp] [Qed] Goal typed_ref_incr_assigns : Valid
-[wp] [Qed] Goal typed_ref_load_ensures : Valid
-[wp] [Qed] Goal typed_ref_load_assigns : Valid
-[wp] [Qed] Goal typed_ref_call_global_ensures : Valid
-[wp] [Qed] Goal typed_ref_call_global_assigns_exit : Valid
-[wp] [Qed] Goal typed_ref_call_global_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_global_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_global_call_reset_requires : Valid
-[wp] [Qed] Goal typed_ref_call_global_call_load_requires : Valid
-[wp] [Qed] Goal typed_ref_call_param_ensures : Valid
-[wp] [Qed] Goal typed_ref_call_param_assigns_exit_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_param_assigns_exit_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_param_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_param_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_param_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_ref_call_param_call_reset_requires : Valid
-[wp] [Qed] Goal typed_ref_call_param_call_load_requires : Valid
-[wp] [Qed] Goal typed_ref_call_local_ensures : Valid
-[wp] [Qed] Goal typed_ref_call_local_assigns_exit_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_local_assigns_exit_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_local_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_local_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_local_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_ref_call_local_call_reset_requires : Valid
-[wp] [Qed] Goal typed_ref_call_local_call_load_requires : Valid
-[wp] [Qed] Goal typed_ref_call_param_ref_ensures : Valid
-[wp] [Qed] Goal typed_ref_call_param_ref_assigns_exit : Valid
-[wp] [Qed] Goal typed_ref_call_param_ref_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_param_ref_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_param_ref_call_reset_requires : Valid
-[wp] [Qed] Goal typed_ref_call_param_ref_call_load_requires : Valid
+[wp] [Valid] typed_ref_reset_ensures (Qed)
+[wp] [Valid] typed_ref_reset_assigns (Qed)
+[wp] [Valid] typed_ref_incr_ensures (Qed)
+[wp] [Valid] typed_ref_incr_assigns (Qed)
+[wp] [Valid] typed_ref_load_ensures (Qed)
+[wp] [Valid] typed_ref_load_assigns (Qed)
+[wp] [Valid] typed_ref_call_global_ensures (Qed)
+[wp] [Valid] typed_ref_call_global_assigns_exit (Qed)
+[wp] [Valid] typed_ref_call_global_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_ref_call_global_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_ref_call_global_call_reset_requires (Qed)
+[wp] [Valid] typed_ref_call_global_call_load_requires (Qed)
+[wp] [Valid] typed_ref_call_param_ensures (Qed)
+[wp] [Valid] typed_ref_call_param_assigns_exit_part1 (Qed)
+[wp] [Valid] typed_ref_call_param_assigns_exit_part2 (Qed)
+[wp] [Valid] typed_ref_call_param_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_ref_call_param_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_ref_call_param_assigns_normal_part3 (Qed)
+[wp] [Valid] typed_ref_call_param_call_reset_requires (Qed)
+[wp] [Valid] typed_ref_call_param_call_load_requires (Qed)
+[wp] [Valid] typed_ref_call_local_ensures (Qed)
+[wp] [Valid] typed_ref_call_local_assigns_exit_part1 (Qed)
+[wp] [Valid] typed_ref_call_local_assigns_exit_part2 (Qed)
+[wp] [Valid] typed_ref_call_local_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_ref_call_local_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_ref_call_local_assigns_normal_part3 (Qed)
+[wp] [Valid] typed_ref_call_local_call_reset_requires (Qed)
+[wp] [Valid] typed_ref_call_local_call_load_requires (Qed)
+[wp] [Valid] typed_ref_call_param_ref_ensures (Qed)
+[wp] [Valid] typed_ref_call_param_ref_assigns_exit (Qed)
+[wp] [Valid] typed_ref_call_param_ref_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_ref_call_param_ref_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_ref_call_param_ref_call_reset_requires (Qed)
+[wp] [Valid] typed_ref_call_param_ref_call_load_requires (Qed)
[wp] Proved goals: 34 / 34
Qed: 34
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/isHoare.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle_qualif/isHoare.res.oracle
index eca3be2dd3b..dd788cbb21f 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle_qualif/isHoare.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/isHoare.res.oracle
@@ -3,7 +3,7 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 1 goal scheduled
-[wp] [Qed] Goal typed_ref_cmp_invalid_addr_as_int_ensures_ok : Valid
+[wp] [Valid] typed_ref_cmp_invalid_addr_as_int_ensures_ok (Qed)
[wp] Proved goals: 1 / 1
Qed: 1
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicarr.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicarr.res.oracle
index 03796d3e416..3cc7d23790f 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicarr.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicarr.res.oracle
@@ -3,9 +3,9 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 3 goals scheduled
-[wp] [Alt-Ergo] Goal typed_job_ensures_PTR : Valid
-[wp] [Alt-Ergo] Goal typed_job_ensures_ARR : Valid
-[wp] [Alt-Ergo] Goal typed_job_ensures_DUM : Valid
+[wp] [Valid] typed_job_ensures_PTR (Alt-Ergo) (Cached)
+[wp] [Valid] typed_job_ensures_ARR (Alt-Ergo) (Cached)
+[wp] [Valid] typed_job_ensures_DUM (Alt-Ergo) (Cached)
[wp] Proved goals: 3 / 3
Qed: 0
Alt-Ergo: 3
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicref.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicref.res.oracle
index 273fdfb6090..a4d21c36668 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicref.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicref.res.oracle
@@ -3,11 +3,11 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 5 goals scheduled
-[wp] [Qed] Goal typed_ref_fvrange_n_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_ref_fvrange_n_assert : Valid
-[wp] [Qed] Goal typed_ref_fvrange_n_assigns : Valid
-[wp] [Qed] Goal typed_ref_gcd_ensures : Valid
-[wp] [Qed] Goal typed_ref_gcd_assigns : Valid
+[wp] [Valid] typed_ref_fvrange_n_ensures (Qed)
+[wp] [Valid] typed_ref_fvrange_n_assert (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_fvrange_n_assigns (Qed)
+[wp] [Valid] typed_ref_gcd_ensures (Qed)
+[wp] [Valid] typed_ref_gcd_assigns (Qed)
[wp] Proved goals: 5 / 5
Qed: 4
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicref_simple.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicref_simple.res.oracle
index fab483750f3..6ab216192d6 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicref_simple.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicref_simple.res.oracle
@@ -3,15 +3,15 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 9 goals scheduled
-[wp] [Alt-Ergo] Goal typed_ref_fsimple_ensures : Valid
-[wp] [Qed] Goal typed_ref_fsimple_assigns : Valid
-[wp] [Alt-Ergo] Goal typed_ref_fsimple_array_ensures : Valid
-[wp] [Qed] Goal typed_ref_fsimple_array_assigns : Valid
-[wp] [Alt-Ergo] Goal typed_ref_ftwo_star_ensures : Valid
-[wp] [Qed] Goal typed_ref_ftwo_star_assigns : Valid
-[wp] [Qed] Goal typed_ref_fvpositive_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_ref_fvpositive_assert_OK : Valid
-[wp] [Qed] Goal typed_ref_fvpositive_assigns : Valid
+[wp] [Valid] typed_ref_fsimple_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_fsimple_assigns (Qed)
+[wp] [Valid] typed_ref_fsimple_array_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_fsimple_array_assigns (Qed)
+[wp] [Valid] typed_ref_ftwo_star_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_ftwo_star_assigns (Qed)
+[wp] [Valid] typed_ref_fvpositive_ensures (Qed)
+[wp] [Valid] typed_ref_fvpositive_assert_OK (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_fvpositive_assigns (Qed)
[wp] Proved goals: 9 / 9
Qed: 5
Alt-Ergo: 4
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/memory_hypotheses_checking.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle_qualif/memory_hypotheses_checking.res.oracle
index 2a2af602b91..fbabb52535d 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle_qualif/memory_hypotheses_checking.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/memory_hypotheses_checking.res.oracle
@@ -3,56 +3,56 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 50 goals scheduled
-[wp] [Qed] Goal typed_ref_sep_assigns : Valid
-[wp] [Qed] Goal typed_ref_call_sep_ok_assigns_exit : Valid
-[wp] [Qed] Goal typed_ref_call_sep_ok_assigns_normal : Valid
-[wp] [Qed] Goal typed_ref_call_sep_ok_call_sep_wp_typed_ref_requires : Valid
-[wp] [Qed] Goal typed_ref_call_sep_ok_call_sep_wp_typed_ref_requires_2 : Valid
-[wp] [Qed] Goal typed_ref_call_sep_bad_sep_assigns_exit : Valid
-[wp] [Qed] Goal typed_ref_call_sep_bad_sep_assigns_normal : Valid
-[wp] [Qed] Goal typed_ref_call_sep_bad_sep_call_sep_wp_typed_ref_requires : Valid
-[wp] [Alt-Ergo] Goal typed_ref_call_sep_bad_sep_call_sep_wp_typed_ref_requires_2 : Unsuccess
-[wp] [Qed] Goal typed_ref_call_sep_bad_valid_assigns_exit_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_sep_bad_valid_assigns_exit_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_sep_bad_valid_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_sep_bad_valid_assigns_normal_part2 : Valid
-[wp] [Alt-Ergo] Goal typed_ref_call_sep_bad_valid_call_sep_wp_typed_ref_requires : Unsuccess
-[wp] [Qed] Goal typed_ref_call_sep_bad_valid_call_sep_wp_typed_ref_requires_2 : Valid
-[wp] [Qed] Goal typed_ref_gptr_sep_assigns : Valid
-[wp] [Qed] Goal typed_ref_call_gptr_sep_ok_assigns_exit : Valid
-[wp] [Qed] Goal typed_ref_call_gptr_sep_ok_assigns_normal : Valid
-[wp] [Alt-Ergo] Goal typed_ref_call_gptr_sep_ok_call_gptr_sep_wp_typed_ref_requires : Valid
-[wp] [Qed] Goal typed_ref_call_gptr_sep_ok_call_gptr_sep_wp_typed_ref_requires_2 : Valid
-[wp] [Qed] Goal typed_ref_call_gptr_sep_bad_assigns_exit : Valid
-[wp] [Qed] Goal typed_ref_call_gptr_sep_bad_assigns_normal : Valid
-[wp] [Alt-Ergo] Goal typed_ref_call_gptr_sep_bad_call_gptr_sep_wp_typed_ref_requires : Valid
-[wp] [Alt-Ergo] Goal typed_ref_call_gptr_sep_bad_call_gptr_sep_wp_typed_ref_requires_2 : Unsuccess
-[wp] [Qed] Goal typed_ref_assigns_ptr_assigns : Valid
-[wp] [Qed] Goal typed_ref_call_assigns_ptr_ok_assigns_exit : Valid
-[wp] [Qed] Goal typed_ref_call_assigns_ptr_ok_assigns_normal : Valid
-[wp] [Qed] Goal typed_ref_call_assigns_ptr_ok_call_assigns_ptr_wp_typed_ref_requires : Valid
-[wp] [Qed] Goal typed_ref_call_assigns_ptr_ok_call_assigns_ptr_wp_typed_ref_requires_2 : Valid
-[wp] [Qed] Goal typed_ref_call_assigns_ptr_bad_assigns_exit : Valid
-[wp] [Qed] Goal typed_ref_call_assigns_ptr_bad_assigns_normal : Valid
-[wp] [Qed] Goal typed_ref_call_assigns_ptr_bad_call_assigns_ptr_wp_typed_ref_requires : Valid
-[wp] [Alt-Ergo] Goal typed_ref_call_assigns_ptr_bad_call_assigns_ptr_wp_typed_ref_requires_2 : Unsuccess
-[wp] [Qed] Goal typed_ref_add_return_ok_ensures : Valid
-[wp] [Qed] Goal typed_ref_add_return_ok_assigns : Valid
-[wp] [Qed] Goal typed_ref_add_return_ok_wp_typed_ref_ensures : Valid
-[wp] [Qed] Goal typed_ref_call_add_return_ok_assigns_exit : Valid
-[wp] [Qed] Goal typed_ref_call_add_return_ok_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_add_return_ok_assigns_normal_part2 : Valid
-[wp] [Alt-Ergo] Goal typed_ref_call_add_return_ok_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_ref_call_add_return_ok_call_add_return_ok_wp_typed_ref_requires : Valid
-[wp] [Qed] Goal typed_ref_call_add_return_ok_call_add_return_ok_wp_typed_ref_requires_2 : Valid
-[wp] [Qed] Goal typed_ref_call_add_return_bad_assigns_exit : Valid
-[wp] [Qed] Goal typed_ref_call_add_return_bad_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_add_return_bad_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_add_return_bad_assigns_normal_part3 : Valid
-[wp] [Alt-Ergo] Goal typed_ref_call_add_return_bad_call_add_return_ok_wp_typed_ref_requires : Unsuccess
-[wp] [Alt-Ergo] Goal typed_ref_call_add_return_bad_call_add_return_ok_wp_typed_ref_requires_2 : Unsuccess
-[wp] [Qed] Goal typed_ref_bad_return_formal_assigns : Valid
-[wp] [Alt-Ergo] Goal typed_ref_bad_return_formal_wp_typed_ref_ensures : Unsuccess
+[wp] [Valid] typed_ref_sep_assigns (Qed)
+[wp] [Valid] typed_ref_call_sep_ok_assigns_exit (Qed)
+[wp] [Valid] typed_ref_call_sep_ok_assigns_normal (Qed)
+[wp] [Valid] typed_ref_call_sep_ok_call_sep_wp_typed_ref_requires (Qed)
+[wp] [Valid] typed_ref_call_sep_ok_call_sep_wp_typed_ref_requires_2 (Qed)
+[wp] [Valid] typed_ref_call_sep_bad_sep_assigns_exit (Qed)
+[wp] [Valid] typed_ref_call_sep_bad_sep_assigns_normal (Qed)
+[wp] [Valid] typed_ref_call_sep_bad_sep_call_sep_wp_typed_ref_requires (Qed)
+[wp] [Unknown] typed_ref_call_sep_bad_sep_call_sep_wp_typed_ref_requires_2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_call_sep_bad_valid_assigns_exit_part1 (Qed)
+[wp] [Valid] typed_ref_call_sep_bad_valid_assigns_exit_part2 (Qed)
+[wp] [Valid] typed_ref_call_sep_bad_valid_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_ref_call_sep_bad_valid_assigns_normal_part2 (Qed)
+[wp] [Unknown] typed_ref_call_sep_bad_valid_call_sep_wp_typed_ref_requires (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_call_sep_bad_valid_call_sep_wp_typed_ref_requires_2 (Qed)
+[wp] [Valid] typed_ref_gptr_sep_assigns (Qed)
+[wp] [Valid] typed_ref_call_gptr_sep_ok_assigns_exit (Qed)
+[wp] [Valid] typed_ref_call_gptr_sep_ok_assigns_normal (Qed)
+[wp] [Valid] typed_ref_call_gptr_sep_ok_call_gptr_sep_wp_typed_ref_requires (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_call_gptr_sep_ok_call_gptr_sep_wp_typed_ref_requires_2 (Qed)
+[wp] [Valid] typed_ref_call_gptr_sep_bad_assigns_exit (Qed)
+[wp] [Valid] typed_ref_call_gptr_sep_bad_assigns_normal (Qed)
+[wp] [Valid] typed_ref_call_gptr_sep_bad_call_gptr_sep_wp_typed_ref_requires (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_ref_call_gptr_sep_bad_call_gptr_sep_wp_typed_ref_requires_2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_assigns_ptr_assigns (Qed)
+[wp] [Valid] typed_ref_call_assigns_ptr_ok_assigns_exit (Qed)
+[wp] [Valid] typed_ref_call_assigns_ptr_ok_assigns_normal (Qed)
+[wp] [Valid] typed_ref_call_assigns_ptr_ok_call_assigns_ptr_wp_typed_ref_requires (Qed)
+[wp] [Valid] typed_ref_call_assigns_ptr_ok_call_assigns_ptr_wp_typed_ref_requires_2 (Qed)
+[wp] [Valid] typed_ref_call_assigns_ptr_bad_assigns_exit (Qed)
+[wp] [Valid] typed_ref_call_assigns_ptr_bad_assigns_normal (Qed)
+[wp] [Valid] typed_ref_call_assigns_ptr_bad_call_assigns_ptr_wp_typed_ref_requires (Qed)
+[wp] [Unknown] typed_ref_call_assigns_ptr_bad_call_assigns_ptr_wp_typed_ref_requires_2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_add_return_ok_ensures (Qed)
+[wp] [Valid] typed_ref_add_return_ok_assigns (Qed)
+[wp] [Valid] typed_ref_add_return_ok_wp_typed_ref_ensures (Qed)
+[wp] [Valid] typed_ref_call_add_return_ok_assigns_exit (Qed)
+[wp] [Valid] typed_ref_call_add_return_ok_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_ref_call_add_return_ok_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_ref_call_add_return_ok_assigns_normal_part3 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_call_add_return_ok_call_add_return_ok_wp_typed_ref_requires (Qed)
+[wp] [Valid] typed_ref_call_add_return_ok_call_add_return_ok_wp_typed_ref_requires_2 (Qed)
+[wp] [Valid] typed_ref_call_add_return_bad_assigns_exit (Qed)
+[wp] [Valid] typed_ref_call_add_return_bad_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_ref_call_add_return_bad_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_ref_call_add_return_bad_assigns_normal_part3 (Qed)
+[wp] [Unknown] typed_ref_call_add_return_bad_call_add_return_ok_wp_typed_ref_requires (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_ref_call_add_return_bad_call_add_return_ok_wp_typed_ref_requires_2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_bad_return_formal_assigns (Qed)
+[wp] [Unknown] typed_ref_bad_return_formal_wp_typed_ref_ensures (Alt-Ergo) (Cached)
[wp] Proved goals: 43 / 50
Qed: 40
Alt-Ergo: 3 (unsuccess: 7)
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference.res.oracle
index e8d66c2965f..26b8284ccd9 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference.res.oracle
@@ -3,29 +3,29 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 23 goals scheduled
-[wp] [Qed] Goal typed_ref_g_ensures : Valid
-[wp] [Qed] Goal typed_ref_g_assigns_exit_part1 : Valid
-[wp] [Qed] Goal typed_ref_g_assigns_exit_part2 : Valid
-[wp] [Qed] Goal typed_ref_g_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_ref_g_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_ref_g_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_ref_g_call_f_requires : Valid
-[wp] [Qed] Goal typed_ref_call_f2_ensures : Valid
-[wp] [Qed] Goal typed_ref_call_f2_assigns_exit_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_f2_assigns_exit_part2 : Valid
-[wp] [Alt-Ergo] Goal typed_ref_call_f2_assigns_exit_part3 : Unsuccess
-[wp] [Qed] Goal typed_ref_call_f2_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_f2_assigns_normal_part2 : Valid
-[wp] [Alt-Ergo] Goal typed_ref_call_f2_assigns_normal_part3 : Unsuccess
-[wp] [Qed] Goal typed_ref_call_f2_assigns_normal_part4 : Valid
-[wp] [Qed] Goal typed_ref_call_f2_call_f2_requires : Valid
-[wp] [Qed] Goal typed_ref_call_global_ensures : Valid
-[wp] [Qed] Goal typed_ref_call_global_assigns_exit : Valid
-[wp] [Qed] Goal typed_ref_call_global_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_global_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_global_call_f_requires : Valid
-[wp] [Qed] Goal typed_ref_write_ensures : Valid
-[wp] [Qed] Goal typed_ref_write_assigns : Valid
+[wp] [Valid] typed_ref_g_ensures (Qed)
+[wp] [Valid] typed_ref_g_assigns_exit_part1 (Qed)
+[wp] [Valid] typed_ref_g_assigns_exit_part2 (Qed)
+[wp] [Valid] typed_ref_g_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_ref_g_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_ref_g_assigns_normal_part3 (Qed)
+[wp] [Valid] typed_ref_g_call_f_requires (Qed)
+[wp] [Valid] typed_ref_call_f2_ensures (Qed)
+[wp] [Valid] typed_ref_call_f2_assigns_exit_part1 (Qed)
+[wp] [Valid] typed_ref_call_f2_assigns_exit_part2 (Qed)
+[wp] [Unknown] typed_ref_call_f2_assigns_exit_part3 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_call_f2_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_ref_call_f2_assigns_normal_part2 (Qed)
+[wp] [Unknown] typed_ref_call_f2_assigns_normal_part3 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_call_f2_assigns_normal_part4 (Qed)
+[wp] [Valid] typed_ref_call_f2_call_f2_requires (Qed)
+[wp] [Valid] typed_ref_call_global_ensures (Qed)
+[wp] [Valid] typed_ref_call_global_assigns_exit (Qed)
+[wp] [Valid] typed_ref_call_global_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_ref_call_global_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_ref_call_global_call_f_requires (Qed)
+[wp] [Valid] typed_ref_write_ensures (Qed)
+[wp] [Valid] typed_ref_write_assigns (Qed)
[wp] Proved goals: 21 / 23
Qed: 21
Alt-Ergo: 0 (unsuccess: 2)
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_and_struct.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_and_struct.res.oracle
index 44907b868b9..a11993b63ae 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_and_struct.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_and_struct.res.oracle
@@ -3,38 +3,38 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 32 goals scheduled
-[wp] [Qed] Goal typed_ref_reset_ensures : Valid
-[wp] [Qed] Goal typed_ref_reset_assigns : Valid
-[wp] [Qed] Goal typed_ref_call_reset_ensures : Valid
-[wp] [Qed] Goal typed_ref_call_reset_assigns_exit : Valid
-[wp] [Qed] Goal typed_ref_call_reset_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_reset_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_reset_call_reset_requires : Valid
-[wp] [Alt-Ergo] Goal typed_ref_call_reset_5_ensures_Preset_5 : Valid
-[wp] [Qed] Goal typed_ref_call_reset_5_assigns_exit : Valid
-[wp] [Qed] Goal typed_ref_call_reset_5_assigns_normal : Valid
-[wp] [Qed] Goal typed_ref_call_reset_5_call_reset_5_requires : Valid
-[wp] [Alt-Ergo] Goal typed_ref_call_reset_5_tps_ensures_Preset_5_tps : Valid
-[wp] [Qed] Goal typed_ref_call_reset_5_tps_assigns_exit : Valid
-[wp] [Qed] Goal typed_ref_call_reset_5_tps_assigns_normal : Valid
-[wp] [Qed] Goal typed_ref_call_reset_5_tps_call_reset_5_requires : Valid
-[wp] [Alt-Ergo] Goal typed_ref_call_reset_1_5_ensures_Presset_mat : Valid
-[wp] [Qed] Goal typed_ref_call_reset_1_5_assigns_exit : Valid
-[wp] [Qed] Goal typed_ref_call_reset_1_5_assigns_normal : Valid
-[wp] [Qed] Goal typed_ref_call_reset_1_5_call_reset_1_5_requires : Valid
-[wp] [Alt-Ergo] Goal typed_ref_call_reset_5_dim2_ensures_Presset_mat : Valid
-[wp] [Qed] Goal typed_ref_call_reset_5_dim2_assigns_exit : Valid
-[wp] [Qed] Goal typed_ref_call_reset_5_dim2_assigns_normal : Valid
-[wp] [Qed] Goal typed_ref_call_reset_5_dim2_call_reset_5_requires : Valid
-[wp] [Alt-Ergo] Goal typed_ref_call_on_array_in_struct_global_ensures_Pload : Valid
-[wp] [Qed] Goal typed_ref_call_on_array_in_struct_global_assigns_exit : Valid
-[wp] [Qed] Goal typed_ref_call_on_array_in_struct_global_assigns_normal : Valid
-[wp] [Qed] Goal typed_ref_call_on_array_in_struct_global_call_load_5_requires : Valid
-[wp] [Qed] Goal typed_ref_call_array_in_struct_param_ensures_Pload2 : Valid
-[wp] [Qed] Goal typed_ref_call_array_in_struct_param_ensures_Pload3 : Valid
-[wp] [Qed] Goal typed_ref_call_array_in_struct_param_assigns_exit : Valid
-[wp] [Qed] Goal typed_ref_call_array_in_struct_param_assigns_normal : Valid
-[wp] [Qed] Goal typed_ref_call_array_in_struct_param_call_load_5_requires : Valid
+[wp] [Valid] typed_ref_reset_ensures (Qed)
+[wp] [Valid] typed_ref_reset_assigns (Qed)
+[wp] [Valid] typed_ref_call_reset_ensures (Qed)
+[wp] [Valid] typed_ref_call_reset_assigns_exit (Qed)
+[wp] [Valid] typed_ref_call_reset_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_ref_call_reset_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_ref_call_reset_call_reset_requires (Qed)
+[wp] [Valid] typed_ref_call_reset_5_ensures_Preset_5 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_call_reset_5_assigns_exit (Qed)
+[wp] [Valid] typed_ref_call_reset_5_assigns_normal (Qed)
+[wp] [Valid] typed_ref_call_reset_5_call_reset_5_requires (Qed)
+[wp] [Valid] typed_ref_call_reset_5_tps_ensures_Preset_5_tps (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_call_reset_5_tps_assigns_exit (Qed)
+[wp] [Valid] typed_ref_call_reset_5_tps_assigns_normal (Qed)
+[wp] [Valid] typed_ref_call_reset_5_tps_call_reset_5_requires (Qed)
+[wp] [Valid] typed_ref_call_reset_1_5_ensures_Presset_mat (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_call_reset_1_5_assigns_exit (Qed)
+[wp] [Valid] typed_ref_call_reset_1_5_assigns_normal (Qed)
+[wp] [Valid] typed_ref_call_reset_1_5_call_reset_1_5_requires (Qed)
+[wp] [Valid] typed_ref_call_reset_5_dim2_ensures_Presset_mat (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_call_reset_5_dim2_assigns_exit (Qed)
+[wp] [Valid] typed_ref_call_reset_5_dim2_assigns_normal (Qed)
+[wp] [Valid] typed_ref_call_reset_5_dim2_call_reset_5_requires (Qed)
+[wp] [Valid] typed_ref_call_on_array_in_struct_global_ensures_Pload (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_call_on_array_in_struct_global_assigns_exit (Qed)
+[wp] [Valid] typed_ref_call_on_array_in_struct_global_assigns_normal (Qed)
+[wp] [Valid] typed_ref_call_on_array_in_struct_global_call_load_5_requires (Qed)
+[wp] [Valid] typed_ref_call_array_in_struct_param_ensures_Pload2 (Qed)
+[wp] [Valid] typed_ref_call_array_in_struct_param_ensures_Pload3 (Qed)
+[wp] [Valid] typed_ref_call_array_in_struct_param_assigns_exit (Qed)
+[wp] [Valid] typed_ref_call_array_in_struct_param_assigns_normal (Qed)
+[wp] [Valid] typed_ref_call_array_in_struct_param_call_load_5_requires (Qed)
[wp] Proved goals: 32 / 32
Qed: 27
Alt-Ergo: 5
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.res.oracle
index 2284df97cc4..3cc583c4afd 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.res.oracle
@@ -3,42 +3,42 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 36 goals scheduled
-[wp] [Alt-Ergo] Goal typed_ref_reset_1_5_ensures : Valid
-[wp] [Qed] Goal typed_ref_reset_1_5_assigns_exit : Valid
-[wp] [Qed] Goal typed_ref_reset_1_5_assigns_normal : Valid
-[wp] [Qed] Goal typed_ref_reset_1_5_call_reset_5_requires : Valid
-[wp] [Alt-Ergo] Goal typed_ref_load_1_5_ensures : Valid
-[wp] [Qed] Goal typed_ref_load_1_5_assigns_exit : Valid
-[wp] [Qed] Goal typed_ref_load_1_5_assigns_normal : Valid
-[wp] [Qed] Goal typed_ref_load_1_5_call_load_5_requires : Valid
-[wp] [Alt-Ergo] Goal typed_ref_add_1_5_ensures : Valid
-[wp] [Qed] Goal typed_ref_add_1_5_assigns_exit : Valid
-[wp] [Qed] Goal typed_ref_add_1_5_assigns_normal : Valid
-[wp] [Qed] Goal typed_ref_add_1_5_call_add_5_requires : Valid
-[wp] [Alt-Ergo] Goal typed_ref_calls_on_array_dim_1_ensures_Pload : Valid
-[wp] [Alt-Ergo] Goal typed_ref_calls_on_array_dim_1_ensures_Preset : Valid
-[wp] [Alt-Ergo] Goal typed_ref_calls_on_array_dim_1_ensures_Padd : Valid
-[wp] [Qed] Goal typed_ref_calls_on_array_dim_1_assigns_exit : Valid
-[wp] [Qed] Goal typed_ref_calls_on_array_dim_1_assigns_normal : Valid
-[wp] [Qed] Goal typed_ref_calls_on_array_dim_1_call_load_5_requires : Valid
-[wp] [Qed] Goal typed_ref_calls_on_array_dim_1_call_reset_5_requires : Valid
-[wp] [Qed] Goal typed_ref_calls_on_array_dim_1_call_add_5_requires : Valid
-[wp] [Alt-Ergo] Goal typed_ref_calls_on_array_dim_2_to_1_ensures_Pload : Valid
-[wp] [Alt-Ergo] Goal typed_ref_calls_on_array_dim_2_to_1_ensures_Preset : Valid
-[wp] [Alt-Ergo] Goal typed_ref_calls_on_array_dim_2_to_1_ensures_Padd : Valid
-[wp] [Qed] Goal typed_ref_calls_on_array_dim_2_to_1_assigns_exit : Valid
-[wp] [Qed] Goal typed_ref_calls_on_array_dim_2_to_1_assigns_normal : Valid
-[wp] [Qed] Goal typed_ref_calls_on_array_dim_2_to_1_call_load_5_requires : Valid
-[wp] [Qed] Goal typed_ref_calls_on_array_dim_2_to_1_call_reset_5_requires : Valid
-[wp] [Qed] Goal typed_ref_calls_on_array_dim_2_to_1_call_add_5_requires : Valid
-[wp] [Alt-Ergo] Goal typed_ref_calls_on_array_dim_2_ensures_Pload : Valid
-[wp] [Alt-Ergo] Goal typed_ref_calls_on_array_dim_2_ensures_Preset : Valid
-[wp] [Alt-Ergo] Goal typed_ref_calls_on_array_dim_2_ensures_Padd : Valid
-[wp] [Qed] Goal typed_ref_calls_on_array_dim_2_assigns_exit : Valid
-[wp] [Qed] Goal typed_ref_calls_on_array_dim_2_assigns_normal : Valid
-[wp] [Qed] Goal typed_ref_calls_on_array_dim_2_call_load_1_5_requires : Valid
-[wp] [Qed] Goal typed_ref_calls_on_array_dim_2_call_reset_1_5_requires : Valid
-[wp] [Qed] Goal typed_ref_calls_on_array_dim_2_call_add_1_5_requires : Valid
+[wp] [Valid] typed_ref_reset_1_5_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_reset_1_5_assigns_exit (Qed)
+[wp] [Valid] typed_ref_reset_1_5_assigns_normal (Qed)
+[wp] [Valid] typed_ref_reset_1_5_call_reset_5_requires (Qed)
+[wp] [Valid] typed_ref_load_1_5_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_load_1_5_assigns_exit (Qed)
+[wp] [Valid] typed_ref_load_1_5_assigns_normal (Qed)
+[wp] [Valid] typed_ref_load_1_5_call_load_5_requires (Qed)
+[wp] [Valid] typed_ref_add_1_5_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_add_1_5_assigns_exit (Qed)
+[wp] [Valid] typed_ref_add_1_5_assigns_normal (Qed)
+[wp] [Valid] typed_ref_add_1_5_call_add_5_requires (Qed)
+[wp] [Valid] typed_ref_calls_on_array_dim_1_ensures_Pload (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_calls_on_array_dim_1_ensures_Preset (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_calls_on_array_dim_1_ensures_Padd (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_calls_on_array_dim_1_assigns_exit (Qed)
+[wp] [Valid] typed_ref_calls_on_array_dim_1_assigns_normal (Qed)
+[wp] [Valid] typed_ref_calls_on_array_dim_1_call_load_5_requires (Qed)
+[wp] [Valid] typed_ref_calls_on_array_dim_1_call_reset_5_requires (Qed)
+[wp] [Valid] typed_ref_calls_on_array_dim_1_call_add_5_requires (Qed)
+[wp] [Valid] typed_ref_calls_on_array_dim_2_to_1_ensures_Pload (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_calls_on_array_dim_2_to_1_ensures_Preset (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_calls_on_array_dim_2_to_1_ensures_Padd (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_calls_on_array_dim_2_to_1_assigns_exit (Qed)
+[wp] [Valid] typed_ref_calls_on_array_dim_2_to_1_assigns_normal (Qed)
+[wp] [Valid] typed_ref_calls_on_array_dim_2_to_1_call_load_5_requires (Qed)
+[wp] [Valid] typed_ref_calls_on_array_dim_2_to_1_call_reset_5_requires (Qed)
+[wp] [Valid] typed_ref_calls_on_array_dim_2_to_1_call_add_5_requires (Qed)
+[wp] [Valid] typed_ref_calls_on_array_dim_2_ensures_Pload (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_calls_on_array_dim_2_ensures_Preset (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_calls_on_array_dim_2_ensures_Padd (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_calls_on_array_dim_2_assigns_exit (Qed)
+[wp] [Valid] typed_ref_calls_on_array_dim_2_assigns_normal (Qed)
+[wp] [Valid] typed_ref_calls_on_array_dim_2_call_load_1_5_requires (Qed)
+[wp] [Valid] typed_ref_calls_on_array_dim_2_call_reset_1_5_requires (Qed)
+[wp] [Valid] typed_ref_calls_on_array_dim_2_call_add_1_5_requires (Qed)
[wp] Proved goals: 36 / 36
Qed: 24
Alt-Ergo: 12
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array_simple.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array_simple.res.oracle
index f43d10f2e8e..2e5e07cddbd 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array_simple.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array_simple.res.oracle
@@ -3,9 +3,9 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 3 goals scheduled
-[wp] [Qed] Goal typed_ref_call_f1_ensures : Valid
-[wp] [Qed] Goal typed_ref_call_f2_ensures : Valid
-[wp] [Qed] Goal typed_ref_call_f3_ensures : Valid
+[wp] [Valid] typed_ref_call_f1_ensures (Qed)
+[wp] [Valid] typed_ref_call_f2_ensures (Qed)
+[wp] [Valid] typed_ref_call_f3_ensures (Qed)
[wp] Proved goals: 3 / 3
Qed: 3
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/refguards.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle_qualif/refguards.res.oracle
index 540ceffba97..8fbb137b05f 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle_qualif/refguards.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/refguards.res.oracle
@@ -3,15 +3,15 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 9 goals scheduled
-[wp] [Qed] Goal typed_ref_f_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_ref_g_ensures : Valid
-[wp] [Qed] Goal typed_ref_h_ensures : Valid
-[wp] [Qed] Goal typed_ref_s_ensures : Valid
-[wp] [Qed] Goal typed_ref_s_ensures_2 : Valid
-[wp] [Qed] Goal typed_ref_s_ensures_3 : Valid
-[wp] [Qed] Goal typed_ref_s_ensures_4 : Valid
-[wp] [Qed] Goal typed_ref_s_ensures_5 : Valid
-[wp] [Alt-Ergo] Goal typed_ref_s_ensures_KO : Unsuccess
+[wp] [Valid] typed_ref_f_ensures (Qed)
+[wp] [Valid] typed_ref_g_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_h_ensures (Qed)
+[wp] [Valid] typed_ref_s_ensures (Qed)
+[wp] [Valid] typed_ref_s_ensures_2 (Qed)
+[wp] [Valid] typed_ref_s_ensures_3 (Qed)
+[wp] [Valid] typed_ref_s_ensures_4 (Qed)
+[wp] [Valid] typed_ref_s_ensures_5 (Qed)
+[wp] [Timeout] typed_ref_s_ensures_KO (Alt-Ergo) (Cached)
[wp] Proved goals: 8 / 9
Qed: 7
Alt-Ergo: 1 (unsuccess: 1)
diff --git a/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.0.res.oracle b/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.0.res.oracle
index 9cf58bd601e..e8490d064c7 100644
--- a/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.0.res.oracle
+++ b/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.0.res.oracle
@@ -5,8 +5,8 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 2 goals scheduled
-[wp] [Alt-Ergo] Goal typed_swap_ensures_A : Valid
-[wp] [Qed] Goal typed_swap_ensures_B : Valid
+[wp] [Valid] typed_swap_ensures_A (Alt-Ergo) (Cached)
+[wp] [Valid] typed_swap_ensures_B (Qed)
[wp] Proved goals: 2 / 2
Qed: 1
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.1.res.oracle b/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.1.res.oracle
index b34ba7805c8..a1fe6ffe860 100644
--- a/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.1.res.oracle
+++ b/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.1.res.oracle
@@ -5,14 +5,14 @@
[wp] Running WP plugin...
[rte:annot] annotating function swap
[wp] 8 goals scheduled
-[wp] [Alt-Ergo] Goal typed_swap_ensures_A : Valid
-[wp] [Qed] Goal typed_swap_ensures_B : Valid
-[wp] [Alt-Ergo] Goal typed_swap_assert_rte_mem_access : Valid
-[wp] [Qed] Goal typed_swap_assert_rte_mem_access_2 : Valid
-[wp] [Alt-Ergo] Goal typed_swap_assert_rte_mem_access_3 : Valid
-[wp] [Qed] Goal typed_swap_assert_rte_mem_access_4 : Valid
-[wp] [Qed] Goal typed_swap_assigns_part1 : Valid
-[wp] [Qed] Goal typed_swap_assigns_part2 : Valid
+[wp] [Valid] typed_swap_ensures_A (Alt-Ergo) (Cached)
+[wp] [Valid] typed_swap_ensures_B (Qed)
+[wp] [Valid] typed_swap_assert_rte_mem_access (Alt-Ergo) (Cached)
+[wp] [Valid] typed_swap_assert_rte_mem_access_2 (Qed)
+[wp] [Valid] typed_swap_assert_rte_mem_access_3 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_swap_assert_rte_mem_access_4 (Qed)
+[wp] [Valid] typed_swap_assigns_part1 (Qed)
+[wp] [Valid] typed_swap_assigns_part2 (Qed)
[wp] Proved goals: 8 / 8
Qed: 5
Alt-Ergo: 3
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/abs.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/abs.res.oracle
index de73a52c63e..7ffed037160 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/abs.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/abs.res.oracle
@@ -3,7 +3,7 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_abs_abs_ensures : Valid
+[wp] [Valid] typed_abs_abs_ensures (Alt-Ergo) (Cached)
[wp] Proved goals: 1 / 1
Qed: 0
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/asm.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/asm.res.oracle
index b84a2951408..971f365799a 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/asm.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/asm.res.oracle
@@ -3,8 +3,8 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 2 goals scheduled
-[wp] [Qed] Goal typed_main_assert_OK : Valid
-[wp] [Alt-Ergo] Goal typed_main_assert_KO : Unsuccess
+[wp] [Valid] typed_main_assert_OK (Qed)
+[wp] [Timeout] typed_main_assert_KO (Alt-Ergo) (Cached)
[wp] Proved goals: 1 / 2
Qed: 1
Alt-Ergo: 0 (unsuccess: 1)
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/bit_test.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/bit_test.res.oracle
index c99721def5a..4184d308245 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/bit_test.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/bit_test.res.oracle
@@ -3,9 +3,9 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 3 goals scheduled
-[wp] [Alt-Ergo] Goal typed_bit_test_check1_ensures_ko : Unsuccess
-[wp] [Alt-Ergo] Goal typed_bit_test_check2_ensures_ko : Unsuccess
-[wp] [Alt-Ergo] Goal typed_bit_test_check3_ensures_ko : Unsuccess
+[wp] [Timeout] typed_bit_test_check1_ensures_ko (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_bit_test_check2_ensures_ko (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_bit_test_check3_ensures_ko (Alt-Ergo) (Cached)
[wp] Proved goals: 0 / 3
Alt-Ergo: 0 (unsuccess: 3)
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/bitmask0x8000.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/bitmask0x8000.res.oracle
index 4a9dcca46b0..6840a885209 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/bitmask0x8000.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/bitmask0x8000.res.oracle
@@ -2,8 +2,8 @@
[kernel] Parsing bitmask0x8000.i (no preprocessing)
[wp] Running WP plugin...
[wp] 2 goals scheduled
-[wp] [Script] Goal typed_lemma_res_n : Valid
-[wp] [Script] Goal typed_lemma_res_y : Valid
+[wp] [Valid] typed_lemma_res_n (Script)
+[wp] [Valid] typed_lemma_res_y (Script)
[wp] Proved goals: 2 / 2
Qed: 0
Script: 2
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/bool.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/bool.res.oracle
index d72ac023e65..ee2f399dfb9 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/bool.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/bool.res.oracle
@@ -3,13 +3,13 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 7 goals scheduled
-[wp] [Alt-Ergo] Goal typed_job_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_bor_bool_true_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_bor_bool_false_ensures : Valid
-[wp] [Qed] Goal typed_band_bool_true_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_band_bool_false_ensures : Valid
-[wp] [Qed] Goal typed_bxor_bool_true_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_bxor_bool_false_ensures : Valid
+[wp] [Valid] typed_job_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_bor_bool_true_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_bor_bool_false_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_band_bool_true_ensures (Qed)
+[wp] [Valid] typed_band_bool_false_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_bxor_bool_true_ensures (Qed)
+[wp] [Valid] typed_bxor_bool_false_ensures (Alt-Ergo) (Cached)
[wp] Proved goals: 7 / 7
Qed: 2
Alt-Ergo: 5
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/cfg.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/cfg.res.oracle
index 0679a3298d6..551fc327fb3 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/cfg.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/cfg.res.oracle
@@ -3,11 +3,11 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 5 goals scheduled
-[wp] [Alt-Ergo] Goal typed_f1_ensures_BUG_LEGACY_WP : Unsuccess
-[wp] [Alt-Ergo] Goal typed_f1_simpler_ensures_BUG_LEGACY_WP : Unsuccess
-[wp] [Alt-Ergo] Goal typed_f1_variant_ensures_BUG_LEGACY_WP : Unsuccess
-[wp] [Alt-Ergo] Goal typed_f1_variant_invert_ensures_FAILS_AS_EXPECTED : Unsuccess
-[wp] [Alt-Ergo] Goal typed_f2_ensures_BUG_LEGACY_WP : Unsuccess
+[wp] [Unknown] typed_f1_ensures_BUG_LEGACY_WP (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_f1_simpler_ensures_BUG_LEGACY_WP (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_f1_variant_ensures_BUG_LEGACY_WP (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_f1_variant_invert_ensures_FAILS_AS_EXPECTED (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_f2_ensures_BUG_LEGACY_WP (Alt-Ergo) (Cached)
[wp] Proved goals: 0 / 5
Alt-Ergo: 0 (unsuccess: 5)
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/combined.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/combined.res.oracle
index 4cb64dc0e51..1c1789c3f82 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/combined.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/combined.res.oracle
@@ -3,20 +3,20 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 14 goals scheduled
-[wp] [Alt-Ergo] Goal typed_job_assert : Unsuccess
-[wp] [Qed] Goal typed_job_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_job_loop_invariant_established : Valid
-[wp] [Alt-Ergo] Goal typed_job_loop_invariant_2_preserved : Valid
-[wp] [Qed] Goal typed_job_loop_invariant_2_established : Valid
-[wp] [Alt-Ergo] Goal typed_job_loop_invariant_3_preserved : Valid
-[wp] [Qed] Goal typed_job_loop_invariant_3_established : Valid
-[wp] [Alt-Ergo] Goal typed_job_assert_2 : Valid
-[wp] [Qed] Goal typed_job_loop_assigns_part1 : Valid
-[wp] [Qed] Goal typed_job_loop_assigns_part2 : Valid
-[wp] [Qed] Goal typed_job_loop_assigns_part3 : Valid
-[wp] [Qed] Goal typed_job_loop_assigns_2_part1 : Valid
-[wp] [Qed] Goal typed_job_loop_assigns_2_part2 : Valid
-[wp] [Alt-Ergo] Goal typed_job_loop_assigns_2_part3 : Valid
+[wp] [Timeout] typed_job_assert (Alt-Ergo) (Cached)
+[wp] [Valid] typed_job_loop_invariant_preserved (Qed)
+[wp] [Valid] typed_job_loop_invariant_established (Qed)
+[wp] [Valid] typed_job_loop_invariant_2_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_job_loop_invariant_2_established (Qed)
+[wp] [Valid] typed_job_loop_invariant_3_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_job_loop_invariant_3_established (Qed)
+[wp] [Valid] typed_job_assert_2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_job_loop_assigns_part1 (Qed)
+[wp] [Valid] typed_job_loop_assigns_part2 (Qed)
+[wp] [Valid] typed_job_loop_assigns_part3 (Qed)
+[wp] [Valid] typed_job_loop_assigns_2_part1 (Qed)
+[wp] [Valid] typed_job_loop_assigns_2_part2 (Qed)
+[wp] [Valid] typed_job_loop_assigns_2_part3 (Alt-Ergo) (Cached)
[wp] Proved goals: 13 / 14
Qed: 9
Alt-Ergo: 4 (unsuccess: 1)
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/convert.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/convert.res.oracle
index e0b8fc01010..c50c521a8a6 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/convert.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/convert.res.oracle
@@ -2,8 +2,8 @@
[kernel] Parsing convert.i (no preprocessing)
[wp] Running WP plugin...
[wp] 2 goals scheduled
-[wp] [Alt-Ergo] Goal typed_lemma_ceil : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_floor : Valid
+[wp] [Valid] typed_lemma_ceil (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_floor (Alt-Ergo) (Cached)
[wp] Proved goals: 2 / 2
Qed: 0
Alt-Ergo: 2
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/copy.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/copy.res.oracle
index 6b924bddcb4..8384ee19e44 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/copy.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/copy.res.oracle
@@ -3,17 +3,17 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 11 goals scheduled
-[wp] [Alt-Ergo] Goal typed_copy_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_copy_loop_invariant_Copy_preserved : Valid
-[wp] [Qed] Goal typed_copy_loop_invariant_Copy_established : Valid
-[wp] [Qed] Goal typed_copy_loop_invariant_Range_preserved : Valid
-[wp] [Qed] Goal typed_copy_loop_invariant_Range_established : Valid
-[wp] [Alt-Ergo] Goal typed_copy_assert_A : Valid
-[wp] [Alt-Ergo] Goal typed_copy_assert_B : Valid
-[wp] [Qed] Goal typed_copy_loop_assigns_part1 : Valid
-[wp] [Qed] Goal typed_copy_loop_assigns_part2 : Valid
-[wp] [Alt-Ergo] Goal typed_copy_loop_assigns_part3 : Valid
-[wp] [Qed] Goal typed_copy_assigns : Valid
+[wp] [Valid] typed_copy_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_copy_loop_invariant_Copy_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_copy_loop_invariant_Copy_established (Qed)
+[wp] [Valid] typed_copy_loop_invariant_Range_preserved (Qed)
+[wp] [Valid] typed_copy_loop_invariant_Range_established (Qed)
+[wp] [Valid] typed_copy_assert_A (Alt-Ergo) (Cached)
+[wp] [Valid] typed_copy_assert_B (Alt-Ergo) (Cached)
+[wp] [Valid] typed_copy_loop_assigns_part1 (Qed)
+[wp] [Valid] typed_copy_loop_assigns_part2 (Qed)
+[wp] [Valid] typed_copy_loop_assigns_part3 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_copy_assigns (Qed)
[wp] Proved goals: 11 / 11
Qed: 6
Alt-Ergo: 5
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed.res.oracle
index 668ba7d83d9..33b379e24f6 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed.res.oracle
@@ -3,17 +3,15 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 7 goals scheduled
-[wp] [Passed] Smoke-test typed_foo_wp_smoke_default_requires
-[wp] [Failed] Smoke-test typed_foo_wp_smoke_A_requires
- Qed: Valid
+[wp] [Failed (Doomed)] typed_foo_wp_smoke_default_requires (Alt-Ergo) (Cached)
+[wp] [Passed (Invalid)] typed_foo_wp_smoke_A_requires (Qed)
[wp] doomed.i:27: Warning: Failed smoke-test
-[wp] [Passed] Smoke-test typed_foo_wp_smoke_B_requires
-[wp] [Passed] Smoke-test typed_bar_wp_smoke_default_requires
-[wp] [Qed] Goal typed_bar_ensures : Valid
-[wp] [Failed] Smoke-test typed_buzz_wp_smoke_default_requires
- Qed: Valid
+[wp] [Failed (Doomed)] typed_foo_wp_smoke_B_requires (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_bar_wp_smoke_default_requires (Alt-Ergo) (Cached)
+[wp] [Valid] typed_bar_ensures (Qed)
+[wp] [Passed (Invalid)] typed_buzz_wp_smoke_default_requires (Qed)
[wp] doomed.i:41: Warning: Failed smoke-test
-[wp] [Qed] Goal typed_buzz_ensures : Valid
+[wp] [Valid] typed_buzz_ensures (Qed)
[wp] Proved goals: 5 / 7
Qed: 2 (failed: 2)
Alt-Ergo: 3
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_axioms.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_axioms.res.oracle
index c455b41304a..114b97fe7db 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_axioms.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_axioms.res.oracle
@@ -3,22 +3,19 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 10 goals scheduled
-[wp] [Failed] Smoke-test typed_foo_wp_smoke_dead_loop_s2
- Alt-Ergo: Valid
+[wp] [Passed (Invalid)] typed_foo_wp_smoke_dead_loop_s2 (Alt-Ergo) (Cached)
[wp] doomed_axioms.i:29: Warning: Failed smoke-test
-[wp] [Failed] Smoke-test typed_foo_wp_smoke_dead_code_s7
- Alt-Ergo: Valid
+[wp] [Passed (Invalid)] typed_foo_wp_smoke_dead_code_s7 (Alt-Ergo) (Cached)
[wp] doomed_axioms.i:30: Warning: Failed smoke-test
-[wp] [Failed] Smoke-test typed_foo_wp_smoke_dead_code_s9
- Alt-Ergo: Valid
+[wp] [Passed (Invalid)] typed_foo_wp_smoke_dead_code_s9 (Alt-Ergo) (Cached)
[wp] doomed_axioms.i:32: Warning: Failed smoke-test
-[wp] [Alt-Ergo] Goal typed_foo_loop_invariant_A_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_foo_loop_invariant_A_established : Valid
-[wp] [Alt-Ergo] Goal typed_foo_loop_invariant_B_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_foo_loop_invariant_B_established : Valid
-[wp] [Alt-Ergo] Goal typed_foo_loop_invariant_C_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_foo_loop_invariant_C_established : Valid
-[wp] [Qed] Goal typed_foo_loop_assigns : Valid
+[wp] [Valid] typed_foo_loop_invariant_A_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_foo_loop_invariant_A_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_foo_loop_invariant_B_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_foo_loop_invariant_B_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_foo_loop_invariant_C_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_foo_loop_invariant_C_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_foo_loop_assigns (Qed)
[wp] Proved goals: 7 / 10
Qed: 1
Alt-Ergo: 6 (failed: 3)
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_call.0.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_call.0.res.oracle
index 771195e0c0a..0cc53d15d1a 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_call.0.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_call.0.res.oracle
@@ -3,16 +3,16 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 10 goals scheduled
-[wp] [Qed] Goal typed_f1_ok_ensures : Valid
-[wp] [Qed] Goal typed_f1_ok_exits : Valid
-[wp] [Qed] Goal typed_f2_ok_ensures : Valid
-[wp] [Qed] Goal typed_f2_ok_exits : Valid
-[wp] [Qed] Goal typed_f3_ko_ensures : Valid
-[wp] [Qed] Goal typed_f3_ok_ensures : Valid
-[wp] [Qed] Goal typed_f4_ok_ensures : Valid
-[wp] [Qed] Goal typed_f4_ko_ensures : Valid
-[wp] [Qed] Goal typed_f5_ok_ensures : Valid
-[wp] [Qed] Goal typed_f5_ko_ensures : Valid
+[wp] [Valid] typed_f1_ok_ensures (Qed)
+[wp] [Valid] typed_f1_ok_exits (Qed)
+[wp] [Valid] typed_f2_ok_ensures (Qed)
+[wp] [Valid] typed_f2_ok_exits (Qed)
+[wp] [Valid] typed_f3_ko_ensures (Qed)
+[wp] [Valid] typed_f3_ok_ensures (Qed)
+[wp] [Valid] typed_f4_ok_ensures (Qed)
+[wp] [Valid] typed_f4_ko_ensures (Qed)
+[wp] [Valid] typed_f5_ok_ensures (Qed)
+[wp] [Valid] typed_f5_ko_ensures (Qed)
[wp] Proved goals: 10 / 10
Qed: 10
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_call.1.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_call.1.res.oracle
index cddd70df9fb..8876b4535d6 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_call.1.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_call.1.res.oracle
@@ -3,49 +3,44 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 33 goals scheduled
-[wp] [Passed] Smoke-test typed_call_exit_ok_wp_smoke_dead_call_s2
-[wp] [Passed] Smoke-test typed_f1_ok_wp_smoke_dead_code_s2
-[wp] [Passed] Smoke-test typed_f1_ok_wp_smoke_dead_code_s4
-[wp] [Qed] Goal typed_f1_ok_ensures : Valid
-[wp] [Qed] Goal typed_f1_ok_exits : Valid
-[wp] [Passed] Smoke-test typed_call_post_ok_wp_smoke_dead_call_s9
-[wp] [Passed] Smoke-test typed_call_exit_ok_wp_smoke_dead_call_s10
-[wp] [Passed] Smoke-test typed_f2_ok_wp_smoke_dead_code_s9
-[wp] [Passed] Smoke-test typed_f2_ok_wp_smoke_dead_code_s10
-[wp] [Passed] Smoke-test typed_f2_ok_wp_smoke_dead_code_s11
-[wp] [Qed] Goal typed_f2_ok_ensures : Valid
-[wp] [Qed] Goal typed_f2_ok_exits : Valid
-[wp] [Failed] Smoke-test typed_call_ko_wp_smoke_dead_call_s14
- Qed: Valid
+[wp] [Failed (Doomed)] typed_call_exit_ok_wp_smoke_dead_call_s2 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_f1_ok_wp_smoke_dead_code_s2 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_f1_ok_wp_smoke_dead_code_s4 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f1_ok_ensures (Qed)
+[wp] [Valid] typed_f1_ok_exits (Qed)
+[wp] [Failed (Doomed)] typed_call_post_ok_wp_smoke_dead_call_s9 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_call_exit_ok_wp_smoke_dead_call_s10 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_f2_ok_wp_smoke_dead_code_s9 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_f2_ok_wp_smoke_dead_code_s10 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_f2_ok_wp_smoke_dead_code_s11 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f2_ok_ensures (Qed)
+[wp] [Valid] typed_f2_ok_exits (Qed)
+[wp] [Passed (Invalid)] typed_call_ko_wp_smoke_dead_call_s14 (Qed)
[wp] doomed_call.i:68: Warning: Failed smoke-test
-[wp] [Failed] Smoke-test typed_f3_ko_wp_smoke_dead_code_s15
- Qed: Valid
+[wp] [Passed (Invalid)] typed_f3_ko_wp_smoke_dead_code_s15 (Qed)
[wp] doomed_call.i:69: Warning: Failed smoke-test
-[wp] [Qed] Goal typed_f3_ko_ensures : Valid
-[wp] [Passed] Smoke-test typed_call_exit_ok_wp_smoke_dead_call_s18
-[wp] [Qed] Goal typed_f3_ok_ensures : Valid
-[wp] [Passed] Smoke-test typed_call_ko_global_wp_smoke_dead_call_s22
-[wp] [Qed] Goal typed_f4_ok_ensures : Valid
-[wp] [Failed] Smoke-test typed_call_ko_global_wp_smoke_dead_call_s26
- Qed: Valid
+[wp] [Valid] typed_f3_ko_ensures (Qed)
+[wp] [Failed (Doomed)] typed_call_exit_ok_wp_smoke_dead_call_s18 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f3_ok_ensures (Qed)
+[wp] [Failed (Doomed)] typed_call_ko_global_wp_smoke_dead_call_s22 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f4_ok_ensures (Qed)
+[wp] [Passed (Invalid)] typed_call_ko_global_wp_smoke_dead_call_s26 (Qed)
[wp] doomed_call.i:89: Warning: Failed smoke-test
-[wp] [Qed] Goal typed_f4_ko_ensures : Valid
-[wp] [Passed] Smoke-test typed_call_effect_wp_smoke_dead_call_s29
-[wp] [Passed] Smoke-test typed_call_effect_wp_smoke_dead_call_s30
-[wp] [Passed] Smoke-test typed_call_effect_wp_smoke_dead_call_s31
-[wp] [Passed] Smoke-test typed_f5_ok_wp_smoke_dead_code_s30
-[wp] [Passed] Smoke-test typed_f5_ok_wp_smoke_dead_code_s31
-[wp] [Qed] Goal typed_f5_ok_ensures : Valid
-[wp] [Passed] Smoke-test typed_call_wrong_wp_smoke_dead_call_s35
-[wp] [Passed] Smoke-test typed_call_effect_wp_smoke_dead_call_s34
-[wp] [Failed] Smoke-test typed_call_effect_wp_smoke_dead_call_s36
- Qed: Valid
+[wp] [Valid] typed_f4_ko_ensures (Qed)
+[wp] [Failed (Doomed)] typed_call_effect_wp_smoke_dead_call_s29 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_call_effect_wp_smoke_dead_call_s30 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_call_effect_wp_smoke_dead_call_s31 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_f5_ok_wp_smoke_dead_code_s30 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_f5_ok_wp_smoke_dead_code_s31 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f5_ok_ensures (Qed)
+[wp] [Failed (Doomed)] typed_call_wrong_wp_smoke_dead_call_s35 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_call_effect_wp_smoke_dead_call_s34 (Alt-Ergo) (Cached)
+[wp] [Passed (Invalid)] typed_call_effect_wp_smoke_dead_call_s36 (Qed)
[wp] doomed_call.i:121: Warning: Failed smoke-test
-[wp] [Passed] Smoke-test typed_f5_ko_wp_smoke_dead_code_s35
-[wp] [Failed] Smoke-test typed_f5_ko_wp_smoke_dead_code_s36
- Qed: Valid
+[wp] [Failed (Doomed)] typed_f5_ko_wp_smoke_dead_code_s35 (Alt-Ergo) (Cached)
+[wp] [Passed (Invalid)] typed_f5_ko_wp_smoke_dead_code_s36 (Qed)
[wp] doomed_call.i:121: Warning: Failed smoke-test
-[wp] [Qed] Goal typed_f5_ko_ensures : Valid
+[wp] [Valid] typed_f5_ko_ensures (Qed)
[wp] Proved goals: 28 / 33
Qed: 10 (failed: 5)
Alt-Ergo: 18
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_call.2.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_call.2.res.oracle
index 23c3c026e3f..4b8fcaef2ef 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_call.2.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_call.2.res.oracle
@@ -3,52 +3,47 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 36 goals scheduled
-[wp] [Passed] Smoke-test typed_call_exit_ok_wp_smoke_dead_call_s2
-[wp] [Passed] Smoke-test typed_f1_ok_wp_smoke_dead_code_s2
-[wp] [Passed] Smoke-test typed_f1_ok_wp_smoke_dead_code_s4
-[wp] [Qed] Goal typed_f1_ok_ensures_part1 : Valid
-[wp] [Qed] Goal typed_f1_ok_ensures_part2 : Valid
-[wp] [Qed] Goal typed_f1_ok_exits : Valid
-[wp] [Passed] Smoke-test typed_call_post_ok_wp_smoke_dead_call_s9
-[wp] [Passed] Smoke-test typed_call_exit_ok_wp_smoke_dead_call_s10
-[wp] [Passed] Smoke-test typed_f2_ok_wp_smoke_dead_code_s9
-[wp] [Passed] Smoke-test typed_f2_ok_wp_smoke_dead_code_s10
-[wp] [Passed] Smoke-test typed_f2_ok_wp_smoke_dead_code_s11
-[wp] [Qed] Goal typed_f2_ok_ensures_part1 : Valid
-[wp] [Qed] Goal typed_f2_ok_ensures_part2 : Valid
-[wp] [Qed] Goal typed_f2_ok_exits_part1 : Valid
-[wp] [Qed] Goal typed_f2_ok_exits_part2 : Valid
-[wp] [Failed] Smoke-test typed_call_ko_wp_smoke_dead_call_s14
- Qed: Valid
+[wp] [Failed (Doomed)] typed_call_exit_ok_wp_smoke_dead_call_s2 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_f1_ok_wp_smoke_dead_code_s2 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_f1_ok_wp_smoke_dead_code_s4 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f1_ok_ensures_part1 (Qed)
+[wp] [Valid] typed_f1_ok_ensures_part2 (Qed)
+[wp] [Valid] typed_f1_ok_exits (Qed)
+[wp] [Failed (Doomed)] typed_call_post_ok_wp_smoke_dead_call_s9 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_call_exit_ok_wp_smoke_dead_call_s10 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_f2_ok_wp_smoke_dead_code_s9 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_f2_ok_wp_smoke_dead_code_s10 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_f2_ok_wp_smoke_dead_code_s11 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f2_ok_ensures_part1 (Qed)
+[wp] [Valid] typed_f2_ok_ensures_part2 (Qed)
+[wp] [Valid] typed_f2_ok_exits_part1 (Qed)
+[wp] [Valid] typed_f2_ok_exits_part2 (Qed)
+[wp] [Passed (Invalid)] typed_call_ko_wp_smoke_dead_call_s14 (Qed)
[wp] doomed_call.i:68: Warning: Failed smoke-test
-[wp] [Failed] Smoke-test typed_f3_ko_wp_smoke_dead_code_s15
- Qed: Valid
+[wp] [Passed (Invalid)] typed_f3_ko_wp_smoke_dead_code_s15 (Qed)
[wp] doomed_call.i:69: Warning: Failed smoke-test
-[wp] [Qed] Goal typed_f3_ko_ensures : Valid
-[wp] [Passed] Smoke-test typed_call_exit_ok_wp_smoke_dead_call_s18
-[wp] [Qed] Goal typed_f3_ok_ensures : Valid
-[wp] [Passed] Smoke-test typed_call_ko_global_wp_smoke_dead_call_s22
-[wp] [Qed] Goal typed_f4_ok_ensures : Valid
-[wp] [Failed] Smoke-test typed_call_ko_global_wp_smoke_dead_call_s26
- Qed: Valid
+[wp] [Valid] typed_f3_ko_ensures (Qed)
+[wp] [Failed (Doomed)] typed_call_exit_ok_wp_smoke_dead_call_s18 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f3_ok_ensures (Qed)
+[wp] [Failed (Doomed)] typed_call_ko_global_wp_smoke_dead_call_s22 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f4_ok_ensures (Qed)
+[wp] [Passed (Invalid)] typed_call_ko_global_wp_smoke_dead_call_s26 (Qed)
[wp] doomed_call.i:89: Warning: Failed smoke-test
-[wp] [Qed] Goal typed_f4_ko_ensures : Valid
-[wp] [Passed] Smoke-test typed_call_effect_wp_smoke_dead_call_s29
-[wp] [Passed] Smoke-test typed_call_effect_wp_smoke_dead_call_s30
-[wp] [Passed] Smoke-test typed_call_effect_wp_smoke_dead_call_s31
-[wp] [Passed] Smoke-test typed_f5_ok_wp_smoke_dead_code_s30
-[wp] [Passed] Smoke-test typed_f5_ok_wp_smoke_dead_code_s31
-[wp] [Qed] Goal typed_f5_ok_ensures : Valid
-[wp] [Passed] Smoke-test typed_call_wrong_wp_smoke_dead_call_s35
-[wp] [Passed] Smoke-test typed_call_effect_wp_smoke_dead_call_s34
-[wp] [Failed] Smoke-test typed_call_effect_wp_smoke_dead_call_s36
- Qed: Valid
+[wp] [Valid] typed_f4_ko_ensures (Qed)
+[wp] [Failed (Doomed)] typed_call_effect_wp_smoke_dead_call_s29 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_call_effect_wp_smoke_dead_call_s30 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_call_effect_wp_smoke_dead_call_s31 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_f5_ok_wp_smoke_dead_code_s30 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_f5_ok_wp_smoke_dead_code_s31 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f5_ok_ensures (Qed)
+[wp] [Failed (Doomed)] typed_call_wrong_wp_smoke_dead_call_s35 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_call_effect_wp_smoke_dead_call_s34 (Alt-Ergo) (Cached)
+[wp] [Passed (Invalid)] typed_call_effect_wp_smoke_dead_call_s36 (Qed)
[wp] doomed_call.i:121: Warning: Failed smoke-test
-[wp] [Passed] Smoke-test typed_f5_ko_wp_smoke_dead_code_s35
-[wp] [Failed] Smoke-test typed_f5_ko_wp_smoke_dead_code_s36
- Qed: Valid
+[wp] [Failed (Doomed)] typed_f5_ko_wp_smoke_dead_code_s35 (Alt-Ergo) (Cached)
+[wp] [Passed (Invalid)] typed_f5_ko_wp_smoke_dead_code_s36 (Qed)
[wp] doomed_call.i:121: Warning: Failed smoke-test
-[wp] [Qed] Goal typed_f5_ko_ensures : Valid
+[wp] [Valid] typed_f5_ko_ensures (Qed)
[wp] Proved goals: 31 / 36
Qed: 13 (failed: 5)
Alt-Ergo: 18
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_dead.0.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_dead.0.res.oracle
index c9ffe8235b5..4f879169d52 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_dead.0.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_dead.0.res.oracle
@@ -3,56 +3,54 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 46 goals scheduled
-[wp] [Passed] Smoke-test typed_f1_ok_wp_smoke_dead_code_s3
-[wp] [Passed] Smoke-test typed_f1_ok_wp_smoke_dead_code_s7
-[wp] [Passed] Smoke-test typed_f1_ok_wp_smoke_dead_code_s10
-[wp] [Qed] Goal typed_f1_ok_assigns_part1 : Valid
-[wp] [Qed] Goal typed_f1_ok_assigns_part2 : Valid
-[wp] [Passed] Smoke-test typed_exit_wp_smoke_dead_call_s14
-[wp] [Passed] Smoke-test typed_f2_ok_wp_smoke_dead_code_s14
-[wp] [Passed] Smoke-test typed_f2_ok_wp_smoke_dead_code_s16
-[wp] [Qed] Goal typed_f2_ok_assigns_exit : Valid
-[wp] [Qed] Goal typed_f2_ok_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_f2_ok_assigns_normal_part2 : Valid
-[wp] [Passed] Smoke-test typed_exit_wp_smoke_dead_call_s22
-[wp] [Passed] Smoke-test typed_f2_ko_wp_smoke_dead_code_s22
-[wp] [Failed] Smoke-test typed_f2_ko_wp_smoke_dead_code_s23
- Qed: Valid
+[wp] [Failed (Doomed)] typed_f1_ok_wp_smoke_dead_code_s3 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_f1_ok_wp_smoke_dead_code_s7 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_f1_ok_wp_smoke_dead_code_s10 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f1_ok_assigns_part1 (Qed)
+[wp] [Valid] typed_f1_ok_assigns_part2 (Qed)
+[wp] [Failed (Doomed)] typed_exit_wp_smoke_dead_call_s14 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_f2_ok_wp_smoke_dead_code_s14 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_f2_ok_wp_smoke_dead_code_s16 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f2_ok_assigns_exit (Qed)
+[wp] [Valid] typed_f2_ok_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_f2_ok_assigns_normal_part2 (Qed)
+[wp] [Failed (Doomed)] typed_exit_wp_smoke_dead_call_s22 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_f2_ko_wp_smoke_dead_code_s22 (Alt-Ergo) (Cached)
+[wp] [Passed (Invalid)] typed_f2_ko_wp_smoke_dead_code_s23 (Qed)
[wp] doomed_dead.i:44: Warning: Failed smoke-test
-[wp] [Passed] Smoke-test typed_f2_ko_wp_smoke_dead_code_s26
-[wp] [Qed] Goal typed_f2_ko_assigns_exit : Valid
-[wp] [Qed] Goal typed_f2_ko_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_f2_ko_assigns_normal_part2 : Valid
-[wp] [Passed] Smoke-test typed_call_wp_smoke_dead_call_s30
-[wp] [Passed] Smoke-test typed_f3_ok_wp_smoke_dead_code_s30
-[wp] [Passed] Smoke-test typed_f3_ok_wp_smoke_dead_code_s31
-[wp] [Passed] Smoke-test typed_f3_ok_wp_smoke_dead_code_s34
-[wp] [Qed] Goal typed_f3_ok_assigns_exit : Valid
-[wp] [Qed] Goal typed_f3_ok_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_f3_ok_assigns_normal_part2 : Valid
-[wp] [Passed] Smoke-test typed_exit_wp_smoke_dead_call_s38
-[wp] [Passed] Smoke-test typed_f4_ok_wp_smoke_dead_code_s41
-[wp] [Qed] Goal typed_f4_ok_assert : Valid
-[wp] [Qed] Goal typed_f4_ok_assigns_exit : Valid
-[wp] [Qed] Goal typed_f4_ok_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_f4_ok_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_f4_ok_assigns_normal_part3 : Valid
-[wp] [Passed] Smoke-test typed_f5_ok_wp_smoke_dead_code_s48
-[wp] [Passed] Smoke-test typed_f5_ok_wp_smoke_dead_code_s50
-[wp] [Passed] Smoke-test typed_f5_ok_wp_smoke_dead_code_s52
-[wp] [Qed] Goal typed_f5_ok_assigns_part1 : Valid
-[wp] [Qed] Goal typed_f5_ok_assigns_part2 : Valid
-[wp] [Qed] Goal typed_f5_ok_assigns_part3 : Valid
-[wp] [Passed] Smoke-test typed_f5_ko_wp_smoke_dead_code_s56
-[wp] [Failed] Smoke-test typed_f5_ko_wp_smoke_dead_code_s61
- Qed: Valid
+[wp] [Failed (Doomed)] typed_f2_ko_wp_smoke_dead_code_s26 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f2_ko_assigns_exit (Qed)
+[wp] [Valid] typed_f2_ko_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_f2_ko_assigns_normal_part2 (Qed)
+[wp] [Failed (Doomed)] typed_call_wp_smoke_dead_call_s30 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_f3_ok_wp_smoke_dead_code_s30 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_f3_ok_wp_smoke_dead_code_s31 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_f3_ok_wp_smoke_dead_code_s34 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f3_ok_assigns_exit (Qed)
+[wp] [Valid] typed_f3_ok_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_f3_ok_assigns_normal_part2 (Qed)
+[wp] [Failed (Doomed)] typed_exit_wp_smoke_dead_call_s38 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_f4_ok_wp_smoke_dead_code_s41 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f4_ok_assert (Qed)
+[wp] [Valid] typed_f4_ok_assigns_exit (Qed)
+[wp] [Valid] typed_f4_ok_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_f4_ok_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_f4_ok_assigns_normal_part3 (Qed)
+[wp] [Failed (Doomed)] typed_f5_ok_wp_smoke_dead_code_s48 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_f5_ok_wp_smoke_dead_code_s50 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_f5_ok_wp_smoke_dead_code_s52 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f5_ok_assigns_part1 (Qed)
+[wp] [Valid] typed_f5_ok_assigns_part2 (Qed)
+[wp] [Valid] typed_f5_ok_assigns_part3 (Qed)
+[wp] [Failed (Doomed)] typed_f5_ko_wp_smoke_dead_code_s56 (Alt-Ergo) (Cached)
+[wp] [Passed (Invalid)] typed_f5_ko_wp_smoke_dead_code_s61 (Qed)
[wp] doomed_dead.i:90: Warning: Failed smoke-test
-[wp] [Passed] Smoke-test typed_f5_ko_wp_smoke_dead_code_s63
-[wp] [Passed] Smoke-test typed_f5_ko_wp_smoke_dead_code_s65
-[wp] [Qed] Goal typed_f5_ko_assigns_part1 : Valid
-[wp] [Qed] Goal typed_f5_ko_assigns_part2 : Valid
-[wp] [Qed] Goal typed_f5_ko_assigns_part3 : Valid
-[wp] [Qed] Goal typed_f5_ko_assigns_part4 : Valid
+[wp] [Failed (Doomed)] typed_f5_ko_wp_smoke_dead_code_s63 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_f5_ko_wp_smoke_dead_code_s65 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f5_ko_assigns_part1 (Qed)
+[wp] [Valid] typed_f5_ko_assigns_part2 (Qed)
+[wp] [Valid] typed_f5_ko_assigns_part3 (Qed)
+[wp] [Valid] typed_f5_ko_assigns_part4 (Qed)
[wp] Proved goals: 44 / 46
Qed: 23 (failed: 2)
Alt-Ergo: 21
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_dead.1.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_dead.1.res.oracle
index f4d33461e8f..2440cab302c 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_dead.1.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_dead.1.res.oracle
@@ -3,58 +3,56 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 48 goals scheduled
-[wp] [Passed] Smoke-test typed_f1_ok_wp_smoke_dead_code_s3
-[wp] [Passed] Smoke-test typed_f1_ok_wp_smoke_dead_code_s7
-[wp] [Passed] Smoke-test typed_f1_ok_wp_smoke_dead_code_s10
-[wp] [Qed] Goal typed_f1_ok_assigns_part1 : Valid
-[wp] [Qed] Goal typed_f1_ok_assigns_part2 : Valid
-[wp] [Qed] Goal typed_f1_ok_assigns_part3 : Valid
-[wp] [Passed] Smoke-test typed_exit_wp_smoke_dead_call_s14
-[wp] [Passed] Smoke-test typed_f2_ok_wp_smoke_dead_code_s14
-[wp] [Passed] Smoke-test typed_f2_ok_wp_smoke_dead_code_s16
-[wp] [Qed] Goal typed_f2_ok_assigns_exit : Valid
-[wp] [Qed] Goal typed_f2_ok_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_f2_ok_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_f2_ok_assigns_normal_part3 : Valid
-[wp] [Passed] Smoke-test typed_exit_wp_smoke_dead_call_s22
-[wp] [Passed] Smoke-test typed_f2_ko_wp_smoke_dead_code_s22
-[wp] [Failed] Smoke-test typed_f2_ko_wp_smoke_dead_code_s23
- Qed: Valid
+[wp] [Failed (Doomed)] typed_f1_ok_wp_smoke_dead_code_s3 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_f1_ok_wp_smoke_dead_code_s7 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_f1_ok_wp_smoke_dead_code_s10 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f1_ok_assigns_part1 (Qed)
+[wp] [Valid] typed_f1_ok_assigns_part2 (Qed)
+[wp] [Valid] typed_f1_ok_assigns_part3 (Qed)
+[wp] [Failed (Doomed)] typed_exit_wp_smoke_dead_call_s14 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_f2_ok_wp_smoke_dead_code_s14 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_f2_ok_wp_smoke_dead_code_s16 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f2_ok_assigns_exit (Qed)
+[wp] [Valid] typed_f2_ok_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_f2_ok_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_f2_ok_assigns_normal_part3 (Qed)
+[wp] [Failed (Doomed)] typed_exit_wp_smoke_dead_call_s22 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_f2_ko_wp_smoke_dead_code_s22 (Alt-Ergo) (Cached)
+[wp] [Passed (Invalid)] typed_f2_ko_wp_smoke_dead_code_s23 (Qed)
[wp] doomed_dead.i:44: Warning: Failed smoke-test
-[wp] [Passed] Smoke-test typed_f2_ko_wp_smoke_dead_code_s26
-[wp] [Qed] Goal typed_f2_ko_assigns_exit : Valid
-[wp] [Qed] Goal typed_f2_ko_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_f2_ko_assigns_normal_part2 : Valid
-[wp] [Passed] Smoke-test typed_call_wp_smoke_dead_call_s30
-[wp] [Passed] Smoke-test typed_f3_ok_wp_smoke_dead_code_s30
-[wp] [Passed] Smoke-test typed_f3_ok_wp_smoke_dead_code_s31
-[wp] [Passed] Smoke-test typed_f3_ok_wp_smoke_dead_code_s34
-[wp] [Qed] Goal typed_f3_ok_assigns_exit : Valid
-[wp] [Qed] Goal typed_f3_ok_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_f3_ok_assigns_normal_part2 : Valid
-[wp] [Passed] Smoke-test typed_exit_wp_smoke_dead_call_s38
-[wp] [Passed] Smoke-test typed_f4_ok_wp_smoke_dead_code_s41
-[wp] [Qed] Goal typed_f4_ok_assert : Valid
-[wp] [Qed] Goal typed_f4_ok_assigns_exit : Valid
-[wp] [Qed] Goal typed_f4_ok_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_f4_ok_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_f4_ok_assigns_normal_part3 : Valid
-[wp] [Passed] Smoke-test typed_f5_ok_wp_smoke_dead_code_s48
-[wp] [Passed] Smoke-test typed_f5_ok_wp_smoke_dead_code_s50
-[wp] [Passed] Smoke-test typed_f5_ok_wp_smoke_dead_code_s52
-[wp] [Qed] Goal typed_f5_ok_assigns_part1 : Valid
-[wp] [Qed] Goal typed_f5_ok_assigns_part2 : Valid
-[wp] [Qed] Goal typed_f5_ok_assigns_part3 : Valid
-[wp] [Passed] Smoke-test typed_f5_ko_wp_smoke_dead_code_s56
-[wp] [Failed] Smoke-test typed_f5_ko_wp_smoke_dead_code_s61
- Qed: Valid
+[wp] [Failed (Doomed)] typed_f2_ko_wp_smoke_dead_code_s26 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f2_ko_assigns_exit (Qed)
+[wp] [Valid] typed_f2_ko_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_f2_ko_assigns_normal_part2 (Qed)
+[wp] [Failed (Doomed)] typed_call_wp_smoke_dead_call_s30 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_f3_ok_wp_smoke_dead_code_s30 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_f3_ok_wp_smoke_dead_code_s31 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_f3_ok_wp_smoke_dead_code_s34 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f3_ok_assigns_exit (Qed)
+[wp] [Valid] typed_f3_ok_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_f3_ok_assigns_normal_part2 (Qed)
+[wp] [Failed (Doomed)] typed_exit_wp_smoke_dead_call_s38 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_f4_ok_wp_smoke_dead_code_s41 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f4_ok_assert (Qed)
+[wp] [Valid] typed_f4_ok_assigns_exit (Qed)
+[wp] [Valid] typed_f4_ok_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_f4_ok_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_f4_ok_assigns_normal_part3 (Qed)
+[wp] [Failed (Doomed)] typed_f5_ok_wp_smoke_dead_code_s48 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_f5_ok_wp_smoke_dead_code_s50 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_f5_ok_wp_smoke_dead_code_s52 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f5_ok_assigns_part1 (Qed)
+[wp] [Valid] typed_f5_ok_assigns_part2 (Qed)
+[wp] [Valid] typed_f5_ok_assigns_part3 (Qed)
+[wp] [Failed (Doomed)] typed_f5_ko_wp_smoke_dead_code_s56 (Alt-Ergo) (Cached)
+[wp] [Passed (Invalid)] typed_f5_ko_wp_smoke_dead_code_s61 (Qed)
[wp] doomed_dead.i:90: Warning: Failed smoke-test
-[wp] [Passed] Smoke-test typed_f5_ko_wp_smoke_dead_code_s63
-[wp] [Passed] Smoke-test typed_f5_ko_wp_smoke_dead_code_s65
-[wp] [Qed] Goal typed_f5_ko_assigns_part1 : Valid
-[wp] [Qed] Goal typed_f5_ko_assigns_part2 : Valid
-[wp] [Qed] Goal typed_f5_ko_assigns_part3 : Valid
-[wp] [Qed] Goal typed_f5_ko_assigns_part4 : Valid
+[wp] [Failed (Doomed)] typed_f5_ko_wp_smoke_dead_code_s63 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_f5_ko_wp_smoke_dead_code_s65 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f5_ko_assigns_part1 (Qed)
+[wp] [Valid] typed_f5_ko_assigns_part2 (Qed)
+[wp] [Valid] typed_f5_ko_assigns_part3 (Qed)
+[wp] [Valid] typed_f5_ko_assigns_part4 (Qed)
[wp] Proved goals: 46 / 48
Qed: 25 (failed: 2)
Alt-Ergo: 21
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_localinit.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_localinit.res.oracle
index f18b898fef4..2556b38935c 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_localinit.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_localinit.res.oracle
@@ -3,12 +3,11 @@
[wp] Running WP plugin...
[rte:annot] annotating function access
[wp] 4 goals scheduled
-[wp] [Passed] Smoke-test typed_access_wp_smoke_dead_code_s3
-[wp] [Failed] Smoke-test typed_access_wp_smoke_dead_code_s5
- Qed: Valid
+[wp] [Failed (Doomed)] typed_access_wp_smoke_dead_code_s3 (Alt-Ergo) (Cached)
+[wp] [Passed (Invalid)] typed_access_wp_smoke_dead_code_s5 (Qed)
[wp] doomed_localinit.i:11: Warning: Failed smoke-test
-[wp] [Alt-Ergo] Goal typed_access_assert_rte_mem_access : Unsuccess
-[wp] [Alt-Ergo] Goal typed_access_assert_rte_mem_access_2 : Unsuccess
+[wp] [Timeout] typed_access_assert_rte_mem_access (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_access_assert_rte_mem_access_2 (Alt-Ergo) (Cached)
[wp] Proved goals: 1 / 4
Qed: 0 (failed: 1)
Alt-Ergo: 1 (unsuccess: 2)
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_loop.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_loop.res.oracle
index ea9a729fb71..0cecf94944c 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_loop.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_loop.res.oracle
@@ -3,20 +3,17 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 8 goals scheduled
-[wp] [Failed] Smoke-test typed_foo_wp_smoke_dead_loop_s2
- Qed: Valid
+[wp] [Passed (Invalid)] typed_foo_wp_smoke_dead_loop_s2 (Qed)
[wp] doomed_loop.i:22: Warning: Failed smoke-test
-[wp] [Failed] Smoke-test typed_foo_wp_smoke_dead_code_s7
- Qed: Valid
+[wp] [Passed (Invalid)] typed_foo_wp_smoke_dead_code_s7 (Qed)
[wp] doomed_loop.i:23: Warning: Failed smoke-test
-[wp] [Failed] Smoke-test typed_foo_wp_smoke_dead_code_s9
- Qed: Valid
+[wp] [Passed (Invalid)] typed_foo_wp_smoke_dead_code_s9 (Qed)
[wp] doomed_loop.i:25: Warning: Failed smoke-test
-[wp] [Qed] Goal typed_foo_loop_invariant_A_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_foo_loop_invariant_A_established : Unsuccess
-[wp] [Qed] Goal typed_foo_loop_invariant_B_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_foo_loop_invariant_B_established : Unsuccess
-[wp] [Qed] Goal typed_foo_loop_assigns : Valid
+[wp] [Valid] typed_foo_loop_invariant_A_preserved (Qed)
+[wp] [Unknown] typed_foo_loop_invariant_A_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_foo_loop_invariant_B_preserved (Qed)
+[wp] [Unknown] typed_foo_loop_invariant_B_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_foo_loop_assigns (Qed)
[wp] Proved goals: 3 / 8
Qed: 3 (failed: 3)
Alt-Ergo: 0 (unsuccess: 2)
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_pre.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_pre.res.oracle
index 6293429b575..1f8c5660894 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_pre.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_pre.res.oracle
@@ -3,34 +3,26 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 13 goals scheduled
-[wp] [Failed] Smoke-test typed_requires_wp_smoke_default_requires
- Qed: Valid
+[wp] [Passed (Invalid)] typed_requires_wp_smoke_default_requires (Qed)
[wp] doomed_pre.i:10: Warning: Failed smoke-test
-[wp] [Passed] Smoke-test typed_reqs_assumes_wp_smoke_default_requires
-[wp] [Failed] Smoke-test typed_reqs_assumes_wp_smoke_B_assumes
- Qed: Valid
+[wp] [Failed (Doomed)] typed_reqs_assumes_wp_smoke_default_requires (Alt-Ergo) (Cached)
+[wp] [Passed (Invalid)] typed_reqs_assumes_wp_smoke_B_assumes (Qed)
[wp] doomed_pre.i:16: Warning: Failed smoke-test
-[wp] [Passed] Smoke-test typed_reqs_2_2_assumes_wp_smoke_default_requires
-[wp] [Failed] Smoke-test typed_reqs_2_2_assumes_wp_smoke_B_assumes
- Qed: Valid
+[wp] [Failed (Doomed)] typed_reqs_2_2_assumes_wp_smoke_default_requires (Alt-Ergo) (Cached)
+[wp] [Passed (Invalid)] typed_reqs_2_2_assumes_wp_smoke_B_assumes (Qed)
[wp] doomed_pre.i:23: Warning: Failed smoke-test
-[wp] [Passed] Smoke-test typed_reqs_1_2_assumes_wp_smoke_default_requires
-[wp] [Failed] Smoke-test typed_reqs_1_2_assumes_wp_smoke_B_assumes
- Qed: Valid
+[wp] [Failed (Doomed)] typed_reqs_1_2_assumes_wp_smoke_default_requires (Alt-Ergo) (Cached)
+[wp] [Passed (Invalid)] typed_reqs_1_2_assumes_wp_smoke_B_assumes (Qed)
[wp] doomed_pre.i:30: Warning: Failed smoke-test
-[wp] [Passed] Smoke-test typed_reqs_combined_assumes_wp_smoke_default_requires
-[wp] [Failed] Smoke-test typed_reqs_combined_assumes_wp_smoke_B_assumes
- Qed: Valid
+[wp] [Failed (Doomed)] typed_reqs_combined_assumes_wp_smoke_default_requires (Alt-Ergo) (Cached)
+[wp] [Passed (Invalid)] typed_reqs_combined_assumes_wp_smoke_B_assumes (Qed)
[wp] doomed_pre.i:37: Warning: Failed smoke-test
-[wp] [Failed] Smoke-test typed_bhv_requires_assumes_wp_smoke_B_requires
- Qed: Valid
+[wp] [Passed (Invalid)] typed_bhv_requires_assumes_wp_smoke_B_requires (Qed)
[wp] doomed_pre.i:48: Warning: Failed smoke-test
-[wp] [Passed] Smoke-test typed_reqs_massumes_wp_smoke_default_requires
-[wp] [Failed] Smoke-test typed_reqs_massumes_wp_smoke_B1_assumes
- Qed: Valid
+[wp] [Failed (Doomed)] typed_reqs_massumes_wp_smoke_default_requires (Alt-Ergo) (Cached)
+[wp] [Passed (Invalid)] typed_reqs_massumes_wp_smoke_B1_assumes (Qed)
[wp] doomed_pre.i:56: Warning: Failed smoke-test
-[wp] [Failed] Smoke-test typed_reqs_massumes_wp_smoke_B2_assumes
- Qed: Valid
+[wp] [Passed (Invalid)] typed_reqs_massumes_wp_smoke_B2_assumes (Qed)
[wp] doomed_pre.i:56: Warning: Failed smoke-test
[wp] Proved goals: 5 / 13
Qed: 0 (failed: 8)
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_report_ko.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_report_ko.res.oracle
index fa0963a210e..c8694f081d6 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_report_ko.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_report_ko.res.oracle
@@ -3,22 +3,19 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 10 goals scheduled
-[wp] [Failed] Smoke-test typed_foo_wp_smoke_dead_loop_s2
- Alt-Ergo: Valid
+[wp] [Passed (Invalid)] typed_foo_wp_smoke_dead_loop_s2 (Alt-Ergo) (Cached)
[wp] doomed_report_ko.i:29: Warning: Failed smoke-test
-[wp] [Failed] Smoke-test typed_foo_wp_smoke_dead_code_s7
- Alt-Ergo: Valid
+[wp] [Passed (Invalid)] typed_foo_wp_smoke_dead_code_s7 (Alt-Ergo) (Cached)
[wp] doomed_report_ko.i:29: Warning: Failed smoke-test
-[wp] [Failed] Smoke-test typed_foo_wp_smoke_dead_code_s9
- Alt-Ergo: Valid
+[wp] [Passed (Invalid)] typed_foo_wp_smoke_dead_code_s9 (Alt-Ergo) (Cached)
[wp] doomed_report_ko.i:30: Warning: Failed smoke-test
-[wp] [Alt-Ergo] Goal typed_foo_loop_invariant_A_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_foo_loop_invariant_A_established : Valid
-[wp] [Alt-Ergo] Goal typed_foo_loop_invariant_B_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_foo_loop_invariant_B_established : Valid
-[wp] [Alt-Ergo] Goal typed_foo_loop_invariant_C_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_foo_loop_invariant_C_established : Valid
-[wp] [Qed] Goal typed_foo_loop_assigns : Valid
+[wp] [Valid] typed_foo_loop_invariant_A_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_foo_loop_invariant_A_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_foo_loop_invariant_B_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_foo_loop_invariant_B_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_foo_loop_invariant_C_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_foo_loop_invariant_C_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_foo_loop_assigns (Qed)
[wp] Proved goals: 7 / 10
Qed: 1
Alt-Ergo: 6 (failed: 3)
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_report_ok.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_report_ok.res.oracle
index 51405b44115..1a708a992ad 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_report_ok.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_report_ok.res.oracle
@@ -3,16 +3,16 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 10 goals scheduled
-[wp] [Passed] Smoke-test typed_foo_wp_smoke_dead_loop_s2
-[wp] [Passed] Smoke-test typed_foo_wp_smoke_dead_code_s7
-[wp] [Passed] Smoke-test typed_foo_wp_smoke_dead_code_s9
-[wp] [Alt-Ergo] Goal typed_foo_loop_invariant_A_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_foo_loop_invariant_A_established : Valid
-[wp] [Alt-Ergo] Goal typed_foo_loop_invariant_B_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_foo_loop_invariant_B_established : Valid
-[wp] [Alt-Ergo] Goal typed_foo_loop_invariant_C_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_foo_loop_invariant_C_established : Valid
-[wp] [Qed] Goal typed_foo_loop_assigns : Valid
+[wp] [Failed (Doomed)] typed_foo_wp_smoke_dead_loop_s2 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_foo_wp_smoke_dead_code_s7 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_foo_wp_smoke_dead_code_s9 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_foo_loop_invariant_A_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_foo_loop_invariant_A_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_foo_loop_invariant_B_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_foo_loop_invariant_B_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_foo_loop_invariant_C_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_foo_loop_invariant_C_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_foo_loop_assigns (Qed)
[wp] Proved goals: 10 / 10
Qed: 1
Alt-Ergo: 9
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_unreach.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_unreach.res.oracle
index 0a903844200..3264f7d6554 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_unreach.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_unreach.res.oracle
@@ -6,12 +6,12 @@
[wp] doomed_unreach.i:22: Warning: Failed smoke-test
[wp] Warning: Missing RTE guards
[wp] 6 goals scheduled
-[wp] [Passed] Smoke-test typed_job_wp_smoke_dead_code_s4
-[wp] [Passed] Smoke-test typed_job_wp_smoke_dead_code_s5
-[wp] [Passed] Smoke-test typed_job_wp_smoke_dead_code_s8
-[wp] [Qed] Goal typed_job_assigns_part1 : Valid
-[wp] [Qed] Goal typed_job_assigns_part2 : Valid
-[wp] [Qed] Goal typed_job_assigns_part3 : Valid
+[wp] [Failed (Doomed)] typed_job_wp_smoke_dead_code_s4 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_job_wp_smoke_dead_code_s5 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_job_wp_smoke_dead_code_s8 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_job_assigns_part1 (Qed)
+[wp] [Valid] typed_job_assigns_part2 (Qed)
+[wp] [Valid] typed_job_assigns_part3 (Qed)
[wp] Proved goals: 6 / 9
Qed: 3
Alt-Ergo: 3
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_unroll.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_unroll.res.oracle
index e01d87f027b..44f4519c1fc 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_unroll.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_unroll.res.oracle
@@ -5,11 +5,11 @@
[wp] doomed_unroll.i:15: Warning:
Missing assigns clause (assigns 'everything' instead)
[wp] 5 goals scheduled
-[wp] [Passed] Smoke-test typed_foo_wp_smoke_dead_code_s27
-[wp] [Passed] Smoke-test typed_foo_wp_smoke_dead_code_s31
-[wp] [Passed] Smoke-test typed_foo_wp_smoke_dead_code_s35
-[wp] [Qed] Goal typed_foo_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_foo_loop_invariant_established : Valid
+[wp] [Failed (Doomed)] typed_foo_wp_smoke_dead_code_s27 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_foo_wp_smoke_dead_code_s31 (Alt-Ergo) (Cached)
+[wp] [Failed (Doomed)] typed_foo_wp_smoke_dead_code_s35 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_foo_loop_invariant_preserved (Qed)
+[wp] [Valid] typed_foo_loop_invariant_established (Qed)
[wp] Proved goals: 5 / 5
Qed: 2
Alt-Ergo: 3
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/dynamic.0.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/dynamic.0.res.oracle
index 366d7bcb870..c090a19bc02 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/dynamic.0.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/dynamic.0.res.oracle
@@ -4,53 +4,53 @@
[wp] Warning: Missing RTE guards
[wp] dynamic.i:80: Warning: Missing 'calls' for default behavior
[wp] 47 goals scheduled
-[wp] [Alt-Ergo] Goal typed_call_call_point_f1_f2_s3 : Valid
-[wp] [Qed] Goal typed_call_ensures_part1 : Valid
-[wp] [Qed] Goal typed_call_ensures_part2 : Valid
-[wp] [Alt-Ergo] Goal typed_call_call_f1_requires : Valid
-[wp] [Alt-Ergo] Goal typed_behavior_call_point_h1_h2_s15 : Unsuccess
-[wp] [Qed] Goal typed_behavior_call_point_h1_h2_s15 : Valid
-[wp] [Qed] Goal typed_behavior_bhv1_ensures_part1 : Valid
-[wp] [Qed] Goal typed_behavior_bhv1_ensures_part2 : Valid
-[wp] [Qed] Goal typed_behavior_bhv1_assigns_exit_part1 : Valid
-[wp] [Qed] Goal typed_behavior_bhv1_assigns_exit_part2 : Valid
-[wp] [Qed] Goal typed_behavior_bhv1_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_behavior_bhv1_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_behavior_bhv1_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_behavior_bhv1_assigns_normal_part4 : Valid
-[wp] [Qed] Goal typed_some_behaviors_call_point_h1_h2_h0_for_bhv1_s20 : Valid
-[wp] [Qed] Goal typed_some_behaviors_bhv1_ensures_part1 : Valid
-[wp] [Qed] Goal typed_some_behaviors_bhv1_ensures_part2 : Valid
-[wp] [Qed] Goal typed_some_behaviors_bhv1_ensures_part3 : Valid
-[wp] [Qed] Goal typed_some_behaviors_bhv1_assigns_exit_part1 : Valid
-[wp] [Qed] Goal typed_some_behaviors_bhv1_assigns_exit_part2 : Valid
-[wp] [Qed] Goal typed_some_behaviors_bhv1_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_some_behaviors_bhv1_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_some_behaviors_bhv1_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_some_behaviors_bhv1_assigns_normal_part4 : Valid
-[wp] [Qed] Goal typed_some_behaviors_bhv1_assigns_normal_part5 : Valid
-[wp] [Qed] Goal typed_some_behaviors_call_point_h1_h2_h0_for_bhv0_s20 : Valid
-[wp] [Qed] Goal typed_some_behaviors_bhv0_ensures_part1 : Valid
-[wp] [Qed] Goal typed_some_behaviors_bhv0_ensures_part2 : Valid
-[wp] [Qed] Goal typed_some_behaviors_bhv0_ensures_part3 : Valid
-[wp] [Qed] Goal typed_some_behaviors_bhv0_assigns_exit_part1 : Valid
-[wp] [Qed] Goal typed_some_behaviors_bhv0_assigns_exit_part2 : Valid
-[wp] [Qed] Goal typed_some_behaviors_bhv0_assigns_exit_part3 : Valid
-[wp] [Qed] Goal typed_some_behaviors_bhv0_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_some_behaviors_bhv0_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_some_behaviors_bhv0_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_some_behaviors_bhv0_assigns_normal_part4 : Valid
-[wp] [Qed] Goal typed_some_behaviors_bhv0_assigns_normal_part5 : Valid
-[wp] [Qed] Goal typed_some_behaviors_bhv0_assigns_normal_part6 : Valid
-[wp] [Alt-Ergo] Goal typed_missing_context_call_point_h1_s25 : Unsuccess
-[wp] [Qed] Goal typed_missing_context_ensures : Valid
-[wp] [Qed] Goal typed_missing_context_assigns_exit : Valid
-[wp] [Qed] Goal typed_missing_context_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_missing_context_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_no_call_call_point_unreachable_g_s32 : Valid
-[wp] [Qed] Goal typed_no_call_ensures_part1 : Valid
-[wp] [Qed] Goal typed_no_call_ensures_part2 : Valid
-[wp] [Qed] Goal typed_no_call_call_unreachable_g_requires : Valid
+[wp] [Valid] typed_call_call_point_f1_f2_s3 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_call_ensures_part1 (Qed)
+[wp] [Valid] typed_call_ensures_part2 (Qed)
+[wp] [Valid] typed_call_call_f1_requires (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_behavior_call_point_h1_h2_s15 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_behavior_call_point_h1_h2_s15 (Qed)
+[wp] [Valid] typed_behavior_bhv1_ensures_part1 (Qed)
+[wp] [Valid] typed_behavior_bhv1_ensures_part2 (Qed)
+[wp] [Valid] typed_behavior_bhv1_assigns_exit_part1 (Qed)
+[wp] [Valid] typed_behavior_bhv1_assigns_exit_part2 (Qed)
+[wp] [Valid] typed_behavior_bhv1_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_behavior_bhv1_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_behavior_bhv1_assigns_normal_part3 (Qed)
+[wp] [Valid] typed_behavior_bhv1_assigns_normal_part4 (Qed)
+[wp] [Valid] typed_some_behaviors_call_point_h1_h2_h0_for_bhv1_s20 (Qed)
+[wp] [Valid] typed_some_behaviors_bhv1_ensures_part1 (Qed)
+[wp] [Valid] typed_some_behaviors_bhv1_ensures_part2 (Qed)
+[wp] [Valid] typed_some_behaviors_bhv1_ensures_part3 (Qed)
+[wp] [Valid] typed_some_behaviors_bhv1_assigns_exit_part1 (Qed)
+[wp] [Valid] typed_some_behaviors_bhv1_assigns_exit_part2 (Qed)
+[wp] [Valid] typed_some_behaviors_bhv1_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_some_behaviors_bhv1_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_some_behaviors_bhv1_assigns_normal_part3 (Qed)
+[wp] [Valid] typed_some_behaviors_bhv1_assigns_normal_part4 (Qed)
+[wp] [Valid] typed_some_behaviors_bhv1_assigns_normal_part5 (Qed)
+[wp] [Valid] typed_some_behaviors_call_point_h1_h2_h0_for_bhv0_s20 (Qed)
+[wp] [Valid] typed_some_behaviors_bhv0_ensures_part1 (Qed)
+[wp] [Valid] typed_some_behaviors_bhv0_ensures_part2 (Qed)
+[wp] [Valid] typed_some_behaviors_bhv0_ensures_part3 (Qed)
+[wp] [Valid] typed_some_behaviors_bhv0_assigns_exit_part1 (Qed)
+[wp] [Valid] typed_some_behaviors_bhv0_assigns_exit_part2 (Qed)
+[wp] [Valid] typed_some_behaviors_bhv0_assigns_exit_part3 (Qed)
+[wp] [Valid] typed_some_behaviors_bhv0_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_some_behaviors_bhv0_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_some_behaviors_bhv0_assigns_normal_part3 (Qed)
+[wp] [Valid] typed_some_behaviors_bhv0_assigns_normal_part4 (Qed)
+[wp] [Valid] typed_some_behaviors_bhv0_assigns_normal_part5 (Qed)
+[wp] [Valid] typed_some_behaviors_bhv0_assigns_normal_part6 (Qed)
+[wp] [Unknown] typed_missing_context_call_point_h1_s25 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_missing_context_ensures (Qed)
+[wp] [Valid] typed_missing_context_assigns_exit (Qed)
+[wp] [Valid] typed_missing_context_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_missing_context_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_no_call_call_point_unreachable_g_s32 (Qed)
+[wp] [Valid] typed_no_call_ensures_part1 (Qed)
+[wp] [Valid] typed_no_call_ensures_part2 (Qed)
+[wp] [Valid] typed_no_call_call_unreachable_g_requires (Qed)
[wp] Proved goals: 45 / 47
Qed: 43
Alt-Ergo: 2 (unsuccess: 2)
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/dynamic.1.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/dynamic.1.res.oracle
index 6c888dcc5e6..d2d863e780a 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/dynamic.1.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/dynamic.1.res.oracle
@@ -3,11 +3,11 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 5 goals scheduled
-[wp] [Alt-Ergo] Goal typed_guarded_call_call_point_g_s9 : Valid
-[wp] [Alt-Ergo] Goal typed_guarded_call_ensures_part1 : Valid
-[wp] [Qed] Goal typed_guarded_call_ensures_part2 : Valid
-[wp] [Qed] Goal typed_guarded_call_ensures_2_part1 : Valid
-[wp] [Qed] Goal typed_guarded_call_ensures_2_part2 : Valid
+[wp] [Valid] typed_guarded_call_call_point_g_s9 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_guarded_call_ensures_part1 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_guarded_call_ensures_part2 (Qed)
+[wp] [Valid] typed_guarded_call_ensures_2_part1 (Qed)
+[wp] [Valid] typed_guarded_call_ensures_2_part2 (Qed)
[wp] Proved goals: 5 / 5
Qed: 3
Alt-Ergo: 2
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/fallback.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/fallback.res.oracle
index 933a85f90f2..194cb931ca4 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/fallback.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/fallback.res.oracle
@@ -4,7 +4,7 @@
[wp] Warning: Missing RTE guards
[wp] Warning: Prover 'Alt-Ergo:1.2.0' not found, fallback to 'Alt-Ergo:2.2.0'
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_job_ensures : Valid
+[wp] [Valid] typed_job_ensures (Alt-Ergo) (Cached)
[wp] Proved goals: 1 / 1
Qed: 0
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.0.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.0.res.oracle
index e7deb6e2aa5..f0323b39d15 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.0.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.0.res.oracle
@@ -3,12 +3,12 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 6 goals scheduled
-[wp] [Qed] Goal typed_job_ensures_Events : Valid
-[wp] [Alt-Ergo] Goal typed_job_ensures_A_reads : Unsuccess
-[wp] [Alt-Ergo] Goal typed_job_ensures_B_reads : Unsuccess
-[wp] [Alt-Ergo] Goal typed_job_ensures_B_writes : Unsuccess
-[wp] [Alt-Ergo] Goal typed_job_ensures_ReadValues : Unsuccess
-[wp] [Alt-Ergo] Goal typed_job_ensures_WriteValues : Unsuccess
+[wp] [Valid] typed_job_ensures_Events (Qed)
+[wp] [Timeout] typed_job_ensures_A_reads (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_job_ensures_B_reads (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_job_ensures_B_writes (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_job_ensures_ReadValues (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_job_ensures_WriteValues (Alt-Ergo) (Cached)
[wp] Proved goals: 1 / 6
Qed: 1
Alt-Ergo: 0 (unsuccess: 5)
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.1.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.1.res.oracle
index 09997a7fac3..c02544fc7ee 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.1.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.1.res.oracle
@@ -3,12 +3,12 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 6 goals scheduled
-[wp] [Qed] Goal typed_flash_job_ensures_Events : Valid
-[wp] [Qed] Goal typed_flash_job_ensures_A_reads : Valid
-[wp] [Qed] Goal typed_flash_job_ensures_B_reads : Valid
-[wp] [Qed] Goal typed_flash_job_ensures_B_writes : Valid
-[wp] [Qed] Goal typed_flash_job_ensures_ReadValues : Valid
-[wp] [Qed] Goal typed_flash_job_ensures_WriteValues : Valid
+[wp] [Valid] typed_flash_job_ensures_Events (Qed)
+[wp] [Valid] typed_flash_job_ensures_A_reads (Qed)
+[wp] [Valid] typed_flash_job_ensures_B_reads (Qed)
+[wp] [Valid] typed_flash_job_ensures_B_writes (Qed)
+[wp] [Valid] typed_flash_job_ensures_ReadValues (Qed)
+[wp] [Valid] typed_flash_job_ensures_WriteValues (Qed)
[wp] Proved goals: 6 / 6
Qed: 6
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_format.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_format.res.oracle
index cb9d081888b..5ab992b460d 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_format.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_format.res.oracle
@@ -6,7 +6,7 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_output_ensures_KO : Unsuccess
+[wp] [Stepout] typed_output_ensures_KO (Alt-Ergo) (Cached)
[wp] Proved goals: 0 / 1
Alt-Ergo: 0 (unsuccess: 1)
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_real.0.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_real.0.res.oracle
index b9e76a083eb..a8e99fff31c 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_real.0.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_real.0.res.oracle
@@ -6,7 +6,7 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_real_dequal_ensures : Valid
+[wp] [Valid] typed_real_dequal_ensures (Alt-Ergo) (Cached)
[wp] Proved goals: 1 / 1
Qed: 0
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_real.1.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_real.1.res.oracle
index c7bb7c5f628..c63b464f7cb 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_real.1.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_real.1.res.oracle
@@ -6,7 +6,7 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_dequal_ensures : Unsuccess
+[wp] [Timeout] typed_dequal_ensures (Alt-Ergo) (Cached)
[wp] Proved goals: 0 / 1
Alt-Ergo: 0 (unsuccess: 1)
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/frame.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/frame.res.oracle
index faf78acad99..5347c1f9f78 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/frame.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/frame.res.oracle
@@ -3,12 +3,12 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 6 goals scheduled
-[wp] [Qed] Goal typed_local_ensures_FRAMED : Valid
-[wp] [Alt-Ergo] Goal typed_local_ensures_KO : Unsuccess
-[wp] [Alt-Ergo] Goal typed_global_ensures_KO : Unsuccess
-[wp] [Alt-Ergo] Goal typed_localref_ensures_KO : Unsuccess
-[wp] [Qed] Goal typed_localref_assert_FRAMED : Valid
-[wp] [Alt-Ergo] Goal typed_alias_ensures_KO : Unsuccess
+[wp] [Valid] typed_local_ensures_FRAMED (Qed)
+[wp] [Unknown] typed_local_ensures_KO (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_global_ensures_KO (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_localref_ensures_KO (Alt-Ergo) (Cached)
+[wp] [Valid] typed_localref_assert_FRAMED (Qed)
+[wp] [Timeout] typed_alias_ensures_KO (Alt-Ergo) (Cached)
[wp] Proved goals: 2 / 6
Qed: 2
Alt-Ergo: 0 (unsuccess: 4)
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/ground_real.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/ground_real.res.oracle
index e5e1c28c161..29f43b8b647 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/ground_real.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/ground_real.res.oracle
@@ -2,7 +2,7 @@
[kernel] Parsing ground_real.i (no preprocessing)
[wp] Running WP plugin...
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_lemma_R : Valid
+[wp] [Valid] typed_lemma_R (Alt-Ergo) (Cached)
[wp] Proved goals: 1 / 1
Qed: 0
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_const.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_const.res.oracle
index a408ed5a7aa..a111dd7733b 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_const.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_const.res.oracle
@@ -3,10 +3,10 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 4 goals scheduled
-[wp] [Alt-Ergo] Goal typed_fA_ensures_KO : Unsuccess
-[wp] [Qed] Goal typed_fB_ensures_OK : Valid
-[wp] [Alt-Ergo] Goal typed_fC_ensures_KO : Unsuccess
-[wp] [Qed] Goal typed_fD_ensures_OK : Valid
+[wp] [Timeout] typed_fA_ensures_KO (Alt-Ergo) (Cached)
+[wp] [Valid] typed_fB_ensures_OK (Qed)
+[wp] [Timeout] typed_fC_ensures_KO (Alt-Ergo) (Cached)
+[wp] [Valid] typed_fD_ensures_OK (Qed)
[wp] Proved goals: 2 / 4
Qed: 2
Alt-Ergo: 0 (unsuccess: 2)
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_const_filter.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_const_filter.res.oracle
index 448b7a4e984..efbde309e0c 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_const_filter.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_const_filter.res.oracle
@@ -3,7 +3,7 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_default_init_check_X : Valid
+[wp] [Valid] typed_default_init_check_X (Alt-Ergo) (Cached)
[wp] Proved goals: 1 / 1
Qed: 0
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_const_guard.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_const_guard.res.oracle
index b0c49e258b1..4cada1ccac2 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_const_guard.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_const_guard.res.oracle
@@ -3,13 +3,13 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 7 goals scheduled
-[wp] [Qed] Goal typed_f_ensures_Const : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_Pointed_Valid : Valid
-[wp] [Qed] Goal typed_f_ensures_Q_ReadOnly : Valid
-[wp] [Qed] Goal typed_f_ensures_Q_NotWrite : Valid
-[wp] [Qed] Goal typed_g_ensures_P_not_Const : Valid
-[wp] [Alt-Ergo] Goal typed_g_assert_Read : Valid
-[wp] [Alt-Ergo] Goal typed_g_assert_Guard_against_Const : Unsuccess
+[wp] [Valid] typed_f_ensures_Const (Qed)
+[wp] [Valid] typed_f_ensures_Pointed_Valid (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_ensures_Q_ReadOnly (Qed)
+[wp] [Valid] typed_f_ensures_Q_NotWrite (Qed)
+[wp] [Valid] typed_g_ensures_P_not_Const (Qed)
+[wp] [Valid] typed_g_assert_Read (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_g_assert_Guard_against_Const (Alt-Ergo) (Cached)
[wp] Proved goals: 6 / 7
Qed: 4
Alt-Ergo: 2 (unsuccess: 1)
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_extern.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_extern.res.oracle
index ff210a2b5b2..7ae17320f5b 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_extern.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_extern.res.oracle
@@ -4,9 +4,9 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 3 goals scheduled
-[wp] [Qed] Goal typed_f_ensures_OK : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_KO : Unsuccess
-[wp] [Alt-Ergo] Goal typed_f_ensures_KO_2 : Unsuccess
+[wp] [Valid] typed_f_ensures_OK (Qed)
+[wp] [Unknown] typed_f_ensures_KO (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_f_ensures_KO_2 (Alt-Ergo) (Cached)
[wp] Proved goals: 1 / 3
Qed: 1
Alt-Ergo: 0 (unsuccess: 2)
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_valid.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_valid.res.oracle
index c3a20d407b6..abef9598ad1 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_valid.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_valid.res.oracle
@@ -3,10 +3,10 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 4 goals scheduled
-[wp] [Qed] Goal typed_validA_assert_OK : Valid
-[wp] [Qed] Goal typed_validA_assert_OK_2 : Valid
-[wp] [Qed] Goal typed_validB_assert_OK : Valid
-[wp] [Alt-Ergo] Goal typed_validB_assert_KO : Unsuccess
+[wp] [Valid] typed_validA_assert_OK (Qed)
+[wp] [Valid] typed_validA_assert_OK_2 (Qed)
+[wp] [Valid] typed_validB_assert_OK (Qed)
+[wp] [Unknown] typed_validB_assert_KO (Alt-Ergo) (Cached)
[wp] Proved goals: 3 / 4
Qed: 3
Alt-Ergo: 0 (unsuccess: 1)
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/initarr.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/initarr.res.oracle
index b6af203f6ca..776d35920da 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/initarr.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/initarr.res.oracle
@@ -3,8 +3,8 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 2 goals scheduled
-[wp] [Alt-Ergo] Goal typed_job_ensures_SEP : Valid
-[wp] [Alt-Ergo] Goal typed_job_ensures_ALT : Valid
+[wp] [Valid] typed_job_ensures_SEP (Alt-Ergo) (Cached)
+[wp] [Valid] typed_job_ensures_ALT (Alt-Ergo) (Cached)
[wp] Proved goals: 2 / 2
Qed: 0
Alt-Ergo: 2
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/injector.0.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/injector.0.res.oracle
index 69677093255..d58ca1d932f 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/injector.0.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/injector.0.res.oracle
@@ -3,19 +3,19 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 13 goals scheduled
-[wp] [Qed] Goal typed_f_call_g_requires : Valid
-[wp] [Qed] Goal typed_f_call_g_2_requires : Valid
-[wp] [Qed] Goal typed_f_FST_FAIL_ensures_qed_ok : Valid
-[wp] [Qed] Goal typed_f_FST_FAIL_ensures_qed_ok_2 : Valid
-[wp] [Qed] Goal typed_f_FST_FAIL_ensures_qed_ok_3 : Valid
-[wp] [Qed] Goal typed_f_SND_FAIL_ensures_qed_ok : Valid
-[wp] [Qed] Goal typed_f_SND_FAIL_ensures_qed_ok_2 : Valid
-[wp] [Qed] Goal typed_f_SND_FAIL_ensures_qed_ok_3 : Valid
-[wp] [Qed] Goal typed_f_SND_FAIL_ensures_qed_ok_4 : Valid
-[wp] [Qed] Goal typed_f_SUCCESS_ensures_qed_ok : Valid
-[wp] [Qed] Goal typed_f_SUCCESS_ensures_qed_ok_2 : Valid
-[wp] [Qed] Goal typed_f_SUCCESS_ensures_qed_ok_3 : Valid
-[wp] [Qed] Goal typed_f_SUCCESS_ensures_qed_ok_4 : Valid
+[wp] [Valid] typed_f_call_g_requires (Qed)
+[wp] [Valid] typed_f_call_g_2_requires (Qed)
+[wp] [Valid] typed_f_FST_FAIL_ensures_qed_ok (Qed)
+[wp] [Valid] typed_f_FST_FAIL_ensures_qed_ok_2 (Qed)
+[wp] [Valid] typed_f_FST_FAIL_ensures_qed_ok_3 (Qed)
+[wp] [Valid] typed_f_SND_FAIL_ensures_qed_ok (Qed)
+[wp] [Valid] typed_f_SND_FAIL_ensures_qed_ok_2 (Qed)
+[wp] [Valid] typed_f_SND_FAIL_ensures_qed_ok_3 (Qed)
+[wp] [Valid] typed_f_SND_FAIL_ensures_qed_ok_4 (Qed)
+[wp] [Valid] typed_f_SUCCESS_ensures_qed_ok (Qed)
+[wp] [Valid] typed_f_SUCCESS_ensures_qed_ok_2 (Qed)
+[wp] [Valid] typed_f_SUCCESS_ensures_qed_ok_3 (Qed)
+[wp] [Valid] typed_f_SUCCESS_ensures_qed_ok_4 (Qed)
[wp] Proved goals: 13 / 13
Qed: 13
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/injector.1.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/injector.1.res.oracle
index fd35b184958..64e4d456e88 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/injector.1.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/injector.1.res.oracle
@@ -3,10 +3,10 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 4 goals scheduled
-[wp] [Alt-Ergo] Goal typed_f_ko_ensures_qed_ko : Unsuccess
-[wp] [Alt-Ergo] Goal typed_f_ko_1_ensures_qed_ko : Unsuccess
-[wp] [Alt-Ergo] Goal typed_f_ko_1_ensures_qed_ko_2 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_f_ko_1_ensures_qed_ko_3 : Unsuccess
+[wp] [Stepout] typed_f_ko_ensures_qed_ko (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_f_ko_1_ensures_qed_ko (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_f_ko_1_ensures_qed_ko_2 (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_f_ko_1_ensures_qed_ko_3 (Alt-Ergo) (Cached)
[wp] Proved goals: 0 / 4
Alt-Ergo: 0 (unsuccess: 4)
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/loop.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/loop.res.oracle
index b489f684f7c..a530113e970 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/loop.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/loop.res.oracle
@@ -3,15 +3,15 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 9 goals scheduled
-[wp] [Alt-Ergo] Goal typed_init_ensures_qed_ok : Valid
-[wp] [Alt-Ergo] Goal typed_init_loop_invariant_qed_ok_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_init_loop_invariant_qed_ok_established : Valid
-[wp] [Alt-Ergo] Goal typed_init_loop_invariant_qed_ok_2_preserved : Valid
-[wp] [Qed] Goal typed_init_loop_invariant_qed_ok_2_established : Valid
-[wp] [Qed] Goal typed_init_loop_assigns_part1 : Valid
-[wp] [Qed] Goal typed_init_loop_assigns_part2 : Valid
-[wp] [Alt-Ergo] Goal typed_init_loop_assigns_part3 : Valid
-[wp] [Alt-Ergo] Goal typed_init_assigns : Unsuccess
+[wp] [Valid] typed_init_ensures_qed_ok (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_loop_invariant_qed_ok_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_loop_invariant_qed_ok_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_loop_invariant_qed_ok_2_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_loop_invariant_qed_ok_2_established (Qed)
+[wp] [Valid] typed_init_loop_assigns_part1 (Qed)
+[wp] [Valid] typed_init_loop_assigns_part2 (Qed)
+[wp] [Valid] typed_init_loop_assigns_part3 (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_init_assigns (Alt-Ergo) (Cached)
[wp] Proved goals: 8 / 9
Qed: 3
Alt-Ergo: 5 (unsuccess: 1)
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/loopcurrent.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/loopcurrent.res.oracle
index 24b26ed0544..ebb28a7ced4 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/loopcurrent.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/loopcurrent.res.oracle
@@ -5,10 +5,10 @@
[wp] loopcurrent.i:12: Warning:
Missing assigns clause (assigns 'everything' instead)
[wp] 4 goals scheduled
-[wp] [Qed] Goal typed_f_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_f_loop_invariant_established : Valid
-[wp] [Qed] Goal typed_f_loop_invariant_2_preserved : Valid
-[wp] [Qed] Goal typed_f_loop_invariant_2_established : Valid
+[wp] [Valid] typed_f_loop_invariant_preserved (Qed)
+[wp] [Valid] typed_f_loop_invariant_established (Qed)
+[wp] [Valid] typed_f_loop_invariant_2_preserved (Qed)
+[wp] [Valid] typed_f_loop_invariant_2_established (Qed)
[wp] Proved goals: 4 / 4
Qed: 4
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/loopentry.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/loopentry.res.oracle
index 3f503a108e3..d06f0c99c12 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/loopentry.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/loopentry.res.oracle
@@ -5,10 +5,10 @@
[wp] loopentry.i:12: Warning:
Missing assigns clause (assigns 'everything' instead)
[wp] 4 goals scheduled
-[wp] [Qed] Goal typed_f_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_f_loop_invariant_established : Valid
-[wp] [Qed] Goal typed_f_loop_invariant_2_preserved : Valid
-[wp] [Qed] Goal typed_f_loop_invariant_2_established : Valid
+[wp] [Valid] typed_f_loop_invariant_preserved (Qed)
+[wp] [Valid] typed_f_loop_invariant_established (Qed)
+[wp] [Valid] typed_f_loop_invariant_2_preserved (Qed)
+[wp] [Valid] typed_f_loop_invariant_2_established (Qed)
[wp] Proved goals: 4 / 4
Qed: 4
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/loopextra.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/loopextra.res.oracle
index 102c14a3aaa..b2bb9796534 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/loopextra.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/loopextra.res.oracle
@@ -7,9 +7,9 @@
[wp] loopextra.i:3: Warning:
Missing assigns clause (assigns 'everything' instead)
[wp] 3 goals scheduled
-[wp] [Qed] Goal typed_f_assert : Valid
-[wp] [Qed] Goal typed_f_assert_2 : Valid
-[wp] [Qed] Goal typed_f_assert_3 : Valid
+[wp] [Valid] typed_f_assert (Qed)
+[wp] [Valid] typed_f_assert_2 (Qed)
+[wp] [Valid] typed_f_assert_3 (Qed)
[wp] Proved goals: 3 / 3
Qed: 3
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/mask.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/mask.res.oracle
index 9b679add500..46c89042b26 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/mask.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/mask.res.oracle
@@ -3,8 +3,8 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 2 goals scheduled
-[wp] [Qed] Goal typed_compute_ensures_A : Valid
-[wp] [Qed] Goal typed_compute_ensures_B : Valid
+[wp] [Valid] typed_compute_ensures_A (Qed)
+[wp] [Valid] typed_compute_ensures_B (Qed)
[wp] Proved goals: 2 / 2
Qed: 2
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.res.oracle
index 33c44e4df37..8f1e9ce0971 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.res.oracle
@@ -3,36 +3,36 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 30 goals scheduled
-[wp] [Alt-Ergo] Goal typed_lemma_abs_neg : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_abs_pos : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_atan_sin_cos : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_cosh_opp : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_distance : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_exp_log_add_mul : Valid
-[wp] [Qed] Goal typed_lemma_exp_pos : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_log_exp_mul_add : Valid
-[wp] [Qed] Goal typed_lemma_max_ac : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_max_inf : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_max_or : Valid
-[wp] [Qed] Goal typed_lemma_min_ac : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_min_inf : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_min_or : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_pow_2 : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_sinh_opp : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_sqrt_mono : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_sqrt_pos : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_tanh_opp : Valid
-[wp] [Alt-Ergo] Goal typed_ok_ensures_sin_asin : Valid
-[wp] [Alt-Ergo] Goal typed_ok_ensures_sin_asin_in_range : Valid
-[wp] [Alt-Ergo] Goal typed_ok_ensures_cos_acos : Valid
-[wp] [Alt-Ergo] Goal typed_ok_ensures_cos_acos_in_range : Valid
-[wp] [Qed] Goal typed_ok_ensures_tan_atan : Valid
-[wp] [Alt-Ergo] Goal typed_ok_ensures_log_pow : Valid
-[wp] [Qed] Goal typed_ok_ensures_log_exp : Valid
-[wp] [Alt-Ergo] Goal typed_ok_ensures_exp_log : Valid
-[wp] [Alt-Ergo] Goal typed_ok_ensures_min_plus_distrib : Valid
-[wp] [Alt-Ergo] Goal typed_ok_ensures_sqrt_pos : Valid
-[wp] [Alt-Ergo] Goal typed_ok_ensures_sqrt_pos0 : Valid
+[wp] [Valid] typed_lemma_abs_neg (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_abs_pos (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_atan_sin_cos (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_cosh_opp (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_distance (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_exp_log_add_mul (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_exp_pos (Qed)
+[wp] [Valid] typed_lemma_log_exp_mul_add (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_max_ac (Qed)
+[wp] [Valid] typed_lemma_max_inf (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_max_or (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_min_ac (Qed)
+[wp] [Valid] typed_lemma_min_inf (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_min_or (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_pow_2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_sinh_opp (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_sqrt_mono (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_sqrt_pos (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_tanh_opp (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ok_ensures_sin_asin (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ok_ensures_sin_asin_in_range (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ok_ensures_cos_acos (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ok_ensures_cos_acos_in_range (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ok_ensures_tan_atan (Qed)
+[wp] [Valid] typed_ok_ensures_log_pow (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ok_ensures_log_exp (Qed)
+[wp] [Valid] typed_ok_ensures_exp_log (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ok_ensures_min_plus_distrib (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ok_ensures_sqrt_pos (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ok_ensures_sqrt_pos0 (Alt-Ergo) (Cached)
[wp] Proved goals: 30 / 30
Qed: 5
Alt-Ergo: 25
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.1.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.1.res.oracle
index 69ac94a8689..7e2cd58bc85 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.1.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.1.res.oracle
@@ -3,15 +3,15 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 9 goals scheduled
-[wp] [Alt-Ergo] Goal typed_ko_ensures_ko_sin_asin : Unsuccess
-[wp] [Alt-Ergo] Goal typed_ko_ensures_ko_cos_acos : Unsuccess
-[wp] [Alt-Ergo] Goal typed_ko_ensures_ko_asin_sin : Unsuccess
-[wp] [Alt-Ergo] Goal typed_ko_ensures_ko_acos_cos : Unsuccess
-[wp] [Alt-Ergo] Goal typed_ko_ensures_ko_atan_tan : Unsuccess
-[wp] [Alt-Ergo] Goal typed_ko_ensures_ko_log_pow : Unsuccess
-[wp] [Alt-Ergo] Goal typed_ko_ensures_ko_exp_log : Unsuccess
-[wp] [Alt-Ergo] Goal typed_ko_ensures_ko_exp_log_add_mul : Unsuccess
-[wp] [Alt-Ergo] Goal typed_ko_ensures_ko_sqrt_pos : Unsuccess
+[wp] [Stepout] typed_ko_ensures_ko_sin_asin (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_ko_ensures_ko_cos_acos (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_ko_ensures_ko_asin_sin (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_ko_ensures_ko_acos_cos (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_ko_ensures_ko_atan_tan (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_ko_ensures_ko_log_pow (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_ko_ensures_ko_exp_log (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_ko_ensures_ko_exp_log_add_mul (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_ko_ensures_ko_sqrt_pos (Alt-Ergo) (Cached)
[wp] Proved goals: 0 / 9
Alt-Ergo: 0 (unsuccess: 9)
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/model.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/model.res.oracle
index 16921421e1b..3623f82c94f 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/model.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/model.res.oracle
@@ -76,7 +76,7 @@ end
let x = get t (shift_sint32 a i) in
region (a.base) <= 0 -> is_sint32 i -> is_sint32 x -> P_P x
end
-[wp] [Alt-Ergo] Goal typed_f_ensures : Unsuccess
+[wp] [Timeout] typed_f_ensures (Alt-Ergo) (Cached)
[wp] Proved goals: 0 / 1
Alt-Ergo: 0 (unsuccess: 1)
------------------------------------------------------------
@@ -156,7 +156,7 @@ end
let x = get1 t (shift_sint321 a i) in
region1 (a.base1) <=' 0 -> is_sint321 i -> is_sint321 x -> P_P1 x
end
-[wp] [Alt-Ergo] Goal typed_ref_f_ensures : Unsuccess
+[wp] [Timeout] typed_ref_f_ensures (Alt-Ergo) (Cached)
[wp] Proved goals: 0 / 1
Alt-Ergo: 0 (unsuccess: 1)
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/no_step_limit.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/no_step_limit.res.oracle
index 2ad3c977064..ff90cbbd0db 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/no_step_limit.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/no_step_limit.res.oracle
@@ -2,6 +2,6 @@
[kernel] Parsing no_step_limit.i (no preprocessing)
[wp] Running WP plugin...
[wp] 1 goal scheduled
-[wp] [no-steps] Goal typed_lemma_truc : Unsuccess
+[wp] [Unknown] typed_lemma_truc (no-steps)
[wp] Proved goals: 0 / 1
no-steps: 0 (unsuccess: 1)
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/nosession.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/nosession.res.oracle
index f62cd996de8..00cf47e0837 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/nosession.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/nosession.res.oracle
@@ -3,5 +3,4 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 1 goal scheduled
-[wp] [Failed] Goal typed_f_ensures
[wp] Proved goals: 0 / 1
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/nth.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/nth.res.oracle
index 855f0b498ab..9dfe4fdd8d3 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/nth.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/nth.res.oracle
@@ -2,32 +2,32 @@
[kernel] Parsing nth.i (no preprocessing)
[wp] Running WP plugin...
[wp] 26 goals scheduled
-[wp] [Alt-Ergo] Goal typed_lemma_access_16_16_ok : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_access_4_4_ok : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_access_repeat_concat_3_ok_lack : Valid
-[wp] [Qed] Goal typed_check_lemma_constructor_elt_ok : Valid
-[wp] [Qed] Goal typed_lemma_eq_repeat_concat_3_ok : Valid
-[wp] [Qed] Goal typed_check_lemma_left_shift_repeat1_ok : Valid
-[wp] [Qed] Goal typed_check_lemma_left_shift_repeat2_ok : Valid
-[wp] [Qed] Goal typed_check_lemma_left_unfold_repeat1_ok : Valid
-[wp] [Qed] Goal typed_check_lemma_left_unfold_repeat2_ok : Valid
-[wp] [Qed] Goal typed_check_lemma_negative_repeat_ok : Valid
-[wp] [Qed] Goal typed_check_lemma_not_nil_elt_ok : Valid
-[wp] [Qed] Goal typed_check_lemma_nth_repeat_1_ok : Valid
-[wp] [Qed] Goal typed_check_lemma_nth_repeat_2_ok : Valid
-[wp] [Qed] Goal typed_check_lemma_nth_repeat_3_ok : Valid
-[wp] [Qed] Goal typed_check_lemma_nth_repeat_4_ok : Valid
-[wp] [Alt-Ergo] Goal typed_check_lemma_nth_repeat_undefined_1_ko : Unsuccess
-[wp] [Qed] Goal typed_check_lemma_repeat1_ok : Valid
-[wp] [Qed] Goal typed_check_lemma_repeat2_ok : Valid
-[wp] [Qed] Goal typed_check_lemma_repeat_nil_ok : Valid
-[wp] [Qed] Goal typed_check_lemma_repeat_one_ok : Valid
-[wp] [Qed] Goal typed_check_lemma_repeat_repeated_ok : Valid
-[wp] [Qed] Goal typed_check_lemma_right_shift_repeat1_ok : Valid
-[wp] [Qed] Goal typed_check_lemma_right_shift_repeat2_ok : Valid
-[wp] [Qed] Goal typed_check_lemma_right_unfold_repeat1_ok : Valid
-[wp] [Qed] Goal typed_check_lemma_right_unfold_repeat2_ok : Valid
-[wp] [Qed] Goal typed_check_lemma_subsequence1_ok : Valid
+[wp] [Valid] typed_lemma_access_16_16_ok (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_access_4_4_ok (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_access_repeat_concat_3_ok_lack (Alt-Ergo) (Cached)
+[wp] [Valid] typed_check_lemma_constructor_elt_ok (Qed)
+[wp] [Valid] typed_lemma_eq_repeat_concat_3_ok (Qed)
+[wp] [Valid] typed_check_lemma_left_shift_repeat1_ok (Qed)
+[wp] [Valid] typed_check_lemma_left_shift_repeat2_ok (Qed)
+[wp] [Valid] typed_check_lemma_left_unfold_repeat1_ok (Qed)
+[wp] [Valid] typed_check_lemma_left_unfold_repeat2_ok (Qed)
+[wp] [Valid] typed_check_lemma_negative_repeat_ok (Qed)
+[wp] [Valid] typed_check_lemma_not_nil_elt_ok (Qed)
+[wp] [Valid] typed_check_lemma_nth_repeat_1_ok (Qed)
+[wp] [Valid] typed_check_lemma_nth_repeat_2_ok (Qed)
+[wp] [Valid] typed_check_lemma_nth_repeat_3_ok (Qed)
+[wp] [Valid] typed_check_lemma_nth_repeat_4_ok (Qed)
+[wp] [Timeout] typed_check_lemma_nth_repeat_undefined_1_ko (Alt-Ergo) (Cached)
+[wp] [Valid] typed_check_lemma_repeat1_ok (Qed)
+[wp] [Valid] typed_check_lemma_repeat2_ok (Qed)
+[wp] [Valid] typed_check_lemma_repeat_nil_ok (Qed)
+[wp] [Valid] typed_check_lemma_repeat_one_ok (Qed)
+[wp] [Valid] typed_check_lemma_repeat_repeated_ok (Qed)
+[wp] [Valid] typed_check_lemma_right_shift_repeat1_ok (Qed)
+[wp] [Valid] typed_check_lemma_right_shift_repeat2_ok (Qed)
+[wp] [Valid] typed_check_lemma_right_unfold_repeat1_ok (Qed)
+[wp] [Valid] typed_check_lemma_right_unfold_repeat2_ok (Qed)
+[wp] [Valid] typed_check_lemma_subsequence1_ok (Qed)
[wp] Proved goals: 25 / 26
Qed: 22
Alt-Ergo: 3 (unsuccess: 1)
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/nullable.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/nullable.res.oracle
index f79cd54003b..05b73989334 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/nullable.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/nullable.res.oracle
@@ -4,11 +4,11 @@
[wp] Warning: In caveat model with nullable arguments, -wp-(no)-rte shall be explicitly positioned.
[wp] Warning: Missing RTE guards
[wp] 5 goals scheduled
-[wp] [Alt-Ergo] Goal typed_caveat_nullable_coherence_check_must_fail : Unsuccess
-[wp] [Qed] Goal typed_caveat_nullable_coherence_check : Valid
-[wp] [Qed] Goal typed_caveat_nullable_coherence_assigns : Valid
-[wp] [Qed] Goal typed_caveat_nullable_in_context_assigns_part1 : Valid
-[wp] [Qed] Goal typed_caveat_nullable_in_context_assigns_part2 : Valid
+[wp] [Unknown] typed_caveat_nullable_coherence_check_must_fail (Alt-Ergo) (Cached)
+[wp] [Valid] typed_caveat_nullable_coherence_check (Qed)
+[wp] [Valid] typed_caveat_nullable_coherence_assigns (Qed)
+[wp] [Valid] typed_caveat_nullable_in_context_assigns_part1 (Qed)
+[wp] [Valid] typed_caveat_nullable_in_context_assigns_part2 (Qed)
[wp] Proved goals: 4 / 5
Qed: 4
Alt-Ergo: 0 (unsuccess: 1)
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/nullable_ext.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/nullable_ext.res.oracle
index d6d5e047736..927df4ba1d5 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/nullable_ext.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/nullable_ext.res.oracle
@@ -4,12 +4,12 @@
[wp] Warning: In caveat model with nullable arguments, -wp-(no)-rte shall be explicitly positioned.
[wp] Warning: Missing RTE guards
[wp] 6 goals scheduled
-[wp] [Alt-Ergo] Goal typed_caveat_nullable_coherence_check_must_fail : Unsuccess
-[wp] [Qed] Goal typed_caveat_nullable_coherence_check : Valid
-[wp] [Qed] Goal typed_caveat_nullable_coherence_assigns : Valid
-[wp] [Qed] Goal typed_caveat_nullable_in_context_assigns_part1 : Valid
-[wp] [Qed] Goal typed_caveat_nullable_in_context_assigns_part2 : Valid
-[wp] [Qed] Goal typed_caveat_with_declaration_assigns : Valid
+[wp] [Unknown] typed_caveat_nullable_coherence_check_must_fail (Alt-Ergo) (Cached)
+[wp] [Valid] typed_caveat_nullable_coherence_check (Qed)
+[wp] [Valid] typed_caveat_nullable_coherence_assigns (Qed)
+[wp] [Valid] typed_caveat_nullable_in_context_assigns_part1 (Qed)
+[wp] [Valid] typed_caveat_nullable_in_context_assigns_part2 (Qed)
+[wp] [Valid] typed_caveat_with_declaration_assigns (Qed)
[wp] Proved goals: 5 / 6
Qed: 5
Alt-Ergo: 0 (unsuccess: 1)
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/overarray.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/overarray.res.oracle
index a118a81cac6..e8dba00ee9d 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/overarray.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/overarray.res.oracle
@@ -3,18 +3,18 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 12 goals scheduled
-[wp] [Qed] Goal typed_f1_ok_assigns_exit : Valid
-[wp] [Qed] Goal typed_f1_ok_assigns_normal : Valid
-[wp] [Qed] Goal typed_f2_ok_assigns_exit : Valid
-[wp] [Qed] Goal typed_f2_ok_assigns_normal : Valid
-[wp] [Qed] Goal typed_f3_ok_assigns_exit : Valid
-[wp] [Qed] Goal typed_f3_ok_assigns_normal : Valid
-[wp] [Qed] Goal typed_f4_ok_assigns_exit : Valid
-[wp] [Qed] Goal typed_f4_ok_assigns_normal : Valid
-[wp] [Alt-Ergo] Goal typed_f5_ko_assigns_exit : Unsuccess
-[wp] [Alt-Ergo] Goal typed_f5_ko_assigns_normal : Unsuccess
-[wp] [Alt-Ergo] Goal typed_f6_ko_assigns_exit : Unsuccess
-[wp] [Alt-Ergo] Goal typed_f6_ko_assigns_normal : Unsuccess
+[wp] [Valid] typed_f1_ok_assigns_exit (Qed)
+[wp] [Valid] typed_f1_ok_assigns_normal (Qed)
+[wp] [Valid] typed_f2_ok_assigns_exit (Qed)
+[wp] [Valid] typed_f2_ok_assigns_normal (Qed)
+[wp] [Valid] typed_f3_ok_assigns_exit (Qed)
+[wp] [Valid] typed_f3_ok_assigns_normal (Qed)
+[wp] [Valid] typed_f4_ok_assigns_exit (Qed)
+[wp] [Valid] typed_f4_ok_assigns_normal (Qed)
+[wp] [Timeout] typed_f5_ko_assigns_exit (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_f5_ko_assigns_normal (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_f6_ko_assigns_exit (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_f6_ko_assigns_normal (Alt-Ergo) (Cached)
[wp] Proved goals: 8 / 12
Qed: 8
Alt-Ergo: 0 (unsuccess: 4)
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/overassign.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/overassign.res.oracle
index b00c848c420..ccd1a975575 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/overassign.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/overassign.res.oracle
@@ -3,18 +3,18 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 12 goals scheduled
-[wp] [Qed] Goal typed_f1_ok_assigns_exit : Valid
-[wp] [Qed] Goal typed_f1_ok_assigns_normal : Valid
-[wp] [Qed] Goal typed_f2_ok_assigns_exit : Valid
-[wp] [Qed] Goal typed_f2_ok_assigns_normal : Valid
-[wp] [Alt-Ergo] Goal typed_f3_ok_assigns_exit : Valid
-[wp] [Alt-Ergo] Goal typed_f3_ok_assigns_normal : Valid
-[wp] [Alt-Ergo] Goal typed_f4_ok_assigns_exit : Valid
-[wp] [Alt-Ergo] Goal typed_f4_ok_assigns_normal : Valid
-[wp] [Alt-Ergo] Goal typed_f5_ko_assigns_exit : Unsuccess
-[wp] [Alt-Ergo] Goal typed_f5_ko_assigns_normal : Unsuccess
-[wp] [Alt-Ergo] Goal typed_f6_ko_assigns_exit : Unsuccess
-[wp] [Alt-Ergo] Goal typed_f6_ko_assigns_normal : Unsuccess
+[wp] [Valid] typed_f1_ok_assigns_exit (Qed)
+[wp] [Valid] typed_f1_ok_assigns_normal (Qed)
+[wp] [Valid] typed_f2_ok_assigns_exit (Qed)
+[wp] [Valid] typed_f2_ok_assigns_normal (Qed)
+[wp] [Valid] typed_f3_ok_assigns_exit (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f3_ok_assigns_normal (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f4_ok_assigns_exit (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f4_ok_assigns_normal (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_f5_ko_assigns_exit (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_f5_ko_assigns_normal (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_f6_ko_assigns_exit (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_f6_ko_assigns_normal (Alt-Ergo) (Cached)
[wp] Proved goals: 8 / 12
Qed: 4
Alt-Ergo: 4 (unsuccess: 4)
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/overflow2.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/overflow2.res.oracle
index e87a9220cce..9adfa01be1e 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/overflow2.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/overflow2.res.oracle
@@ -3,20 +3,20 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 14 goals scheduled
-[wp] [Qed] Goal typed_pointers_and_companions_ensures_post : Valid
-[wp] [Qed] Goal typed_pointers_and_companions_assert_a01 : Valid
-[wp] [Qed] Goal typed_pointers_and_companions_assert_a02 : Valid
-[wp] [Qed] Goal typed_pointers_and_companions_assert_a03 : Valid
-[wp] [Alt-Ergo] Goal typed_pointers_and_companions_assert_a04 : Valid
-[wp] [Alt-Ergo] Goal typed_pointers_and_companions_assert_a05 : Valid
-[wp] [Qed] Goal typed_pointers_and_companions_assigns : Valid
-[wp] [Qed] Goal typed_pointers_and_companions_ulong_ensures_postul : Valid
-[wp] [Qed] Goal typed_pointers_and_companions_ulong_assert_a06 : Valid
-[wp] [Qed] Goal typed_pointers_and_companions_ulong_assert_a07 : Valid
-[wp] [Qed] Goal typed_pointers_and_companions_ulong_assert_a08 : Valid
-[wp] [Alt-Ergo] Goal typed_pointers_and_companions_ulong_assert_a09 : Valid
-[wp] [Alt-Ergo] Goal typed_pointers_and_companions_ulong_assert_a10 : Valid
-[wp] [Qed] Goal typed_pointers_and_companions_ulong_assigns : Valid
+[wp] [Valid] typed_pointers_and_companions_ensures_post (Qed)
+[wp] [Valid] typed_pointers_and_companions_assert_a01 (Qed)
+[wp] [Valid] typed_pointers_and_companions_assert_a02 (Qed)
+[wp] [Valid] typed_pointers_and_companions_assert_a03 (Qed)
+[wp] [Valid] typed_pointers_and_companions_assert_a04 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_pointers_and_companions_assert_a05 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_pointers_and_companions_assigns (Qed)
+[wp] [Valid] typed_pointers_and_companions_ulong_ensures_postul (Qed)
+[wp] [Valid] typed_pointers_and_companions_ulong_assert_a06 (Qed)
+[wp] [Valid] typed_pointers_and_companions_ulong_assert_a07 (Qed)
+[wp] [Valid] typed_pointers_and_companions_ulong_assert_a08 (Qed)
+[wp] [Valid] typed_pointers_and_companions_ulong_assert_a09 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_pointers_and_companions_ulong_assert_a10 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_pointers_and_companions_ulong_assigns (Qed)
[wp] Proved goals: 14 / 14
Qed: 10
Alt-Ergo: 4
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/params.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/params.res.oracle
index 4422d76ee9d..8cd08ccd224 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/params.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/params.res.oracle
@@ -2,7 +2,7 @@
[kernel] Parsing params.i (no preprocessing)
[wp] Running WP plugin...
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_lemma_lem : Valid
+[wp] [Valid] typed_lemma_lem (Alt-Ergo) (Cached)
[wp] Proved goals: 1 / 1
Qed: 0
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/plet.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/plet.res.oracle
index 67fbb57a51e..9792980c18d 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/plet.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/plet.res.oracle
@@ -2,7 +2,7 @@
[kernel] Parsing plet.i (no preprocessing)
[wp] Running WP plugin...
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_lemma_GOAL : Valid
+[wp] [Valid] typed_lemma_GOAL (Alt-Ergo) (Cached)
[wp] Proved goals: 1 / 1
Qed: 0
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/post_assigns.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/post_assigns.res.oracle
index 204d3559c56..02648990a82 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/post_assigns.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/post_assigns.res.oracle
@@ -3,11 +3,11 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 5 goals scheduled
-[wp] [Qed] Goal typed_receive_ensures : Valid
-[wp] [Qed] Goal typed_receive_assigns_exit_part1 : Valid
-[wp] [Qed] Goal typed_receive_assigns_exit_part2 : Valid
-[wp] [Qed] Goal typed_receive_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_receive_assigns_normal_part2 : Valid
+[wp] [Valid] typed_receive_ensures (Qed)
+[wp] [Valid] typed_receive_assigns_exit_part1 (Qed)
+[wp] [Valid] typed_receive_assigns_exit_part2 (Qed)
+[wp] [Valid] typed_receive_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_receive_assigns_normal_part2 (Qed)
[wp] Proved goals: 5 / 5
Qed: 5
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/post_valid.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/post_valid.res.oracle
index 93440d98a87..97f230ceec4 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/post_valid.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/post_valid.res.oracle
@@ -3,9 +3,9 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 3 goals scheduled
-[wp] [Alt-Ergo] Goal typed_job_ensures_LOCAL : Valid
-[wp] [Alt-Ergo] Goal typed_job_ensures_FORMAL : Unsuccess
-[wp] [Alt-Ergo] Goal typed_job_ensures_GLOBAL : Valid
+[wp] [Valid] typed_job_ensures_LOCAL (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_job_ensures_FORMAL (Alt-Ergo) (Cached)
+[wp] [Valid] typed_job_ensures_GLOBAL (Alt-Ergo) (Cached)
[wp] Proved goals: 2 / 3
Qed: 0
Alt-Ergo: 2 (unsuccess: 1)
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/prenex.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/prenex.res.oracle
index 02ab35a2033..b26479bc666 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/prenex.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/prenex.res.oracle
@@ -3,18 +3,18 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 12 goals scheduled
-[wp] [Alt-Ergo] Goal typed_diag_ensures : Valid
-[wp] [Qed] Goal typed_diag_loop_invariant_I_preserved : Valid
-[wp] [Qed] Goal typed_diag_loop_invariant_I_established : Valid
-[wp] [Alt-Ergo] Goal typed_diag_loop_invariant_PI_preserved : Valid
-[wp] [Qed] Goal typed_diag_loop_invariant_PI_established : Valid
-[wp] [Qed] Goal typed_diag_loop_invariant_J_preserved : Valid
-[wp] [Qed] Goal typed_diag_loop_invariant_J_established : Valid
-[wp] [Alt-Ergo] Goal typed_diag_loop_invariant_PJ_preserved : Valid
-[wp] [Qed] Goal typed_diag_loop_invariant_PJ_established : Valid
-[wp] [Qed] Goal typed_diag_loop_assigns_part1 : Valid
-[wp] [Qed] Goal typed_diag_loop_assigns_part2 : Valid
-[wp] [Qed] Goal typed_diag_loop_assigns_2 : Valid
+[wp] [Valid] typed_diag_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_diag_loop_invariant_I_preserved (Qed)
+[wp] [Valid] typed_diag_loop_invariant_I_established (Qed)
+[wp] [Valid] typed_diag_loop_invariant_PI_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_diag_loop_invariant_PI_established (Qed)
+[wp] [Valid] typed_diag_loop_invariant_J_preserved (Qed)
+[wp] [Valid] typed_diag_loop_invariant_J_established (Qed)
+[wp] [Valid] typed_diag_loop_invariant_PJ_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_diag_loop_invariant_PJ_established (Qed)
+[wp] [Valid] typed_diag_loop_assigns_part1 (Qed)
+[wp] [Valid] typed_diag_loop_assigns_part2 (Qed)
+[wp] [Valid] typed_diag_loop_assigns_2 (Qed)
[wp] Proved goals: 12 / 12
Qed: 9
Alt-Ergo: 3
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/removed.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/removed.res.oracle
index fea81fbc446..ae300b3149e 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/removed.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/removed.res.oracle
@@ -12,7 +12,7 @@
__retres ∈ [-2147483647..2147483647]
[wp] Running WP plugin...
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_main_assert_Eva_signed_overflow : Unsuccess
+[wp] [Timeout] typed_main_assert_Eva_signed_overflow (Alt-Ergo) (Cached)
[wp] Proved goals: 0 / 1
Alt-Ergo: 0 (unsuccess: 1)
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/repeat.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/repeat.res.oracle
index 53ead599403..2862b69e217 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/repeat.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/repeat.res.oracle
@@ -4,53 +4,53 @@
[wp] Warning: Missing RTE guards
[wp] repeat.c:47: Warning: Missing assigns clause (assigns 'everything' instead)
[wp] 47 goals scheduled
-[wp] [Qed] Goal typed_master_ensures : Valid
-[wp] [Qed] Goal typed_master_assigns_exit : Valid
-[wp] [Qed] Goal typed_master_assigns_normal : Valid
-[wp] [Qed] Goal typed_unroll_ensures : Valid
-[wp] [Qed] Goal typed_unroll_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_unroll_loop_invariant_established : Valid
-[wp] [Qed] Goal typed_unroll_assigns_exit_part01 : Valid
-[wp] [Qed] Goal typed_unroll_assigns_exit_part02 : Valid
-[wp] [Qed] Goal typed_unroll_assigns_exit_part03 : Valid
-[wp] [Qed] Goal typed_unroll_assigns_exit_part04 : Valid
-[wp] [Qed] Goal typed_unroll_assigns_exit_part05 : Valid
-[wp] [Qed] Goal typed_unroll_assigns_exit_part06 : Valid
-[wp] [Qed] Goal typed_unroll_assigns_exit_part07 : Valid
-[wp] [Qed] Goal typed_unroll_assigns_exit_part08 : Valid
-[wp] [Qed] Goal typed_unroll_assigns_exit_part09 : Valid
-[wp] [Qed] Goal typed_unroll_assigns_exit_part10 : Valid
-[wp] [Qed] Goal typed_unroll_assigns_exit_part11 : Valid
-[wp] [Qed] Goal typed_unroll_assigns_normal_part01 : Valid
-[wp] [Qed] Goal typed_unroll_assigns_normal_part02 : Valid
-[wp] [Qed] Goal typed_unroll_assigns_normal_part03 : Valid
-[wp] [Qed] Goal typed_unroll_assigns_normal_part04 : Valid
-[wp] [Qed] Goal typed_unroll_assigns_normal_part05 : Valid
-[wp] [Qed] Goal typed_unroll_assigns_normal_part06 : Valid
-[wp] [Qed] Goal typed_unroll_assigns_normal_part07 : Valid
-[wp] [Qed] Goal typed_unroll_assigns_normal_part08 : Valid
-[wp] [Qed] Goal typed_unroll_assigns_normal_part09 : Valid
-[wp] [Qed] Goal typed_unroll_assigns_normal_part10 : Valid
-[wp] [Qed] Goal typed_unroll_assigns_normal_part11 : Valid
-[wp] [Qed] Goal typed_induction_ensures : Valid
-[wp] [Qed] Goal typed_induction_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_induction_loop_invariant_established : Valid
-[wp] [Alt-Ergo] Goal typed_induction_loop_invariant_2_preserved : Valid
-[wp] [Qed] Goal typed_induction_loop_invariant_2_established : Valid
-[wp] [Qed] Goal typed_induction_loop_assigns : Valid
-[wp] [Qed] Goal typed_induction_assigns_exit_part1 : Valid
-[wp] [Qed] Goal typed_induction_assigns_exit_part2 : Valid
-[wp] [Qed] Goal typed_induction_assigns_normal : Valid
-[wp] [Alt-Ergo] Goal typed_shifted_ensures : Valid
-[wp] [Qed] Goal typed_shifted_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_shifted_loop_invariant_established : Valid
-[wp] [Alt-Ergo] Goal typed_shifted_loop_invariant_2_preserved : Valid
-[wp] [Qed] Goal typed_shifted_loop_invariant_2_established : Valid
-[wp] [Qed] Goal typed_shifted_loop_assigns : Valid
-[wp] [Qed] Goal typed_shifted_assigns_exit_part1 : Valid
-[wp] [Qed] Goal typed_shifted_assigns_exit_part2 : Valid
-[wp] [Qed] Goal typed_shifted_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_shifted_assigns_normal_part2 : Valid
+[wp] [Valid] typed_master_ensures (Qed)
+[wp] [Valid] typed_master_assigns_exit (Qed)
+[wp] [Valid] typed_master_assigns_normal (Qed)
+[wp] [Valid] typed_unroll_ensures (Qed)
+[wp] [Valid] typed_unroll_loop_invariant_preserved (Qed)
+[wp] [Valid] typed_unroll_loop_invariant_established (Qed)
+[wp] [Valid] typed_unroll_assigns_exit_part01 (Qed)
+[wp] [Valid] typed_unroll_assigns_exit_part02 (Qed)
+[wp] [Valid] typed_unroll_assigns_exit_part03 (Qed)
+[wp] [Valid] typed_unroll_assigns_exit_part04 (Qed)
+[wp] [Valid] typed_unroll_assigns_exit_part05 (Qed)
+[wp] [Valid] typed_unroll_assigns_exit_part06 (Qed)
+[wp] [Valid] typed_unroll_assigns_exit_part07 (Qed)
+[wp] [Valid] typed_unroll_assigns_exit_part08 (Qed)
+[wp] [Valid] typed_unroll_assigns_exit_part09 (Qed)
+[wp] [Valid] typed_unroll_assigns_exit_part10 (Qed)
+[wp] [Valid] typed_unroll_assigns_exit_part11 (Qed)
+[wp] [Valid] typed_unroll_assigns_normal_part01 (Qed)
+[wp] [Valid] typed_unroll_assigns_normal_part02 (Qed)
+[wp] [Valid] typed_unroll_assigns_normal_part03 (Qed)
+[wp] [Valid] typed_unroll_assigns_normal_part04 (Qed)
+[wp] [Valid] typed_unroll_assigns_normal_part05 (Qed)
+[wp] [Valid] typed_unroll_assigns_normal_part06 (Qed)
+[wp] [Valid] typed_unroll_assigns_normal_part07 (Qed)
+[wp] [Valid] typed_unroll_assigns_normal_part08 (Qed)
+[wp] [Valid] typed_unroll_assigns_normal_part09 (Qed)
+[wp] [Valid] typed_unroll_assigns_normal_part10 (Qed)
+[wp] [Valid] typed_unroll_assigns_normal_part11 (Qed)
+[wp] [Valid] typed_induction_ensures (Qed)
+[wp] [Valid] typed_induction_loop_invariant_preserved (Qed)
+[wp] [Valid] typed_induction_loop_invariant_established (Qed)
+[wp] [Valid] typed_induction_loop_invariant_2_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_induction_loop_invariant_2_established (Qed)
+[wp] [Valid] typed_induction_loop_assigns (Qed)
+[wp] [Valid] typed_induction_assigns_exit_part1 (Qed)
+[wp] [Valid] typed_induction_assigns_exit_part2 (Qed)
+[wp] [Valid] typed_induction_assigns_normal (Qed)
+[wp] [Valid] typed_shifted_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_shifted_loop_invariant_preserved (Qed)
+[wp] [Valid] typed_shifted_loop_invariant_established (Qed)
+[wp] [Valid] typed_shifted_loop_invariant_2_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_shifted_loop_invariant_2_established (Qed)
+[wp] [Valid] typed_shifted_loop_assigns (Qed)
+[wp] [Valid] typed_shifted_assigns_exit_part1 (Qed)
+[wp] [Valid] typed_shifted_assigns_exit_part2 (Qed)
+[wp] [Valid] typed_shifted_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_shifted_assigns_normal_part2 (Qed)
[wp] Proved goals: 47 / 47
Qed: 44
Alt-Ergo: 3
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/rte.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/rte.res.oracle
index ec2f967233c..961feb9f38f 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/rte.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/rte.res.oracle
@@ -5,12 +5,12 @@
[rte:annot] annotating function job2
[rte:annot] annotating function job3
[wp] 6 goals scheduled
-[wp] [Alt-Ergo] Goal typed_job_assert_rte_mem_access : Unsuccess
-[wp] [Alt-Ergo] Goal typed_job_assert_rte_mem_access_2 : Valid
-[wp] [Alt-Ergo] Goal typed_job_assert_rte_signed_overflow : Unsuccess
-[wp] [Alt-Ergo] Goal typed_job_assert_rte_signed_overflow_2 : Unsuccess
-[wp] [Qed] Goal typed_job_assert_rte_mem_access_3 : Valid
-[wp] [Alt-Ergo] Goal typed_job3_assert_rte_bool_value : Valid
+[wp] [Timeout] typed_job_assert_rte_mem_access (Alt-Ergo) (Cached)
+[wp] [Valid] typed_job_assert_rte_mem_access_2 (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_job_assert_rte_signed_overflow (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_job_assert_rte_signed_overflow_2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_job_assert_rte_mem_access_3 (Qed)
+[wp] [Valid] typed_job3_assert_rte_bool_value (Alt-Ergo) (Cached)
[wp] Proved goals: 3 / 6
Qed: 1
Alt-Ergo: 2 (unsuccess: 3)
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.res.oracle
index 890caa285aa..9db1b916d10 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.res.oracle
@@ -3,45 +3,45 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 39 goals scheduled
-[wp] [Qed] Goal typed_caveat_no_calls_ensures_ok_m1 : Valid
-[wp] [Alt-Ergo] Goal typed_caveat_no_calls_ensures_ok_m2 : Valid
-[wp] [Qed] Goal typed_caveat_no_calls_ensures_ok_bug_why3_n1 : Valid
-[wp] [Alt-Ergo] Goal typed_caveat_no_calls_ensures_ok_n2 : Valid
-[wp] [Alt-Ergo] Goal typed_caveat_no_calls_ensures_ok_n3 : Valid
-[wp] [Alt-Ergo] Goal typed_caveat_no_calls_ensures_ok_bug_why3_n5 : Valid
-[wp] [Qed] Goal typed_caveat_no_calls_ensures_ok_bug_why3_n6 : Valid
-[wp] [Alt-Ergo] Goal typed_caveat_no_calls_ensures_ok_bug_why3_n5_ok : Valid
-[wp] [Qed] Goal typed_caveat_no_calls_ensures_ok_bug_why3_n6_ok : Valid
-[wp] [Qed] Goal typed_caveat_no_calls_assigns : Valid
-[wp] [Qed] Goal typed_caveat_sequence_assigns_exit : Valid
-[wp] [Qed] Goal typed_caveat_sequence_assigns_normal : Valid
-[wp] [Qed] Goal typed_caveat_sequence_g_called_ensures_ok_o1 : Valid
-[wp] [Qed] Goal typed_caveat_sequence_g_called_ensures_ok_p1 : Valid
-[wp] [Qed] Goal typed_caveat_sequence_g_called_ensures_ok_p2 : Valid
-[wp] [Alt-Ergo] Goal typed_caveat_sequence_g_called_ensures_ok_p3 : Valid
-[wp] [Qed] Goal typed_caveat_sequence_g_not_called_ensures_ok_o2 : Valid
-[wp] [Qed] Goal typed_caveat_sequence_g_not_called_ensures_ok_q1 : Valid
-[wp] [Qed] Goal typed_caveat_sequence_g_not_called_ensures_ok_q2 : Valid
-[wp] [Alt-Ergo] Goal typed_caveat_sequence_g_not_called_ensures_ok_q3 : Valid
-[wp] [Qed] Goal typed_caveat_loops_ensures_ok_first : Valid
-[wp] [Alt-Ergo] Goal typed_caveat_loops_ensures_ok_last : Valid
-[wp] [Qed] Goal typed_caveat_loops_loop_invariant_ok_id_max_preserved : Valid
-[wp] [Qed] Goal typed_caveat_loops_loop_invariant_ok_id_max_established : Valid
-[wp] [Qed] Goal typed_caveat_loops_loop_invariant_ok_id_min_preserved : Valid
-[wp] [Qed] Goal typed_caveat_loops_loop_invariant_ok_id_min_established : Valid
-[wp] [Alt-Ergo] Goal typed_caveat_loops_loop_invariant_ok_inv_preserved : Valid
-[wp] [Qed] Goal typed_caveat_loops_loop_invariant_ok_inv_established : Valid
-[wp] [Qed] Goal typed_caveat_loops_loop_assigns : Valid
-[wp] [Qed] Goal typed_caveat_loops_assigns_exit_part1 : Valid
-[wp] [Qed] Goal typed_caveat_loops_assigns_exit_part2 : Valid
-[wp] [Qed] Goal typed_caveat_loops_assigns_exit_part3 : Valid
-[wp] [Qed] Goal typed_caveat_loops_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_caveat_loops_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_caveat_loops_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_caveat_loops_g_called_ensures_ok_u1 : Valid
-[wp] [Qed] Goal typed_caveat_loops_g_called_ensures_ok_u2 : Valid
-[wp] [Alt-Ergo] Goal typed_caveat_loops_g_not_called_ensures_ok_v1 : Valid
-[wp] [Alt-Ergo] Goal typed_caveat_loops_g_not_called_ensures_ok_v2 : Valid
+[wp] [Valid] typed_caveat_no_calls_ensures_ok_m1 (Qed)
+[wp] [Valid] typed_caveat_no_calls_ensures_ok_m2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_caveat_no_calls_ensures_ok_bug_why3_n1 (Qed)
+[wp] [Valid] typed_caveat_no_calls_ensures_ok_n2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_caveat_no_calls_ensures_ok_n3 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_caveat_no_calls_ensures_ok_bug_why3_n5 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_caveat_no_calls_ensures_ok_bug_why3_n6 (Qed)
+[wp] [Valid] typed_caveat_no_calls_ensures_ok_bug_why3_n5_ok (Alt-Ergo) (Cached)
+[wp] [Valid] typed_caveat_no_calls_ensures_ok_bug_why3_n6_ok (Qed)
+[wp] [Valid] typed_caveat_no_calls_assigns (Qed)
+[wp] [Valid] typed_caveat_sequence_assigns_exit (Qed)
+[wp] [Valid] typed_caveat_sequence_assigns_normal (Qed)
+[wp] [Valid] typed_caveat_sequence_g_called_ensures_ok_o1 (Qed)
+[wp] [Valid] typed_caveat_sequence_g_called_ensures_ok_p1 (Qed)
+[wp] [Valid] typed_caveat_sequence_g_called_ensures_ok_p2 (Qed)
+[wp] [Valid] typed_caveat_sequence_g_called_ensures_ok_p3 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_caveat_sequence_g_not_called_ensures_ok_o2 (Qed)
+[wp] [Valid] typed_caveat_sequence_g_not_called_ensures_ok_q1 (Qed)
+[wp] [Valid] typed_caveat_sequence_g_not_called_ensures_ok_q2 (Qed)
+[wp] [Valid] typed_caveat_sequence_g_not_called_ensures_ok_q3 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_caveat_loops_ensures_ok_first (Qed)
+[wp] [Valid] typed_caveat_loops_ensures_ok_last (Alt-Ergo) (Cached)
+[wp] [Valid] typed_caveat_loops_loop_invariant_ok_id_max_preserved (Qed)
+[wp] [Valid] typed_caveat_loops_loop_invariant_ok_id_max_established (Qed)
+[wp] [Valid] typed_caveat_loops_loop_invariant_ok_id_min_preserved (Qed)
+[wp] [Valid] typed_caveat_loops_loop_invariant_ok_id_min_established (Qed)
+[wp] [Valid] typed_caveat_loops_loop_invariant_ok_inv_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_caveat_loops_loop_invariant_ok_inv_established (Qed)
+[wp] [Valid] typed_caveat_loops_loop_assigns (Qed)
+[wp] [Valid] typed_caveat_loops_assigns_exit_part1 (Qed)
+[wp] [Valid] typed_caveat_loops_assigns_exit_part2 (Qed)
+[wp] [Valid] typed_caveat_loops_assigns_exit_part3 (Qed)
+[wp] [Valid] typed_caveat_loops_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_caveat_loops_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_caveat_loops_assigns_normal_part3 (Qed)
+[wp] [Valid] typed_caveat_loops_g_called_ensures_ok_u1 (Qed)
+[wp] [Valid] typed_caveat_loops_g_called_ensures_ok_u2 (Qed)
+[wp] [Valid] typed_caveat_loops_g_not_called_ensures_ok_v1 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_caveat_loops_g_not_called_ensures_ok_v2 (Alt-Ergo) (Cached)
[wp] Proved goals: 39 / 39
Qed: 28
Alt-Ergo: 11
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.res.oracle
index 8c504062e5a..7c1076bfbac 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.res.oracle
@@ -3,40 +3,40 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 34 goals scheduled
-[wp] [Qed] Goal typed_caveat_no_calls_ensures_ok_m1 : Valid
-[wp] [Alt-Ergo] Goal typed_caveat_no_calls_ensures_ok_m2 : Valid
-[wp] [Alt-Ergo] Goal typed_caveat_no_calls_ensures_ok_n2 : Valid
-[wp] [Alt-Ergo] Goal typed_caveat_no_calls_ensures_ok_n3 : Valid
-[wp] [Qed] Goal typed_caveat_no_calls_assigns : Valid
-[wp] [Qed] Goal typed_caveat_sequence_assigns_exit : Valid
-[wp] [Qed] Goal typed_caveat_sequence_assigns_normal : Valid
-[wp] [Qed] Goal typed_caveat_sequence_g_called_ensures_ok_o1 : Valid
-[wp] [Qed] Goal typed_caveat_sequence_g_called_ensures_ok_p1 : Valid
-[wp] [Qed] Goal typed_caveat_sequence_g_called_ensures_ok_p2 : Valid
-[wp] [Alt-Ergo] Goal typed_caveat_sequence_g_called_ensures_ok_p3 : Valid
-[wp] [Qed] Goal typed_caveat_sequence_g_not_called_ensures_ok_o2 : Valid
-[wp] [Qed] Goal typed_caveat_sequence_g_not_called_ensures_ok_q1 : Valid
-[wp] [Qed] Goal typed_caveat_sequence_g_not_called_ensures_ok_q2 : Valid
-[wp] [Alt-Ergo] Goal typed_caveat_sequence_g_not_called_ensures_ok_q3 : Valid
-[wp] [Qed] Goal typed_caveat_loops_ensures_ok_first : Valid
-[wp] [Alt-Ergo] Goal typed_caveat_loops_ensures_ok_last : Valid
-[wp] [Qed] Goal typed_caveat_loops_loop_invariant_ok_id_max_preserved : Valid
-[wp] [Qed] Goal typed_caveat_loops_loop_invariant_ok_id_max_established : Valid
-[wp] [Qed] Goal typed_caveat_loops_loop_invariant_ok_id_min_preserved : Valid
-[wp] [Qed] Goal typed_caveat_loops_loop_invariant_ok_id_min_established : Valid
-[wp] [Alt-Ergo] Goal typed_caveat_loops_loop_invariant_ok_inv_preserved : Valid
-[wp] [Qed] Goal typed_caveat_loops_loop_invariant_ok_inv_established : Valid
-[wp] [Qed] Goal typed_caveat_loops_loop_assigns : Valid
-[wp] [Qed] Goal typed_caveat_loops_assigns_exit_part1 : Valid
-[wp] [Qed] Goal typed_caveat_loops_assigns_exit_part2 : Valid
-[wp] [Qed] Goal typed_caveat_loops_assigns_exit_part3 : Valid
-[wp] [Qed] Goal typed_caveat_loops_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_caveat_loops_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_caveat_loops_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_caveat_loops_g_called_ensures_ok_u1 : Valid
-[wp] [Qed] Goal typed_caveat_loops_g_called_ensures_ok_u2 : Valid
-[wp] [Alt-Ergo] Goal typed_caveat_loops_g_not_called_ensures_ok_v1 : Valid
-[wp] [Alt-Ergo] Goal typed_caveat_loops_g_not_called_ensures_ok_v2 : Valid
+[wp] [Valid] typed_caveat_no_calls_ensures_ok_m1 (Qed)
+[wp] [Valid] typed_caveat_no_calls_ensures_ok_m2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_caveat_no_calls_ensures_ok_n2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_caveat_no_calls_ensures_ok_n3 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_caveat_no_calls_assigns (Qed)
+[wp] [Valid] typed_caveat_sequence_assigns_exit (Qed)
+[wp] [Valid] typed_caveat_sequence_assigns_normal (Qed)
+[wp] [Valid] typed_caveat_sequence_g_called_ensures_ok_o1 (Qed)
+[wp] [Valid] typed_caveat_sequence_g_called_ensures_ok_p1 (Qed)
+[wp] [Valid] typed_caveat_sequence_g_called_ensures_ok_p2 (Qed)
+[wp] [Valid] typed_caveat_sequence_g_called_ensures_ok_p3 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_caveat_sequence_g_not_called_ensures_ok_o2 (Qed)
+[wp] [Valid] typed_caveat_sequence_g_not_called_ensures_ok_q1 (Qed)
+[wp] [Valid] typed_caveat_sequence_g_not_called_ensures_ok_q2 (Qed)
+[wp] [Valid] typed_caveat_sequence_g_not_called_ensures_ok_q3 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_caveat_loops_ensures_ok_first (Qed)
+[wp] [Valid] typed_caveat_loops_ensures_ok_last (Alt-Ergo) (Cached)
+[wp] [Valid] typed_caveat_loops_loop_invariant_ok_id_max_preserved (Qed)
+[wp] [Valid] typed_caveat_loops_loop_invariant_ok_id_max_established (Qed)
+[wp] [Valid] typed_caveat_loops_loop_invariant_ok_id_min_preserved (Qed)
+[wp] [Valid] typed_caveat_loops_loop_invariant_ok_id_min_established (Qed)
+[wp] [Valid] typed_caveat_loops_loop_invariant_ok_inv_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_caveat_loops_loop_invariant_ok_inv_established (Qed)
+[wp] [Valid] typed_caveat_loops_loop_assigns (Qed)
+[wp] [Valid] typed_caveat_loops_assigns_exit_part1 (Qed)
+[wp] [Valid] typed_caveat_loops_assigns_exit_part2 (Qed)
+[wp] [Valid] typed_caveat_loops_assigns_exit_part3 (Qed)
+[wp] [Valid] typed_caveat_loops_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_caveat_loops_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_caveat_loops_assigns_normal_part3 (Qed)
+[wp] [Valid] typed_caveat_loops_g_called_ensures_ok_u1 (Qed)
+[wp] [Valid] typed_caveat_loops_g_called_ensures_ok_u2 (Qed)
+[wp] [Valid] typed_caveat_loops_g_not_called_ensures_ok_v1 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_caveat_loops_g_not_called_ensures_ok_v2 (Alt-Ergo) (Cached)
[wp] Proved goals: 34 / 34
Qed: 25
Alt-Ergo: 9
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.res.oracle
index 3d41a25d957..bc3e371b93c 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.res.oracle
@@ -3,50 +3,50 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 44 goals scheduled
-[wp] [Alt-Ergo] Goal typed_memcpy_ensures_copied_contents : Valid
-[wp] [Qed] Goal typed_memcpy_ensures_result_ptr : Valid
-[wp] [Alt-Ergo] Goal typed_memcpy_loop_invariant_no_eva_preserved : Valid
-[wp] [Qed] Goal typed_memcpy_loop_invariant_no_eva_established : Valid
-[wp] [Alt-Ergo] Goal typed_memcpy_loop_invariant_no_eva_2_preserved : Valid
-[wp] [Qed] Goal typed_memcpy_loop_invariant_no_eva_2_established : Valid
-[wp] [Qed] Goal typed_memcpy_loop_assigns_part1 : Valid
-[wp] [Qed] Goal typed_memcpy_loop_assigns_part2 : Valid
-[wp] [Alt-Ergo] Goal typed_memcpy_loop_assigns_part3 : Valid
-[wp] [Qed] Goal typed_memcpy_assigns : Valid
-[wp] [Alt-Ergo] Goal typed_memcpy_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_memcpy_loop_variant_positive : Valid
-[wp] [Alt-Ergo] Goal typed_memmove_ensures_copied_contents : Valid
-[wp] [Qed] Goal typed_memmove_ensures_result_ptr : Valid
-[wp] [Alt-Ergo] Goal typed_memmove_loop_invariant_no_eva_preserved : Valid
-[wp] [Qed] Goal typed_memmove_loop_invariant_no_eva_established : Valid
-[wp] [Alt-Ergo] Goal typed_memmove_loop_invariant_no_eva_2_preserved : Valid
-[wp] [Qed] Goal typed_memmove_loop_invariant_no_eva_2_established : Valid
-[wp] [Alt-Ergo] Goal typed_memmove_loop_invariant_no_eva_3_preserved : Valid
-[wp] [Qed] Goal typed_memmove_loop_invariant_no_eva_3_established : Valid
-[wp] [Alt-Ergo] Goal typed_memmove_loop_invariant_no_eva_4_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_memmove_loop_invariant_no_eva_4_established : Valid
-[wp] [Alt-Ergo] Goal typed_memmove_loop_invariant_no_eva_5_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_memmove_loop_invariant_no_eva_5_established : Valid
-[wp] [Alt-Ergo] Goal typed_memmove_loop_invariant_no_eva_6_preserved : Valid
-[wp] [Qed] Goal typed_memmove_loop_invariant_no_eva_6_established : Valid
-[wp] [Qed] Goal typed_memmove_loop_assigns_part1 : Valid
-[wp] [Qed] Goal typed_memmove_loop_assigns_part2 : Valid
-[wp] [Alt-Ergo] Goal typed_memmove_loop_assigns_part3 : Valid
-[wp] [Qed] Goal typed_memmove_loop_assigns_2_part1 : Valid
-[wp] [Qed] Goal typed_memmove_loop_assigns_2_part2 : Valid
-[wp] [Alt-Ergo] Goal typed_memmove_loop_assigns_2_part3 : Valid
-[wp] [Qed] Goal typed_memmove_assigns_exit : Valid
-[wp] [Qed] Goal typed_memmove_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_memmove_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_memmove_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_memmove_assigns_normal_part4 : Valid
-[wp] [Qed] Goal typed_memmove_assigns_normal_part5 : Valid
-[wp] [Qed] Goal typed_memmove_assigns_normal_part6 : Valid
-[wp] [Qed] Goal typed_memmove_assigns_normal_part7 : Valid
-[wp] [Alt-Ergo] Goal typed_memmove_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_memmove_loop_variant_positive : Valid
-[wp] [Alt-Ergo] Goal typed_memmove_loop_variant_2_decrease : Valid
-[wp] [Qed] Goal typed_memmove_loop_variant_2_positive : Valid
+[wp] [Valid] typed_memcpy_ensures_copied_contents (Alt-Ergo) (Cached)
+[wp] [Valid] typed_memcpy_ensures_result_ptr (Qed)
+[wp] [Valid] typed_memcpy_loop_invariant_no_eva_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_memcpy_loop_invariant_no_eva_established (Qed)
+[wp] [Valid] typed_memcpy_loop_invariant_no_eva_2_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_memcpy_loop_invariant_no_eva_2_established (Qed)
+[wp] [Valid] typed_memcpy_loop_assigns_part1 (Qed)
+[wp] [Valid] typed_memcpy_loop_assigns_part2 (Qed)
+[wp] [Valid] typed_memcpy_loop_assigns_part3 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_memcpy_assigns (Qed)
+[wp] [Valid] typed_memcpy_loop_variant_decrease (Alt-Ergo) (Cached)
+[wp] [Valid] typed_memcpy_loop_variant_positive (Qed)
+[wp] [Valid] typed_memmove_ensures_copied_contents (Alt-Ergo) (Cached)
+[wp] [Valid] typed_memmove_ensures_result_ptr (Qed)
+[wp] [Valid] typed_memmove_loop_invariant_no_eva_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_memmove_loop_invariant_no_eva_established (Qed)
+[wp] [Valid] typed_memmove_loop_invariant_no_eva_2_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_memmove_loop_invariant_no_eva_2_established (Qed)
+[wp] [Valid] typed_memmove_loop_invariant_no_eva_3_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_memmove_loop_invariant_no_eva_3_established (Qed)
+[wp] [Valid] typed_memmove_loop_invariant_no_eva_4_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_memmove_loop_invariant_no_eva_4_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_memmove_loop_invariant_no_eva_5_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_memmove_loop_invariant_no_eva_5_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_memmove_loop_invariant_no_eva_6_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_memmove_loop_invariant_no_eva_6_established (Qed)
+[wp] [Valid] typed_memmove_loop_assigns_part1 (Qed)
+[wp] [Valid] typed_memmove_loop_assigns_part2 (Qed)
+[wp] [Valid] typed_memmove_loop_assigns_part3 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_memmove_loop_assigns_2_part1 (Qed)
+[wp] [Valid] typed_memmove_loop_assigns_2_part2 (Qed)
+[wp] [Valid] typed_memmove_loop_assigns_2_part3 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_memmove_assigns_exit (Qed)
+[wp] [Valid] typed_memmove_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_memmove_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_memmove_assigns_normal_part3 (Qed)
+[wp] [Valid] typed_memmove_assigns_normal_part4 (Qed)
+[wp] [Valid] typed_memmove_assigns_normal_part5 (Qed)
+[wp] [Valid] typed_memmove_assigns_normal_part6 (Qed)
+[wp] [Valid] typed_memmove_assigns_normal_part7 (Qed)
+[wp] [Valid] typed_memmove_loop_variant_decrease (Alt-Ergo) (Cached)
+[wp] [Valid] typed_memmove_loop_variant_positive (Qed)
+[wp] [Valid] typed_memmove_loop_variant_2_decrease (Alt-Ergo) (Cached)
+[wp] [Valid] typed_memmove_loop_variant_2_positive (Qed)
[wp] Proved goals: 44 / 44
Qed: 26
Alt-Ergo: 18
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/struct.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/struct.res.oracle
index fca0d689320..fdb934a98d4 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/struct.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/struct.res.oracle
@@ -3,24 +3,24 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 18 goals scheduled
-[wp] [Qed] Goal typed_id_ensures_qed_ok_P1 : Valid
-[wp] [Qed] Goal typed_id_ensures_qed_ok_P2 : Valid
-[wp] [Qed] Goal typed_g_ensures_qed_ok_P3 : Valid
-[wp] [Qed] Goal typed_g_ensures_qed_ok_P4 : Valid
-[wp] [Qed] Goal typed_g_ensures_qed_ok_P5 : Valid
-[wp] [Qed] Goal typed_g_assigns : Valid
-[wp] [Qed] Goal typed_f_ensures_qed_ok_E0 : Valid
-[wp] [Qed] Goal typed_f_ensures_qed_ok_E1 : Valid
-[wp] [Qed] Goal typed_f_ensures_qed_ok_E2 : Valid
-[wp] [Qed] Goal typed_f_ensures_qed_ok_E3 : Valid
-[wp] [Qed] Goal typed_f_ensures_qed_ok_E4 : Valid
-[wp] [Qed] Goal typed_f_ensures_qed_ok_E5 : Valid
-[wp] [Qed] Goal typed_f_ensures_qed_ok_E6 : Valid
-[wp] [Qed] Goal typed_f_ensures_qed_ok_E7 : Valid
-[wp] [Qed] Goal typed_f_ensures_qed_ok_E8 : Valid
-[wp] [Qed] Goal typed_f_ensures_qed_ok_E9 : Valid
-[wp] [Qed] Goal typed_f_ensures_qed_ok_E10 : Valid
-[wp] [Qed] Goal typed_f_ensures_qed_ok_E11 : Valid
+[wp] [Valid] typed_id_ensures_qed_ok_P1 (Qed)
+[wp] [Valid] typed_id_ensures_qed_ok_P2 (Qed)
+[wp] [Valid] typed_g_ensures_qed_ok_P3 (Qed)
+[wp] [Valid] typed_g_ensures_qed_ok_P4 (Qed)
+[wp] [Valid] typed_g_ensures_qed_ok_P5 (Qed)
+[wp] [Valid] typed_g_assigns (Qed)
+[wp] [Valid] typed_f_ensures_qed_ok_E0 (Qed)
+[wp] [Valid] typed_f_ensures_qed_ok_E1 (Qed)
+[wp] [Valid] typed_f_ensures_qed_ok_E2 (Qed)
+[wp] [Valid] typed_f_ensures_qed_ok_E3 (Qed)
+[wp] [Valid] typed_f_ensures_qed_ok_E4 (Qed)
+[wp] [Valid] typed_f_ensures_qed_ok_E5 (Qed)
+[wp] [Valid] typed_f_ensures_qed_ok_E6 (Qed)
+[wp] [Valid] typed_f_ensures_qed_ok_E7 (Qed)
+[wp] [Valid] typed_f_ensures_qed_ok_E8 (Qed)
+[wp] [Valid] typed_f_ensures_qed_ok_E9 (Qed)
+[wp] [Valid] typed_f_ensures_qed_ok_E10 (Qed)
+[wp] [Valid] typed_f_ensures_qed_ok_E11 (Qed)
[wp] Proved goals: 18 / 18
Qed: 18
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/struct_hack.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/struct_hack.res.oracle
index beb7d0635eb..5cecb4e7313 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/struct_hack.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/struct_hack.res.oracle
@@ -9,16 +9,16 @@
[wp] struct_hack.i:53: Warning:
Missing assigns clause (assigns 'everything' instead)
[wp] 10 goals scheduled
-[wp] [Alt-Ergo] Goal typed_f0_loop_invariant_qed_ok_preserved : Valid
-[wp] [Qed] Goal typed_f0_loop_invariant_qed_ok_established : Valid
-[wp] [Alt-Ergo] Goal typed_f0_assert_qed_ok : Valid
-[wp] [Qed] Goal typed_f0_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_f0_loop_variant_positive : Valid
-[wp] [Alt-Ergo] Goal typed_f1_loop_invariant_qed_ok_preserved : Valid
-[wp] [Qed] Goal typed_f1_loop_invariant_qed_ok_established : Valid
-[wp] [Alt-Ergo] Goal typed_f1_assert_qed_ok : Valid
-[wp] [Qed] Goal typed_f1_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_f1_loop_variant_positive : Valid
+[wp] [Valid] typed_f0_loop_invariant_qed_ok_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f0_loop_invariant_qed_ok_established (Qed)
+[wp] [Valid] typed_f0_assert_qed_ok (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f0_loop_variant_decrease (Qed)
+[wp] [Valid] typed_f0_loop_variant_positive (Qed)
+[wp] [Valid] typed_f1_loop_invariant_qed_ok_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f1_loop_invariant_qed_ok_established (Qed)
+[wp] [Valid] typed_f1_assert_qed_ok (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f1_loop_variant_decrease (Qed)
+[wp] [Valid] typed_f1_loop_variant_positive (Qed)
[wp] Proved goals: 10 / 10
Qed: 6
Alt-Ergo: 4
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/subset.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/subset.res.oracle
index 1f30109b1df..773846aa932 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/subset.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/subset.res.oracle
@@ -3,7 +3,7 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_mem_ensures : Valid
+[wp] [Valid] typed_mem_ensures (Alt-Ergo) (Cached)
[wp] Proved goals: 1 / 1
Qed: 0
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/subset_fopen.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/subset_fopen.res.oracle
index ed8617796b3..ed54b903a24 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/subset_fopen.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/subset_fopen.res.oracle
@@ -3,11 +3,11 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 5 goals scheduled
-[wp] [Alt-Ergo] Goal typed_f_assert_Ok_A : Unsuccess
-[wp] [Qed] Goal typed_f_assert_Ok_B : Valid
-[wp] [Qed] Goal typed_f_assert_Ok_C : Valid
-[wp] [Qed] Goal typed_f_assert_Ok_D : Valid
-[wp] [Alt-Ergo] Goal typed_f_assert_Ok_E : Valid
+[wp] [Timeout] typed_f_assert_Ok_A (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_assert_Ok_B (Qed)
+[wp] [Valid] typed_f_assert_Ok_C (Qed)
+[wp] [Valid] typed_f_assert_Ok_D (Qed)
+[wp] [Valid] typed_f_assert_Ok_E (Alt-Ergo) (Cached)
[wp] Proved goals: 4 / 5
Qed: 3
Alt-Ergo: 1 (unsuccess: 1)
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/trig.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/trig.res.oracle
index 8c40c5d7ac8..fd39557b581 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/trig.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/trig.res.oracle
@@ -3,10 +3,10 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 4 goals scheduled
-[wp] [Alt-Ergo] Goal typed_foo_assert_ok_S : Valid
-[wp] [Alt-Ergo] Goal typed_foo_assert_ok_A : Valid
-[wp] [Alt-Ergo] Goal typed_foo_assert_ok_B : Unsuccess
-[wp] [Qed] Goal typed_foo_call_fconcat_requires_qed_ok : Valid
+[wp] [Valid] typed_foo_assert_ok_S (Alt-Ergo) (Cached)
+[wp] [Valid] typed_foo_assert_ok_A (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_foo_assert_ok_B (Alt-Ergo) (Cached)
+[wp] [Valid] typed_foo_call_fconcat_requires_qed_ok (Qed)
[wp] Proved goals: 3 / 4
Qed: 1
Alt-Ergo: 2 (unsuccess: 1)
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/unfold_assigns.0.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/unfold_assigns.0.res.oracle
index f36d08b530a..2df94fb87ae 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/unfold_assigns.0.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/unfold_assigns.0.res.oracle
@@ -3,34 +3,34 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 28 goals scheduled
-[wp] [Qed] Goal typed_NO_UNFOLD_OK_1_assigns_exit : Valid
-[wp] [Qed] Goal typed_NO_UNFOLD_OK_1_assigns_normal : Valid
-[wp] [Qed] Goal typed_NO_UNFOLD_OK_2_assigns_exit : Valid
-[wp] [Qed] Goal typed_NO_UNFOLD_OK_2_assigns_normal : Valid
-[wp] [Qed] Goal typed_NO_UNFOLD_OK_3_assigns_exit : Valid
-[wp] [Qed] Goal typed_NO_UNFOLD_OK_3_assigns_normal : Valid
-[wp] [Qed] Goal typed_NO_UNFOLD_KO_assigns_exit : Valid
-[wp] [Qed] Goal typed_NO_UNFOLD_KO_assigns_normal : Valid
-[wp] [Alt-Ergo] Goal typed_USE_ASSIGN_UNFOLD_OK_ensures : Valid
-[wp] [Qed] Goal typed_USE_ASSIGN_UNFOLD_OK_assigns_exit : Valid
-[wp] [Qed] Goal typed_USE_ASSIGN_UNFOLD_OK_assigns_normal : Valid
-[wp] [Alt-Ergo] Goal typed_USE_ASSIGN_UNFOLD_KO_ensures : Valid
-[wp] [Qed] Goal typed_USE_ASSIGN_UNFOLD_KO_assigns_exit : Valid
-[wp] [Qed] Goal typed_USE_ASSIGN_UNFOLD_KO_assigns_normal : Valid
-[wp] [Qed] Goal typed_ASSIGN_NO_UNFOLD_OK_assigns : Valid
-[wp] [Qed] Goal typed_ASSIGN_NO_UNFOLD_KO_assigns : Valid
-[wp] [Alt-Ergo] Goal typed_PARTIAL_ASSIGNS_STATIC_assigns_exit : Valid
-[wp] [Alt-Ergo] Goal typed_PARTIAL_ASSIGNS_STATIC_assigns_normal : Valid
-[wp] [Alt-Ergo] Goal typed_PARTIAL_ASSIGNS_VARS_assigns_exit : Valid
-[wp] [Alt-Ergo] Goal typed_PARTIAL_ASSIGNS_VARS_assigns_normal : Valid
-[wp] [Qed] Goal typed_NESTED_ARRAY_STATIC_assigns_exit : Valid
-[wp] [Qed] Goal typed_NESTED_ARRAY_STATIC_assigns_normal : Valid
-[wp] [Alt-Ergo] Goal typed_NESTED_ARRAY_VARS_assigns_exit : Valid
-[wp] [Alt-Ergo] Goal typed_NESTED_ARRAY_VARS_assigns_normal : Valid
-[wp] [Alt-Ergo] Goal typed_RANGE_NESTED_ARRAY_STATIC_assigns_exit : Valid
-[wp] [Alt-Ergo] Goal typed_RANGE_NESTED_ARRAY_STATIC_assigns_normal : Valid
-[wp] [Alt-Ergo] Goal typed_RANGE_NESTED_ARRAY_VARS_assigns_exit : Valid
-[wp] [Alt-Ergo] Goal typed_RANGE_NESTED_ARRAY_VARS_assigns_normal : Valid
+[wp] [Valid] typed_NO_UNFOLD_OK_1_assigns_exit (Qed)
+[wp] [Valid] typed_NO_UNFOLD_OK_1_assigns_normal (Qed)
+[wp] [Valid] typed_NO_UNFOLD_OK_2_assigns_exit (Qed)
+[wp] [Valid] typed_NO_UNFOLD_OK_2_assigns_normal (Qed)
+[wp] [Valid] typed_NO_UNFOLD_OK_3_assigns_exit (Qed)
+[wp] [Valid] typed_NO_UNFOLD_OK_3_assigns_normal (Qed)
+[wp] [Valid] typed_NO_UNFOLD_KO_assigns_exit (Qed)
+[wp] [Valid] typed_NO_UNFOLD_KO_assigns_normal (Qed)
+[wp] [Valid] typed_USE_ASSIGN_UNFOLD_OK_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_USE_ASSIGN_UNFOLD_OK_assigns_exit (Qed)
+[wp] [Valid] typed_USE_ASSIGN_UNFOLD_OK_assigns_normal (Qed)
+[wp] [Valid] typed_USE_ASSIGN_UNFOLD_KO_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_USE_ASSIGN_UNFOLD_KO_assigns_exit (Qed)
+[wp] [Valid] typed_USE_ASSIGN_UNFOLD_KO_assigns_normal (Qed)
+[wp] [Valid] typed_ASSIGN_NO_UNFOLD_OK_assigns (Qed)
+[wp] [Valid] typed_ASSIGN_NO_UNFOLD_KO_assigns (Qed)
+[wp] [Valid] typed_PARTIAL_ASSIGNS_STATIC_assigns_exit (Alt-Ergo) (Cached)
+[wp] [Valid] typed_PARTIAL_ASSIGNS_STATIC_assigns_normal (Alt-Ergo) (Cached)
+[wp] [Valid] typed_PARTIAL_ASSIGNS_VARS_assigns_exit (Alt-Ergo) (Cached)
+[wp] [Valid] typed_PARTIAL_ASSIGNS_VARS_assigns_normal (Alt-Ergo) (Cached)
+[wp] [Valid] typed_NESTED_ARRAY_STATIC_assigns_exit (Qed)
+[wp] [Valid] typed_NESTED_ARRAY_STATIC_assigns_normal (Qed)
+[wp] [Valid] typed_NESTED_ARRAY_VARS_assigns_exit (Alt-Ergo) (Cached)
+[wp] [Valid] typed_NESTED_ARRAY_VARS_assigns_normal (Alt-Ergo) (Cached)
+[wp] [Valid] typed_RANGE_NESTED_ARRAY_STATIC_assigns_exit (Alt-Ergo) (Cached)
+[wp] [Valid] typed_RANGE_NESTED_ARRAY_STATIC_assigns_normal (Alt-Ergo) (Cached)
+[wp] [Valid] typed_RANGE_NESTED_ARRAY_VARS_assigns_exit (Alt-Ergo) (Cached)
+[wp] [Valid] typed_RANGE_NESTED_ARRAY_VARS_assigns_normal (Alt-Ergo) (Cached)
[wp] Proved goals: 28 / 28
Qed: 16
Alt-Ergo: 12
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/unfold_assigns.1.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/unfold_assigns.1.res.oracle
index 5dda36501ce..f265d552bc3 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/unfold_assigns.1.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/unfold_assigns.1.res.oracle
@@ -3,34 +3,34 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 28 goals scheduled
-[wp] [Qed] Goal typed_NO_UNFOLD_OK_1_assigns_exit : Valid
-[wp] [Qed] Goal typed_NO_UNFOLD_OK_1_assigns_normal : Valid
-[wp] [Qed] Goal typed_NO_UNFOLD_OK_2_assigns_exit : Valid
-[wp] [Qed] Goal typed_NO_UNFOLD_OK_2_assigns_normal : Valid
-[wp] [Qed] Goal typed_NO_UNFOLD_OK_3_assigns_exit : Valid
-[wp] [Qed] Goal typed_NO_UNFOLD_OK_3_assigns_normal : Valid
-[wp] [Qed] Goal typed_NO_UNFOLD_KO_assigns_exit : Valid
-[wp] [Qed] Goal typed_NO_UNFOLD_KO_assigns_normal : Valid
-[wp] [Alt-Ergo] Goal typed_USE_ASSIGN_UNFOLD_OK_ensures : Valid
-[wp] [Qed] Goal typed_USE_ASSIGN_UNFOLD_OK_assigns_exit : Valid
-[wp] [Qed] Goal typed_USE_ASSIGN_UNFOLD_OK_assigns_normal : Valid
-[wp] [Alt-Ergo] Goal typed_USE_ASSIGN_UNFOLD_KO_ensures : Valid
-[wp] [Qed] Goal typed_USE_ASSIGN_UNFOLD_KO_assigns_exit : Valid
-[wp] [Qed] Goal typed_USE_ASSIGN_UNFOLD_KO_assigns_normal : Valid
-[wp] [Qed] Goal typed_ASSIGN_NO_UNFOLD_OK_assigns : Valid
-[wp] [Qed] Goal typed_ASSIGN_NO_UNFOLD_KO_assigns : Valid
-[wp] [Alt-Ergo] Goal typed_PARTIAL_ASSIGNS_STATIC_assigns_exit : Valid
-[wp] [Alt-Ergo] Goal typed_PARTIAL_ASSIGNS_STATIC_assigns_normal : Valid
-[wp] [Alt-Ergo] Goal typed_PARTIAL_ASSIGNS_VARS_assigns_exit : Valid
-[wp] [Alt-Ergo] Goal typed_PARTIAL_ASSIGNS_VARS_assigns_normal : Valid
-[wp] [Qed] Goal typed_NESTED_ARRAY_STATIC_assigns_exit : Valid
-[wp] [Qed] Goal typed_NESTED_ARRAY_STATIC_assigns_normal : Valid
-[wp] [Alt-Ergo] Goal typed_NESTED_ARRAY_VARS_assigns_exit : Valid
-[wp] [Alt-Ergo] Goal typed_NESTED_ARRAY_VARS_assigns_normal : Valid
-[wp] [Alt-Ergo] Goal typed_RANGE_NESTED_ARRAY_STATIC_assigns_exit : Unsuccess
-[wp] [Alt-Ergo] Goal typed_RANGE_NESTED_ARRAY_STATIC_assigns_normal : Unsuccess
-[wp] [Alt-Ergo] Goal typed_RANGE_NESTED_ARRAY_VARS_assigns_exit : Unsuccess
-[wp] [Alt-Ergo] Goal typed_RANGE_NESTED_ARRAY_VARS_assigns_normal : Unsuccess
+[wp] [Valid] typed_NO_UNFOLD_OK_1_assigns_exit (Qed)
+[wp] [Valid] typed_NO_UNFOLD_OK_1_assigns_normal (Qed)
+[wp] [Valid] typed_NO_UNFOLD_OK_2_assigns_exit (Qed)
+[wp] [Valid] typed_NO_UNFOLD_OK_2_assigns_normal (Qed)
+[wp] [Valid] typed_NO_UNFOLD_OK_3_assigns_exit (Qed)
+[wp] [Valid] typed_NO_UNFOLD_OK_3_assigns_normal (Qed)
+[wp] [Valid] typed_NO_UNFOLD_KO_assigns_exit (Qed)
+[wp] [Valid] typed_NO_UNFOLD_KO_assigns_normal (Qed)
+[wp] [Valid] typed_USE_ASSIGN_UNFOLD_OK_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_USE_ASSIGN_UNFOLD_OK_assigns_exit (Qed)
+[wp] [Valid] typed_USE_ASSIGN_UNFOLD_OK_assigns_normal (Qed)
+[wp] [Valid] typed_USE_ASSIGN_UNFOLD_KO_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_USE_ASSIGN_UNFOLD_KO_assigns_exit (Qed)
+[wp] [Valid] typed_USE_ASSIGN_UNFOLD_KO_assigns_normal (Qed)
+[wp] [Valid] typed_ASSIGN_NO_UNFOLD_OK_assigns (Qed)
+[wp] [Valid] typed_ASSIGN_NO_UNFOLD_KO_assigns (Qed)
+[wp] [Valid] typed_PARTIAL_ASSIGNS_STATIC_assigns_exit (Alt-Ergo) (Cached)
+[wp] [Valid] typed_PARTIAL_ASSIGNS_STATIC_assigns_normal (Alt-Ergo) (Cached)
+[wp] [Valid] typed_PARTIAL_ASSIGNS_VARS_assigns_exit (Alt-Ergo) (Cached)
+[wp] [Valid] typed_PARTIAL_ASSIGNS_VARS_assigns_normal (Alt-Ergo) (Cached)
+[wp] [Valid] typed_NESTED_ARRAY_STATIC_assigns_exit (Qed)
+[wp] [Valid] typed_NESTED_ARRAY_STATIC_assigns_normal (Qed)
+[wp] [Valid] typed_NESTED_ARRAY_VARS_assigns_exit (Alt-Ergo) (Cached)
+[wp] [Valid] typed_NESTED_ARRAY_VARS_assigns_normal (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_RANGE_NESTED_ARRAY_STATIC_assigns_exit (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_RANGE_NESTED_ARRAY_STATIC_assigns_normal (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_RANGE_NESTED_ARRAY_VARS_assigns_exit (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_RANGE_NESTED_ARRAY_VARS_assigns_normal (Alt-Ergo) (Cached)
[wp] Proved goals: 24 / 28
Qed: 16
Alt-Ergo: 8 (unsuccess: 4)
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/unfold_assigns.2.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/unfold_assigns.2.res.oracle
index 0a4ba7ace19..8fb66e5dc09 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/unfold_assigns.2.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/unfold_assigns.2.res.oracle
@@ -3,34 +3,34 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 28 goals scheduled
-[wp] [Qed] Goal typed_NO_UNFOLD_OK_1_assigns_exit : Valid
-[wp] [Qed] Goal typed_NO_UNFOLD_OK_1_assigns_normal : Valid
-[wp] [Qed] Goal typed_NO_UNFOLD_OK_2_assigns_exit : Valid
-[wp] [Qed] Goal typed_NO_UNFOLD_OK_2_assigns_normal : Valid
-[wp] [Qed] Goal typed_NO_UNFOLD_OK_3_assigns_exit : Valid
-[wp] [Qed] Goal typed_NO_UNFOLD_OK_3_assigns_normal : Valid
-[wp] [Qed] Goal typed_NO_UNFOLD_KO_assigns_exit : Valid
-[wp] [Qed] Goal typed_NO_UNFOLD_KO_assigns_normal : Valid
-[wp] [Alt-Ergo] Goal typed_USE_ASSIGN_UNFOLD_OK_ensures : Valid
-[wp] [Qed] Goal typed_USE_ASSIGN_UNFOLD_OK_assigns_exit : Valid
-[wp] [Qed] Goal typed_USE_ASSIGN_UNFOLD_OK_assigns_normal : Valid
-[wp] [Alt-Ergo] Goal typed_USE_ASSIGN_UNFOLD_KO_ensures : Valid
-[wp] [Qed] Goal typed_USE_ASSIGN_UNFOLD_KO_assigns_exit : Valid
-[wp] [Qed] Goal typed_USE_ASSIGN_UNFOLD_KO_assigns_normal : Valid
-[wp] [Qed] Goal typed_ASSIGN_NO_UNFOLD_OK_assigns : Valid
-[wp] [Qed] Goal typed_ASSIGN_NO_UNFOLD_KO_assigns : Valid
-[wp] [Alt-Ergo] Goal typed_PARTIAL_ASSIGNS_STATIC_assigns_exit : Valid
-[wp] [Alt-Ergo] Goal typed_PARTIAL_ASSIGNS_STATIC_assigns_normal : Valid
-[wp] [Alt-Ergo] Goal typed_PARTIAL_ASSIGNS_VARS_assigns_exit : Valid
-[wp] [Alt-Ergo] Goal typed_PARTIAL_ASSIGNS_VARS_assigns_normal : Valid
-[wp] [Alt-Ergo] Goal typed_NESTED_ARRAY_STATIC_assigns_exit : Unsuccess
-[wp] [Alt-Ergo] Goal typed_NESTED_ARRAY_STATIC_assigns_normal : Unsuccess
-[wp] [Alt-Ergo] Goal typed_NESTED_ARRAY_VARS_assigns_exit : Unsuccess
-[wp] [Alt-Ergo] Goal typed_NESTED_ARRAY_VARS_assigns_normal : Unsuccess
-[wp] [Alt-Ergo] Goal typed_RANGE_NESTED_ARRAY_STATIC_assigns_exit : Unsuccess
-[wp] [Alt-Ergo] Goal typed_RANGE_NESTED_ARRAY_STATIC_assigns_normal : Unsuccess
-[wp] [Alt-Ergo] Goal typed_RANGE_NESTED_ARRAY_VARS_assigns_exit : Unsuccess
-[wp] [Alt-Ergo] Goal typed_RANGE_NESTED_ARRAY_VARS_assigns_normal : Unsuccess
+[wp] [Valid] typed_NO_UNFOLD_OK_1_assigns_exit (Qed)
+[wp] [Valid] typed_NO_UNFOLD_OK_1_assigns_normal (Qed)
+[wp] [Valid] typed_NO_UNFOLD_OK_2_assigns_exit (Qed)
+[wp] [Valid] typed_NO_UNFOLD_OK_2_assigns_normal (Qed)
+[wp] [Valid] typed_NO_UNFOLD_OK_3_assigns_exit (Qed)
+[wp] [Valid] typed_NO_UNFOLD_OK_3_assigns_normal (Qed)
+[wp] [Valid] typed_NO_UNFOLD_KO_assigns_exit (Qed)
+[wp] [Valid] typed_NO_UNFOLD_KO_assigns_normal (Qed)
+[wp] [Valid] typed_USE_ASSIGN_UNFOLD_OK_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_USE_ASSIGN_UNFOLD_OK_assigns_exit (Qed)
+[wp] [Valid] typed_USE_ASSIGN_UNFOLD_OK_assigns_normal (Qed)
+[wp] [Valid] typed_USE_ASSIGN_UNFOLD_KO_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_USE_ASSIGN_UNFOLD_KO_assigns_exit (Qed)
+[wp] [Valid] typed_USE_ASSIGN_UNFOLD_KO_assigns_normal (Qed)
+[wp] [Valid] typed_ASSIGN_NO_UNFOLD_OK_assigns (Qed)
+[wp] [Valid] typed_ASSIGN_NO_UNFOLD_KO_assigns (Qed)
+[wp] [Valid] typed_PARTIAL_ASSIGNS_STATIC_assigns_exit (Alt-Ergo) (Cached)
+[wp] [Valid] typed_PARTIAL_ASSIGNS_STATIC_assigns_normal (Alt-Ergo) (Cached)
+[wp] [Valid] typed_PARTIAL_ASSIGNS_VARS_assigns_exit (Alt-Ergo) (Cached)
+[wp] [Valid] typed_PARTIAL_ASSIGNS_VARS_assigns_normal (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_NESTED_ARRAY_STATIC_assigns_exit (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_NESTED_ARRAY_STATIC_assigns_normal (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_NESTED_ARRAY_VARS_assigns_exit (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_NESTED_ARRAY_VARS_assigns_normal (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_RANGE_NESTED_ARRAY_STATIC_assigns_exit (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_RANGE_NESTED_ARRAY_STATIC_assigns_normal (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_RANGE_NESTED_ARRAY_VARS_assigns_exit (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_RANGE_NESTED_ARRAY_VARS_assigns_normal (Alt-Ergo) (Cached)
[wp] Proved goals: 20 / 28
Qed: 14
Alt-Ergo: 6 (unsuccess: 8)
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/unroll.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/unroll.res.oracle
index b7eb8ace826..03e42c0b78e 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/unroll.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/unroll.res.oracle
@@ -4,7 +4,7 @@
[wp] Warning: Missing RTE guards
[wp] unroll.i:21: Warning: Missing assigns clause (assigns 'everything' instead)
[wp] 1 goal scheduled
-[wp] [Script] Goal typed_unrolled_loop_ensures_zero : Valid
+[wp] [Valid] typed_unrolled_loop_ensures_zero (Script)
[wp] Proved goals: 1 / 1
Qed: 0
Script: 1
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/unsafe-arrays.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/unsafe-arrays.res.oracle
index ac8bea6cd23..d71ae537527 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/unsafe-arrays.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/unsafe-arrays.res.oracle
@@ -3,9 +3,9 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 3 goals scheduled
-[wp] [Qed] Goal typed_f_ensures_ARRAYS : Valid
-[wp] [Qed] Goal typed_f_ensures_STRUCT : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_INDIRP : Valid
+[wp] [Valid] typed_f_ensures_ARRAYS (Qed)
+[wp] [Valid] typed_f_ensures_STRUCT (Qed)
+[wp] [Valid] typed_f_ensures_INDIRP (Alt-Ergo) (Cached)
[wp] Proved goals: 3 / 3
Qed: 2
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/unsigned.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/unsigned.res.oracle
index f5ea71506e3..9ecc81d7d27 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/unsigned.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/unsigned.res.oracle
@@ -2,7 +2,7 @@
[kernel] Parsing unsigned.i (no preprocessing)
[wp] Running WP plugin...
[wp] 1 goal scheduled
-[wp] [Script] Goal typed_lemma_U32 : Unsuccess
+[wp] [Unknown] typed_lemma_U32 (Script)
[wp] Proved goals: 0 / 1
------------------------------------------------------------
Axiomatics WP Alt-Ergo Total Success
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/volatile.0.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/volatile.0.res.oracle
index 00c1cee53dd..6539a1f3017 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/volatile.0.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/volatile.0.res.oracle
@@ -3,11 +3,11 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 5 goals scheduled
-[wp] [Alt-Ergo] Goal typed_job_assigns_assert_KO_WHEN_VOLATILE : Unsuccess
-[wp] [Alt-Ergo] Goal typed_job_read_assert_KO_WHEN_VOLATILE : Unsuccess
-[wp] [Qed] Goal typed_job_struct_assert_ok_dead_code : Valid
-[wp] [Alt-Ergo] Goal typed_job_struct_assigns_assert_KO_WHEN_VOLATILE : Unsuccess
-[wp] [Alt-Ergo] Goal typed_default_init_check_KO_WHEN_VOLATILE : Unsuccess
+[wp] [Unknown] typed_job_assigns_assert_KO_WHEN_VOLATILE (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_job_read_assert_KO_WHEN_VOLATILE (Alt-Ergo) (Cached)
+[wp] [Valid] typed_job_struct_assert_ok_dead_code (Qed)
+[wp] [Unknown] typed_job_struct_assigns_assert_KO_WHEN_VOLATILE (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_default_init_check_KO_WHEN_VOLATILE (Alt-Ergo) (Cached)
[wp] Proved goals: 1 / 5
Qed: 1
Alt-Ergo: 0 (unsuccess: 4)
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/volatile.1.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/volatile.1.res.oracle
index d13bf36baf4..ce38895bbc5 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/volatile.1.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/volatile.1.res.oracle
@@ -12,11 +12,11 @@
[wp] volatile.i:35: Warning: unsafe read-access to volatile l-value
[wp] volatile.i:45: Warning: unsafe read-access to volatile l-value
[wp] 5 goals scheduled
-[wp] [Qed] Goal typed_job_assigns_assert_KO_WHEN_VOLATILE : Valid
-[wp] [Qed] Goal typed_job_read_assert_KO_WHEN_VOLATILE : Valid
-[wp] [Qed] Goal typed_job_struct_assert_ok_dead_code : Valid
-[wp] [Qed] Goal typed_job_struct_assigns_assert_KO_WHEN_VOLATILE : Valid
-[wp] [Alt-Ergo] Goal typed_default_init_check_KO_WHEN_VOLATILE : Valid
+[wp] [Valid] typed_job_assigns_assert_KO_WHEN_VOLATILE (Qed) (Stronger, 2 warnings)
+[wp] [Valid] typed_job_read_assert_KO_WHEN_VOLATILE (Qed) (Stronger, 2 warnings)
+[wp] [Valid] typed_job_struct_assert_ok_dead_code (Qed)
+[wp] [Valid] typed_job_struct_assigns_assert_KO_WHEN_VOLATILE (Qed) (Stronger, 4 warnings)
+[wp] [Valid] typed_default_init_check_KO_WHEN_VOLATILE (Alt-Ergo) (Cached) (Stronger)
[wp] Proved goals: 5 / 5
Qed: 4
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_store/oracle_qualif/array.res.oracle b/src/plugins/wp/tests/wp_store/oracle_qualif/array.res.oracle
index 828f168ec2f..2540479ff07 100644
--- a/src/plugins/wp/tests/wp_store/oracle_qualif/array.res.oracle
+++ b/src/plugins/wp/tests/wp_store/oracle_qualif/array.res.oracle
@@ -3,8 +3,8 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 2 goals scheduled
-[wp] [Qed] Goal typed_g_ensures_P_startof_qed_ok : Valid
-[wp] [Qed] Goal typed_g_ensures_P_addr_shift_qed_ok : Valid
+[wp] [Valid] typed_g_ensures_P_startof_qed_ok (Qed)
+[wp] [Valid] typed_g_ensures_P_addr_shift_qed_ok (Qed)
[wp] Proved goals: 2 / 2
Qed: 2
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_store/oracle_qualif/natural.res.oracle b/src/plugins/wp/tests/wp_store/oracle_qualif/natural.res.oracle
index 99a7ed554c4..753e081af3a 100644
--- a/src/plugins/wp/tests/wp_store/oracle_qualif/natural.res.oracle
+++ b/src/plugins/wp/tests/wp_store/oracle_qualif/natural.res.oracle
@@ -3,9 +3,9 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 3 goals scheduled
-[wp] [Qed] Goal typed_f_ensures_qed_ok : Valid
-[wp] [Qed] Goal typed_f_assigns_part1 : Valid
-[wp] [Qed] Goal typed_f_assigns_part2 : Valid
+[wp] [Valid] typed_f_ensures_qed_ok (Qed)
+[wp] [Valid] typed_f_assigns_part1 (Qed)
+[wp] [Valid] typed_f_assigns_part2 (Qed)
[wp] Proved goals: 3 / 3
Qed: 3
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_store/oracle_qualif/nonaliasing.0.res.oracle b/src/plugins/wp/tests/wp_store/oracle_qualif/nonaliasing.0.res.oracle
index 2533a1d5041..ffb1b3fed9a 100644
--- a/src/plugins/wp/tests/wp_store/oracle_qualif/nonaliasing.0.res.oracle
+++ b/src/plugins/wp/tests/wp_store/oracle_qualif/nonaliasing.0.res.oracle
@@ -3,8 +3,8 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 2 goals scheduled
-[wp] [Alt-Ergo] Goal typed_f_ensures_qed_ok_P : Valid
-[wp] [Alt-Ergo] Goal typed_f_ensures_qed_ok_Q : Valid
+[wp] [Valid] typed_f_ensures_qed_ok_P (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_ensures_qed_ok_Q (Alt-Ergo) (Cached)
[wp] Proved goals: 2 / 2
Qed: 0
Alt-Ergo: 2
diff --git a/src/plugins/wp/tests/wp_store/oracle_qualif/nonaliasing.1.res.oracle b/src/plugins/wp/tests/wp_store/oracle_qualif/nonaliasing.1.res.oracle
index 9ffac3505bd..ac4bb595d33 100644
--- a/src/plugins/wp/tests/wp_store/oracle_qualif/nonaliasing.1.res.oracle
+++ b/src/plugins/wp/tests/wp_store/oracle_qualif/nonaliasing.1.res.oracle
@@ -3,8 +3,8 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 2 goals scheduled
-[wp] [Alt-Ergo] Goal typed_f_ensures_qed_ko_P_oracle_ko : Unsuccess
-[wp] [Alt-Ergo] Goal typed_f_ensures_qed_ko_Q_oracle_ko : Unsuccess
+[wp] [Stepout] typed_f_ensures_qed_ko_P_oracle_ko (Alt-Ergo) (Cached)
+[wp] [Stepout] typed_f_ensures_qed_ko_Q_oracle_ko (Alt-Ergo) (Cached)
[wp] Proved goals: 0 / 2
Alt-Ergo: 0 (unsuccess: 2)
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_store/oracle_qualif/struct.res.oracle b/src/plugins/wp/tests/wp_store/oracle_qualif/struct.res.oracle
index 175ee82b241..1bdd3b34cdb 100644
--- a/src/plugins/wp/tests/wp_store/oracle_qualif/struct.res.oracle
+++ b/src/plugins/wp/tests/wp_store/oracle_qualif/struct.res.oracle
@@ -3,12 +3,12 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 6 goals scheduled
-[wp] [Qed] Goal typed_g_ensures : Valid
-[wp] [Qed] Goal typed_g_assigns : Valid
-[wp] [Qed] Goal typed_f_assert_qed_ok : Valid
-[wp] [Alt-Ergo] Goal typed_f_call_g_requires : Valid
-[wp] [Alt-Ergo] Goal typed_main_ensures_P_qed_ok : Valid
-[wp] [Alt-Ergo] Goal typed_main_ensures_Q_qed_ok : Valid
+[wp] [Valid] typed_g_ensures (Qed)
+[wp] [Valid] typed_g_assigns (Qed)
+[wp] [Valid] typed_f_assert_qed_ok (Qed)
+[wp] [Valid] typed_f_call_g_requires (Alt-Ergo) (Cached)
+[wp] [Valid] typed_main_ensures_P_qed_ok (Alt-Ergo) (Cached)
+[wp] [Valid] typed_main_ensures_Q_qed_ok (Alt-Ergo) (Cached)
[wp] Proved goals: 6 / 6
Qed: 3
Alt-Ergo: 3
diff --git a/src/plugins/wp/tests/wp_tip/oracle/clear.res.oracle b/src/plugins/wp/tests/wp_tip/oracle/clear.res.oracle
index 9c2a626fc58..def71a156f5 100644
--- a/src/plugins/wp/tests/wp_tip/oracle/clear.res.oracle
+++ b/src/plugins/wp/tests/wp_tip/oracle/clear.res.oracle
@@ -105,7 +105,7 @@
Prove: P_S(42).
------------------------------------------------------------
-[wp] [Script] Goal typed_clear_in_step_check : Unsuccess
+[wp] [Unknown] typed_clear_in_step_check (Script)
[wp:script:allgoals]
typed_clear_ensures subgoal:
@@ -143,5 +143,5 @@
Prove: P_S(a + b).
------------------------------------------------------------
-[wp] [Script] Goal typed_clear_ensures : Unsuccess
+[wp] [Unknown] typed_clear_ensures (Script)
[wp] Proved goals: 0 / 2
diff --git a/src/plugins/wp/tests/wp_tip/oracle/induction_typing.res.oracle b/src/plugins/wp/tests/wp_tip/oracle/induction_typing.res.oracle
index 113403f25fb..d56e54307ac 100644
--- a/src/plugins/wp/tests/wp_tip/oracle/induction_typing.res.oracle
+++ b/src/plugins/wp/tests/wp_tip/oracle/induction_typing.res.oracle
@@ -28,7 +28,7 @@
Prove: ([ 1 ] *^ x) = a_1.
------------------------------------------------------------
-[wp] [Qed] Goal typed_function_loop_invariant_X_established : Valid
+[wp] [Valid] typed_function_loop_invariant_X_established (Qed)
[wp:script:allgoals]
typed_function_loop_invariant_X_preserved subgoal:
@@ -54,7 +54,7 @@
Prove: false.
------------------------------------------------------------
-[wp] [Script] Goal typed_function_loop_invariant_X_preserved : Unsuccess
+[wp] [Unknown] typed_function_loop_invariant_X_preserved (Script)
[wp:script:allgoals]
typed_function_loop_invariant_X_preserved subgoal:
diff --git a/src/plugins/wp/tests/wp_tip/oracle/modmask.0.res.oracle b/src/plugins/wp/tests/wp_tip/oracle/modmask.0.res.oracle
index 9176f783481..7db5771084a 100644
--- a/src/plugins/wp/tests/wp_tip/oracle/modmask.0.res.oracle
+++ b/src/plugins/wp/tests/wp_tip/oracle/modmask.0.res.oracle
@@ -14,7 +14,7 @@
Prove: (is_uint16 us_0) -> ((us_0 mod 256)=(land 255 us_0))
------------------------------------------------------------
-[wp] [Script] Goal typed_check_lemma_and_modulo_us_255 : Valid
+[wp] [Valid] typed_check_lemma_and_modulo_us_255 (Script)
[wp:script:allgoals]
typed_check_lemma_and_modulo_u subgoal:
@@ -56,7 +56,7 @@
Prove: exists i : Z. (lsl(1, i) = lsl(1, shift_0)) /\ (0 <= i).
------------------------------------------------------------
-[wp] [Script] Goal typed_check_lemma_and_modulo_u : Valid
+[wp] [Valid] typed_check_lemma_and_modulo_u (Script)
[wp] Proved goals: 2 / 2
Qed: 0
Script: 2
diff --git a/src/plugins/wp/tests/wp_tip/oracle/modmask.1.res.oracle b/src/plugins/wp/tests/wp_tip/oracle/modmask.1.res.oracle
index 9176f783481..7db5771084a 100644
--- a/src/plugins/wp/tests/wp_tip/oracle/modmask.1.res.oracle
+++ b/src/plugins/wp/tests/wp_tip/oracle/modmask.1.res.oracle
@@ -14,7 +14,7 @@
Prove: (is_uint16 us_0) -> ((us_0 mod 256)=(land 255 us_0))
------------------------------------------------------------
-[wp] [Script] Goal typed_check_lemma_and_modulo_us_255 : Valid
+[wp] [Valid] typed_check_lemma_and_modulo_us_255 (Script)
[wp:script:allgoals]
typed_check_lemma_and_modulo_u subgoal:
@@ -56,7 +56,7 @@
Prove: exists i : Z. (lsl(1, i) = lsl(1, shift_0)) /\ (0 <= i).
------------------------------------------------------------
-[wp] [Script] Goal typed_check_lemma_and_modulo_u : Valid
+[wp] [Valid] typed_check_lemma_and_modulo_u (Script)
[wp] Proved goals: 2 / 2
Qed: 0
Script: 2
diff --git a/src/plugins/wp/tests/wp_tip/oracle/split.res.oracle b/src/plugins/wp/tests/wp_tip/oracle/split.res.oracle
index 3538ceb7485..9d27fa46879 100644
--- a/src/plugins/wp/tests/wp_tip/oracle/split.res.oracle
+++ b/src/plugins/wp/tests/wp_tip/oracle/split.res.oracle
@@ -201,7 +201,7 @@
Prove: P_S.
------------------------------------------------------------
-[wp] [Script] Goal typed_test_step_branch_ensures : Unsuccess
+[wp] [Unknown] typed_test_step_branch_ensures (Script)
[wp:script:allgoals]
typed_test_step_branch_ensures subgoal:
@@ -224,7 +224,7 @@
Prove: P_S.
------------------------------------------------------------
-[wp] [Script] Goal typed_test_step_or_ensures : Unsuccess
+[wp] [Unknown] typed_test_step_or_ensures (Script)
[wp:script:allgoals]
typed_test_step_or_ensures subgoal:
@@ -256,7 +256,7 @@
Prove: P_S.
------------------------------------------------------------
-[wp] [Script] Goal typed_test_step_and_ensures : Unsuccess
+[wp] [Unknown] typed_test_step_and_ensures (Script)
[wp:script:allgoals]
typed_test_step_peq_ensures subgoal:
@@ -265,7 +265,7 @@
Prove: P_S.
------------------------------------------------------------
-[wp] [Script] Goal typed_test_step_peq_ensures : Unsuccess
+[wp] [Unknown] typed_test_step_peq_ensures (Script)
[wp:script:allgoals]
typed_test_step_peq_ensures subgoal:
@@ -282,7 +282,7 @@
Prove: P_S.
------------------------------------------------------------
-[wp] [Script] Goal typed_test_step_pneq_ensures : Unsuccess
+[wp] [Unknown] typed_test_step_pneq_ensures (Script)
[wp:script:allgoals]
typed_test_step_pneq_ensures subgoal:
@@ -299,7 +299,7 @@
Prove: P_S.
------------------------------------------------------------
-[wp] [Script] Goal typed_test_step_neq_ensures : Unsuccess
+[wp] [Unknown] typed_test_step_neq_ensures (Script)
[wp:script:allgoals]
typed_test_step_neq_ensures subgoal:
@@ -324,7 +324,7 @@
Prove: P_S.
------------------------------------------------------------
-[wp] [Script] Goal typed_test_step_leq_ensures : Unsuccess
+[wp] [Unknown] typed_test_step_leq_ensures (Script)
[wp:script:allgoals]
typed_test_step_leq_ensures subgoal:
@@ -354,7 +354,7 @@
Prove: P_S.
------------------------------------------------------------
-[wp] [Script] Goal typed_test_step_lt_ensures : Unsuccess
+[wp] [Unknown] typed_test_step_lt_ensures (Script)
[wp:script:allgoals]
typed_test_step_lt_ensures subgoal:
@@ -379,7 +379,7 @@
Prove: P_S.
------------------------------------------------------------
-[wp] [Script] Goal typed_test_step_if_ensures : Unsuccess
+[wp] [Unknown] typed_test_step_if_ensures (Script)
[wp:script:allgoals]
typed_test_step_if_ensures subgoal:
@@ -405,7 +405,7 @@
Prove: P_S.
------------------------------------------------------------
-[wp] [Script] Goal typed_test_step_fa_if_ensures : Unsuccess
+[wp] [Unknown] typed_test_step_fa_if_ensures (Script)
[wp:script:allgoals]
typed_test_step_fa_if_ensures subgoal:
@@ -427,7 +427,7 @@
Prove: P_S.
------------------------------------------------------------
-[wp] [Script] Goal typed_test_step_fa_or_ensures : Unsuccess
+[wp] [Unknown] typed_test_step_fa_or_ensures (Script)
[wp:script:allgoals]
typed_test_step_fa_or_ensures subgoal:
@@ -448,7 +448,7 @@
Prove: P_S.
------------------------------------------------------------
-[wp] [Script] Goal typed_test_step_fa_and_ensures : Unsuccess
+[wp] [Unknown] typed_test_step_fa_and_ensures (Script)
[wp:script:allgoals]
typed_test_inside_leq_ensures subgoal:
@@ -463,7 +463,7 @@
Prove: P_Q.
------------------------------------------------------------
-[wp] [Script] Goal typed_test_inside_leq_ensures : Unsuccess
+[wp] [Unknown] typed_test_inside_leq_ensures (Script)
[wp:script:allgoals]
typed_test_inside_leq_ensures subgoal:
@@ -494,7 +494,7 @@
Prove: P_Q.
------------------------------------------------------------
-[wp] [Script] Goal typed_test_inside_lt_ensures : Unsuccess
+[wp] [Unknown] typed_test_inside_lt_ensures (Script)
[wp:script:allgoals]
typed_test_inside_lt_ensures subgoal:
@@ -525,7 +525,7 @@
Prove: P_Q.
------------------------------------------------------------
-[wp] [Script] Goal typed_test_inside_neq_ensures : Unsuccess
+[wp] [Unknown] typed_test_inside_neq_ensures (Script)
[wp:script:allgoals]
typed_test_inside_neq_ensures subgoal:
@@ -556,7 +556,7 @@
Prove: P_P.
------------------------------------------------------------
-[wp] [Script] Goal typed_test_goal_and_ensures : Unsuccess
+[wp] [Unknown] typed_test_goal_and_ensures (Script)
[wp:script:allgoals]
typed_test_goal_and_ensures subgoal:
@@ -581,7 +581,7 @@
Prove: (L_LP=true).
------------------------------------------------------------
-[wp] [Script] Goal typed_test_goal_eq_ensures : Unsuccess
+[wp] [Unknown] typed_test_goal_eq_ensures (Script)
[wp:script:allgoals]
typed_test_goal_eq_ensures subgoal:
@@ -598,7 +598,7 @@
Prove: (L_LP=false).
------------------------------------------------------------
-[wp] [Script] Goal typed_test_goal_neq_ensures : Unsuccess
+[wp] [Unknown] typed_test_goal_neq_ensures (Script)
[wp:script:allgoals]
typed_test_goal_neq_ensures subgoal:
@@ -620,7 +620,7 @@
Prove: P_P.
------------------------------------------------------------
-[wp] [Script] Goal typed_test_goal_if_ensures : Unsuccess
+[wp] [Unknown] typed_test_goal_if_ensures (Script)
[wp:script:allgoals]
typed_test_goal_if_ensures subgoal:
@@ -642,7 +642,7 @@
Prove: exists i : Z. P_Pi(i) /\ P_Qi(i).
------------------------------------------------------------
-[wp] [Script] Goal typed_test_goal_ex_and_ensures : Unsuccess
+[wp] [Unknown] typed_test_goal_ex_and_ensures (Script)
[wp:script:allgoals]
typed_test_goal_ex_and_ensures subgoal:
@@ -659,7 +659,7 @@
Prove: P_P \/ P_Q \/ (exists i : Z. P_Pi(i)) \/ (exists i : Z. P_Qi(i)).
------------------------------------------------------------
-[wp] [Script] Goal typed_test_goal_ex_or_ensures : Unsuccess
+[wp] [Unknown] typed_test_goal_ex_or_ensures (Script)
[wp:script:allgoals]
typed_test_goal_ex_if_ensures subgoal:
@@ -674,7 +674,7 @@
Prove: exists i : Z. P_Pi(i) /\ P_Qi(i).
------------------------------------------------------------
-[wp] [Script] Goal typed_test_goal_ex_if_ensures : Unsuccess
+[wp] [Unknown] typed_test_goal_ex_if_ensures (Script)
[wp:script:allgoals]
typed_test_goal_ex_if_ensures subgoal:
@@ -702,5 +702,5 @@
Prove: exists i : Z. P_Qi(i).
------------------------------------------------------------
-[wp] [Script] Goal typed_test_goal_ex_imply_ensures : Unsuccess
+[wp] [Unknown] typed_test_goal_ex_imply_ensures (Script)
[wp] Proved goals: 0 / 23
diff --git a/src/plugins/wp/tests/wp_tip/oracle_qualif/induction.0.res.oracle b/src/plugins/wp/tests/wp_tip/oracle_qualif/induction.0.res.oracle
index f72a908339b..4d3c4e24423 100644
--- a/src/plugins/wp/tests/wp_tip/oracle_qualif/induction.0.res.oracle
+++ b/src/plugins/wp/tests/wp_tip/oracle_qualif/induction.0.res.oracle
@@ -2,7 +2,7 @@
[kernel] Parsing induction.i (no preprocessing)
[wp] Running WP plugin...
[wp] 1 goal scheduled
-[wp] [Script] Goal typed_lemma_ByInd : Valid
+[wp] [Valid] typed_lemma_ByInd (Script)
[wp] Proved goals: 1 / 1
Qed: 0
Script: 1
diff --git a/src/plugins/wp/tests/wp_tip/oracle_qualif/induction.1.res.oracle b/src/plugins/wp/tests/wp_tip/oracle_qualif/induction.1.res.oracle
index 7b0e85cdd6a..1e70dd144df 100644
--- a/src/plugins/wp/tests/wp_tip/oracle_qualif/induction.1.res.oracle
+++ b/src/plugins/wp/tests/wp_tip/oracle_qualif/induction.1.res.oracle
@@ -2,7 +2,7 @@
[kernel] Parsing induction.i (no preprocessing)
[wp] Running WP plugin...
[wp] 1 goal scheduled
-[wp] [Script] Goal typed_lemma_ByInd : Unsuccess
+[wp] [Unknown] typed_lemma_ByInd (Script)
[wp] Proved goals: 0 / 1
------------------------------------------------------------
Axiomatics WP Alt-Ergo Total Success
diff --git a/src/plugins/wp/tests/wp_tip/oracle_qualif/induction.2.res.oracle b/src/plugins/wp/tests/wp_tip/oracle_qualif/induction.2.res.oracle
index 7b0e85cdd6a..1e70dd144df 100644
--- a/src/plugins/wp/tests/wp_tip/oracle_qualif/induction.2.res.oracle
+++ b/src/plugins/wp/tests/wp_tip/oracle_qualif/induction.2.res.oracle
@@ -2,7 +2,7 @@
[kernel] Parsing induction.i (no preprocessing)
[wp] Running WP plugin...
[wp] 1 goal scheduled
-[wp] [Script] Goal typed_lemma_ByInd : Unsuccess
+[wp] [Unknown] typed_lemma_ByInd (Script)
[wp] Proved goals: 0 / 1
------------------------------------------------------------
Axiomatics WP Alt-Ergo Total Success
diff --git a/src/plugins/wp/tests/wp_tip/oracle_qualif/overflow.res.oracle b/src/plugins/wp/tests/wp_tip/oracle_qualif/overflow.res.oracle
index 1bd319699d5..7cd2f2e1245 100644
--- a/src/plugins/wp/tests/wp_tip/oracle_qualif/overflow.res.oracle
+++ b/src/plugins/wp/tests/wp_tip/oracle_qualif/overflow.res.oracle
@@ -2,8 +2,8 @@
[kernel] Parsing overflow.i (no preprocessing)
[wp] Running WP plugin...
[wp] 2 goals scheduled
-[wp] [Script] Goal typed_lemma_j_incr_char : Valid
-[wp] [Script] Goal typed_lemma_j_incr_short : Valid
+[wp] [Valid] typed_lemma_j_incr_char (Script)
+[wp] [Valid] typed_lemma_j_incr_short (Script)
[wp] Proved goals: 2 / 2
Qed: 0
Script: 2
diff --git a/src/plugins/wp/tests/wp_tip/oracle_qualif/tac_split_quantifiers.res.oracle b/src/plugins/wp/tests/wp_tip/oracle_qualif/tac_split_quantifiers.res.oracle
index 79913768693..8a92c43c205 100644
--- a/src/plugins/wp/tests/wp_tip/oracle_qualif/tac_split_quantifiers.res.oracle
+++ b/src/plugins/wp/tests/wp_tip/oracle_qualif/tac_split_quantifiers.res.oracle
@@ -3,11 +3,11 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 5 goals scheduled
-[wp] [Script] Goal typed_split_ensures_Goal_Exist_Or : Unsuccess
-[wp] [Script] Goal typed_split_ensures_Goal_Exist_And : Unsuccess
-[wp] [Script] Goal typed_split_ensures_Goal_Exist_And_bis : Unsuccess
-[wp] [Script] Goal typed_split_ensures_Hyp_Forall_And : Unsuccess
-[wp] [Script] Goal typed_split_ensures_Hyp_Forall_Or_bis : Unsuccess
+[wp] [Unknown] typed_split_ensures_Goal_Exist_Or (Script)
+[wp] [Unknown] typed_split_ensures_Goal_Exist_And (Script)
+[wp] [Unknown] typed_split_ensures_Goal_Exist_And_bis (Script)
+[wp] [Unknown] typed_split_ensures_Hyp_Forall_And (Script)
+[wp] [Unknown] typed_split_ensures_Hyp_Forall_Or_bis (Script)
[wp] Proved goals: 0 / 5
------------------------------------------------------------
Functions WP Alt-Ergo Total Success
diff --git a/src/plugins/wp/tests/wp_tip/oracle_qualif/unroll.res.oracle b/src/plugins/wp/tests/wp_tip/oracle_qualif/unroll.res.oracle
index b59bcd71b7a..a515c1fc7f8 100644
--- a/src/plugins/wp/tests/wp_tip/oracle_qualif/unroll.res.oracle
+++ b/src/plugins/wp/tests/wp_tip/oracle_qualif/unroll.res.oracle
@@ -2,9 +2,9 @@
[kernel] Parsing unroll.i (no preprocessing)
[wp] Running WP plugin...
[wp] 3 goals scheduled
-[wp] [Script] Goal typed_lemma_LEFT : Valid
-[wp] [Script] Goal typed_lemma_RIGHT : Valid
-[wp] [Script] Goal typed_lemma_SUM : Valid
+[wp] [Valid] typed_lemma_LEFT (Script)
+[wp] [Valid] typed_lemma_RIGHT (Script)
+[wp] [Valid] typed_lemma_SUM (Script)
[wp] Proved goals: 3 / 3
Qed: 0
Script: 3
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/array_initialized.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/array_initialized.0.res.oracle
index 65ff9d0005c..77bc1c2c26d 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/array_initialized.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/array_initialized.0.res.oracle
@@ -4,11 +4,11 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 5 goals scheduled
-[wp] [Alt-Ergo] Goal typed_main1_assert : Valid
-[wp] [Alt-Ergo] Goal typed_main2_assert : Valid
-[wp] [Qed] Goal typed_main3_assert : Valid
-[wp] [Alt-Ergo] Goal typed_main_pointer_assert : Valid
-[wp] [Alt-Ergo] Goal typed_simpl_ensures : Valid
+[wp] [Valid] typed_main1_assert (Alt-Ergo) (Cached)
+[wp] [Valid] typed_main2_assert (Alt-Ergo) (Cached)
+[wp] [Valid] typed_main3_assert (Qed)
+[wp] [Valid] typed_main_pointer_assert (Alt-Ergo) (Cached)
+[wp] [Valid] typed_simpl_ensures (Alt-Ergo) (Cached)
[wp] Proved goals: 5 / 5
Qed: 1
Alt-Ergo: 4
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/array_initialized.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/array_initialized.1.res.oracle
index 65ff9d0005c..77bc1c2c26d 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/array_initialized.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/array_initialized.1.res.oracle
@@ -4,11 +4,11 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 5 goals scheduled
-[wp] [Alt-Ergo] Goal typed_main1_assert : Valid
-[wp] [Alt-Ergo] Goal typed_main2_assert : Valid
-[wp] [Qed] Goal typed_main3_assert : Valid
-[wp] [Alt-Ergo] Goal typed_main_pointer_assert : Valid
-[wp] [Alt-Ergo] Goal typed_simpl_ensures : Valid
+[wp] [Valid] typed_main1_assert (Alt-Ergo) (Cached)
+[wp] [Valid] typed_main2_assert (Alt-Ergo) (Cached)
+[wp] [Valid] typed_main3_assert (Qed)
+[wp] [Valid] typed_main_pointer_assert (Alt-Ergo) (Cached)
+[wp] [Valid] typed_simpl_ensures (Alt-Ergo) (Cached)
[wp] Proved goals: 5 / 5
Qed: 1
Alt-Ergo: 4
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/avar.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/avar.res.oracle
index 45fd4bf0e54..3600dcbe6cf 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/avar.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/avar.res.oracle
@@ -5,7 +5,7 @@
No code nor implicit assigns clause for function f, generating default assigns from the prototype
[wp] Warning: Missing RTE guards
[wp] 1 goal scheduled
-[wp] [Qed] Goal typed_g_call_f_requires : Valid
+[wp] [Valid] typed_g_call_f_requires (Qed)
[wp] Proved goals: 1 / 1
Qed: 1
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/cast_fits.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/cast_fits.res.oracle
index f96f47cdcd3..148ca5ef3fa 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/cast_fits.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/cast_fits.res.oracle
@@ -12,14 +12,14 @@
Cast with incompatible pointers types (source: sint32*)
(target: __anonunion_L8_8*)
[wp] 8 goals scheduled
-[wp] [Alt-Ergo] Goal typed_fits1_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_mismatch1_ensures : Unsuccess (Stronger)
-[wp] [Alt-Ergo] Goal typed_fits2_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_fits3_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_fits4_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_fits5_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_mismatch2_ensures : Unsuccess (Stronger)
-[wp] [Alt-Ergo] Goal typed_mismatch3_ensures : Unsuccess (Stronger)
+[wp] [Valid] typed_fits1_ensures (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_mismatch1_ensures (Alt-Ergo) (Cached) (Stronger)
+[wp] [Valid] typed_fits2_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_fits3_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_fits4_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_fits5_ensures (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_mismatch2_ensures (Alt-Ergo) (Cached) (Stronger)
+[wp] [Timeout] typed_mismatch3_ensures (Alt-Ergo) (Cached) (Stronger)
[wp] Proved goals: 5 / 8
Qed: 0
Alt-Ergo: 5 (unsuccess: 3)
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/frame.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/frame.res.oracle
index 524ea60e43d..e25ad6cd507 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/frame.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/frame.res.oracle
@@ -3,12 +3,12 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 6 goals scheduled
-[wp] [Alt-Ergo] Goal typed_compound_assert_SEP : Unsuccess
-[wp] [Alt-Ergo] Goal typed_compound_assert_RES : Valid
-[wp] [Alt-Ergo] Goal typed_local_region_assert_A_X : Valid
-[wp] [Alt-Ergo] Goal typed_local_region_assert_A_Y : Unsuccess
-[wp] [Alt-Ergo] Goal typed_formal_region_assert_A_X : Valid
-[wp] [Alt-Ergo] Goal typed_formal_region_assert_A_Y : Unsuccess
+[wp] [Timeout] typed_compound_assert_SEP (Alt-Ergo) (Cached)
+[wp] [Valid] typed_compound_assert_RES (Alt-Ergo) (Cached)
+[wp] [Valid] typed_local_region_assert_A_X (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_local_region_assert_A_Y (Alt-Ergo) (Cached)
+[wp] [Valid] typed_formal_region_assert_A_X (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_formal_region_assert_A_Y (Alt-Ergo) (Cached)
[wp] Proved goals: 3 / 6
Qed: 0
Alt-Ergo: 3 (unsuccess: 3)
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/mvar.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/mvar.res.oracle
index 030854cc6ec..2cc205a30b9 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/mvar.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/mvar.res.oracle
@@ -5,7 +5,7 @@
No code nor implicit assigns clause for function Write, generating default assigns from the prototype
[wp] Warning: Missing RTE guards
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_Job_ensures : Valid
+[wp] [Valid] typed_Job_ensures (Alt-Ergo)
[wp] Proved goals: 1 / 1
Qed: 0
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/shift_lemma.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/shift_lemma.res.oracle
index bf090f92058..f062663cf51 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/shift_lemma.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/shift_lemma.res.oracle
@@ -3,11 +3,11 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 5 goals scheduled
-[wp] [Alt-Ergo] Goal typed_f_assert : Valid
-[wp] [Alt-Ergo] Goal typed_f_assert_2 : Valid
-[wp] [Qed] Goal typed_f_assert_3 : Valid
-[wp] [Qed] Goal typed_f_assert_4 : Valid
-[wp] [Alt-Ergo] Goal typed_f_assert_5 : Valid
+[wp] [Valid] typed_f_assert (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_assert_2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_assert_3 (Qed)
+[wp] [Valid] typed_f_assert_4 (Qed)
+[wp] [Valid] typed_f_assert_5 (Alt-Ergo) (Cached)
[wp] Proved goals: 5 / 5
Qed: 2
Alt-Ergo: 3
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/struct_array_type.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/struct_array_type.res.oracle
index 483125f2578..c0c342b8e9d 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/struct_array_type.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/struct_array_type.res.oracle
@@ -3,7 +3,7 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_f_ensures : Valid
+[wp] [Valid] typed_f_ensures (Alt-Ergo) (Cached)
[wp] Proved goals: 1 / 1
Qed: 0
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.0.res.oracle
index b54ffc7ece7..599afed71e6 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.0.res.oracle
@@ -3,13 +3,13 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 7 goals scheduled
-[wp] [Qed] Goal typed_job_assert : Valid
-[wp] [Alt-Ergo] Goal typed_job_assert_2 : Valid
-[wp] [Qed] Goal typed_job_assert_3 : Valid
-[wp] [Alt-Ergo] Goal typed_job_assert_4 : Valid
-[wp] [Qed] Goal typed_f_assigns : Valid
-[wp] [Qed] Goal typed_g_assigns : Valid
-[wp] [Alt-Ergo] Goal typed_h_ensures : Valid
+[wp] [Valid] typed_job_assert (Qed)
+[wp] [Valid] typed_job_assert_2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_job_assert_3 (Qed)
+[wp] [Valid] typed_job_assert_4 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_assigns (Qed)
+[wp] [Valid] typed_g_assigns (Qed)
+[wp] [Valid] typed_h_ensures (Alt-Ergo) (Cached)
[wp] Proved goals: 7 / 7
Qed: 4
Alt-Ergo: 3
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.1.res.oracle
index 39a55dfb45e..72b5c87b44c 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.1.res.oracle
@@ -3,13 +3,13 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 7 goals scheduled
-[wp] [Qed] Goal typed_ref_job_assert : Valid
-[wp] [Alt-Ergo] Goal typed_ref_job_assert_2 : Valid
-[wp] [Qed] Goal typed_ref_job_assert_3 : Valid
-[wp] [Alt-Ergo] Goal typed_ref_job_assert_4 : Valid
-[wp] [Qed] Goal typed_ref_f_assigns : Valid
-[wp] [Qed] Goal typed_ref_g_assigns : Valid
-[wp] [Alt-Ergo] Goal typed_ref_h_ensures : Valid
+[wp] [Valid] typed_ref_job_assert (Qed)
+[wp] [Valid] typed_ref_job_assert_2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_job_assert_3 (Qed)
+[wp] [Valid] typed_ref_job_assert_4 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_f_assigns (Qed)
+[wp] [Valid] typed_ref_g_assigns (Qed)
+[wp] [Valid] typed_ref_h_ensures (Alt-Ergo) (Cached)
[wp] Proved goals: 7 / 7
Qed: 4
Alt-Ergo: 3
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.res.oracle
index 8c72c29788e..ce011d663a2 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.res.oracle
@@ -3,67 +3,67 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 61 goals scheduled
-[wp] [Alt-Ergo] Goal typed_lemma_band_sint8 : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_band_uint8 : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_blsr_sint8 : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_blsr_uint8 : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_bnot_sint8 : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_bor_sint8 : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_bor_uint8 : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_bxor_sint8 : Valid
-[wp] [Qed] Goal typed_lemma_land_abs : Valid
-[wp] [Qed] Goal typed_lemma_land_assoc : Valid
-[wp] [Qed] Goal typed_lemma_land_com : Valid
-[wp] [Qed] Goal typed_lemma_land_stb : Valid
-[wp] [Qed] Goal typed_lemma_lor_assoc : Valid
-[wp] [Qed] Goal typed_lemma_lor_com : Valid
-[wp] [Qed] Goal typed_lemma_lor_neu : Valid
-[wp] [Qed] Goal typed_lemma_lor_stb : Valid
-[wp] [Qed] Goal typed_lemma_lxor_assoc : Valid
-[wp] [Qed] Goal typed_lemma_lxor_com : Valid
-[wp] [Qed] Goal typed_band_int_ensures_ok : Valid
-[wp] [Qed] Goal typed_band_int_assert_ok : Valid
-[wp] [Qed] Goal typed_bor_int_ensures_ok : Valid
-[wp] [Qed] Goal typed_bxor_int_ensures_ok : Valid
-[wp] [Qed] Goal typed_bnot_int_ensures_ok : Valid
-[wp] [Qed] Goal typed_lshift_int_ensures_ok : Valid
-[wp] [Qed] Goal typed_rshift_int_ensures_ok : Valid
-[wp] [Qed] Goal typed_band1_uint_assert_ok : Valid
-[wp] [Qed] Goal typed_band1_uint_assert_ok_2 : Valid
-[wp] [Qed] Goal typed_band_uint_ensures_ok : Valid
-[wp] [Qed] Goal typed_bor_uint_ensures_ok : Valid
-[wp] [Qed] Goal typed_bxor_uint_ensures_ok : Valid
-[wp] [Alt-Ergo] Goal typed_bxor_uint_ensures_ok_2 : Valid
-[wp] [Qed] Goal typed_bnot_uint_ensures_ok : Valid
-[wp] [Qed] Goal typed_lshift_uint_ensures_ok : Valid
-[wp] [Qed] Goal typed_rshift_uint_ensures_ok : Valid
-[wp] [Alt-Ergo] Goal typed_band_char_ensures_ok : Valid
-[wp] [Alt-Ergo] Goal typed_bor_char_ensures_ok : Valid
-[wp] [Alt-Ergo] Goal typed_bxor_char_ensures_ok : Valid
-[wp] [Alt-Ergo] Goal typed_bnot_char_ensures_ok : Valid
-[wp] [Qed] Goal typed_lshift_char_ensures_ok : Valid
-[wp] [Qed] Goal typed_rshift_char_ensures_ok : Valid
-[wp] [Qed] Goal typed_band1_uchar_assert_ok : Valid
-[wp] [Qed] Goal typed_band1_uchar_assert_ok_2 : Valid
-[wp] [Alt-Ergo] Goal typed_band_uchar_ensures_ok : Valid
-[wp] [Qed] Goal typed_bor_uchar_ensures_ok : Valid
-[wp] [Qed] Goal typed_bxor_uchar_ensures_ok : Valid
-[wp] [Alt-Ergo] Goal typed_bxor_uchar_ensures_ok_2 : Valid
-[wp] [Qed] Goal typed_bnot_uchar_ensures_ok : Valid
-[wp] [Qed] Goal typed_lshift_uchar_ensures_ok : Valid
-[wp] [Alt-Ergo] Goal typed_rshift_uchar_ensures_ok : Valid
-[wp] [Qed] Goal typed_band1_ushort_assert_ok : Valid
-[wp] [Qed] Goal typed_band1_ushort_assert_ok_2 : Valid
-[wp] [Qed] Goal typed_band1_ulong_assert_ok : Valid
-[wp] [Qed] Goal typed_band1_ulong_assert_ok_2 : Valid
-[wp] [Qed] Goal typed_cast_ensures_ok : Valid
-[wp] [Qed] Goal typed_cast_assert_ok : Valid
-[wp] [Qed] Goal typed_cast_assert_ok_2 : Valid
-[wp] [Qed] Goal typed_cast_assert_ok_3 : Valid
-[wp] [Qed] Goal typed_cast_assert_ok_4 : Valid
-[wp] [Qed] Goal typed_cast_assert_ok_5 : Valid
-[wp] [Qed] Goal typed_cast_assert_ok_6 : Valid
-[wp] [Qed] Goal typed_cast_assert_ok_7 : Valid
+[wp] [Valid] typed_lemma_band_sint8 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_band_uint8 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_blsr_sint8 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_blsr_uint8 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_bnot_sint8 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_bor_sint8 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_bor_uint8 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_bxor_sint8 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_land_abs (Qed)
+[wp] [Valid] typed_lemma_land_assoc (Qed)
+[wp] [Valid] typed_lemma_land_com (Qed)
+[wp] [Valid] typed_lemma_land_stb (Qed)
+[wp] [Valid] typed_lemma_lor_assoc (Qed)
+[wp] [Valid] typed_lemma_lor_com (Qed)
+[wp] [Valid] typed_lemma_lor_neu (Qed)
+[wp] [Valid] typed_lemma_lor_stb (Qed)
+[wp] [Valid] typed_lemma_lxor_assoc (Qed)
+[wp] [Valid] typed_lemma_lxor_com (Qed)
+[wp] [Valid] typed_band_int_ensures_ok (Qed)
+[wp] [Valid] typed_band_int_assert_ok (Qed)
+[wp] [Valid] typed_bor_int_ensures_ok (Qed)
+[wp] [Valid] typed_bxor_int_ensures_ok (Qed)
+[wp] [Valid] typed_bnot_int_ensures_ok (Qed)
+[wp] [Valid] typed_lshift_int_ensures_ok (Qed)
+[wp] [Valid] typed_rshift_int_ensures_ok (Qed)
+[wp] [Valid] typed_band1_uint_assert_ok (Qed)
+[wp] [Valid] typed_band1_uint_assert_ok_2 (Qed)
+[wp] [Valid] typed_band_uint_ensures_ok (Qed)
+[wp] [Valid] typed_bor_uint_ensures_ok (Qed)
+[wp] [Valid] typed_bxor_uint_ensures_ok (Qed)
+[wp] [Valid] typed_bxor_uint_ensures_ok_2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_bnot_uint_ensures_ok (Qed)
+[wp] [Valid] typed_lshift_uint_ensures_ok (Qed)
+[wp] [Valid] typed_rshift_uint_ensures_ok (Qed)
+[wp] [Valid] typed_band_char_ensures_ok (Alt-Ergo) (Cached)
+[wp] [Valid] typed_bor_char_ensures_ok (Alt-Ergo) (Cached)
+[wp] [Valid] typed_bxor_char_ensures_ok (Alt-Ergo) (Cached)
+[wp] [Valid] typed_bnot_char_ensures_ok (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lshift_char_ensures_ok (Qed)
+[wp] [Valid] typed_rshift_char_ensures_ok (Qed)
+[wp] [Valid] typed_band1_uchar_assert_ok (Qed)
+[wp] [Valid] typed_band1_uchar_assert_ok_2 (Qed)
+[wp] [Valid] typed_band_uchar_ensures_ok (Alt-Ergo) (Cached)
+[wp] [Valid] typed_bor_uchar_ensures_ok (Qed)
+[wp] [Valid] typed_bxor_uchar_ensures_ok (Qed)
+[wp] [Valid] typed_bxor_uchar_ensures_ok_2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_bnot_uchar_ensures_ok (Qed)
+[wp] [Valid] typed_lshift_uchar_ensures_ok (Qed)
+[wp] [Valid] typed_rshift_uchar_ensures_ok (Alt-Ergo) (Cached)
+[wp] [Valid] typed_band1_ushort_assert_ok (Qed)
+[wp] [Valid] typed_band1_ushort_assert_ok_2 (Qed)
+[wp] [Valid] typed_band1_ulong_assert_ok (Qed)
+[wp] [Valid] typed_band1_ulong_assert_ok_2 (Qed)
+[wp] [Valid] typed_cast_ensures_ok (Qed)
+[wp] [Valid] typed_cast_assert_ok (Qed)
+[wp] [Valid] typed_cast_assert_ok_2 (Qed)
+[wp] [Valid] typed_cast_assert_ok_3 (Qed)
+[wp] [Valid] typed_cast_assert_ok_4 (Qed)
+[wp] [Valid] typed_cast_assert_ok_5 (Qed)
+[wp] [Valid] typed_cast_assert_ok_6 (Qed)
+[wp] [Valid] typed_cast_assert_ok_7 (Qed)
[wp] Proved goals: 61 / 61
Qed: 45
Alt-Ergo: 16
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.1.res.oracle
index 4e42c26ecdc..f8594c31156 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.1.res.oracle
@@ -3,10 +3,10 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 4 goals scheduled
-[wp] [Alt-Ergo] Goal typed_band_int_assert_ko : Unsuccess
-[wp] [Alt-Ergo] Goal typed_bnot_uint_ensures_ko : Unsuccess
-[wp] [Alt-Ergo] Goal typed_bnot_uchar_ensures_ko : Unsuccess
-[wp] [Alt-Ergo] Goal typed_cast_assert_ko : Unsuccess
+[wp] [Timeout] typed_band_int_assert_ko (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_bnot_uint_ensures_ko (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_bnot_uchar_ensures_ko (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_cast_assert_ko (Alt-Ergo) (Cached)
[wp] Proved goals: 0 / 4
Alt-Ergo: 0 (unsuccess: 4)
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_call.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_call.res.oracle
index 764c77ab83c..8511246e3d9 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_call.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_call.res.oracle
@@ -5,7 +5,7 @@
No code nor implicit assigns clause for function f, generating default assigns from the prototype
[wp] Warning: Missing RTE guards
[wp] 1 goal scheduled
-[wp] [Qed] Goal typed_job_assert : Valid
+[wp] [Valid] typed_job_assert (Qed)
[wp] Proved goals: 1 / 1
Qed: 1
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_cast.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_cast.res.oracle
index a64f3428fb9..ff8a95698cf 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_cast.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_cast.res.oracle
@@ -5,7 +5,7 @@
[wp] unit_cast.i:4: Warning:
Cast with incompatible pointers types (source: sint32*) (target: sint8*)
[wp] 1 goal scheduled
-[wp] [Qed] Goal typed_f_assert_OUT : Valid
+[wp] [Valid] typed_f_assert_OUT (Qed) (Stronger)
[wp] Proved goals: 1 / 1
Qed: 1
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_cst.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_cst.res.oracle
index 62c58484513..e08c05b056b 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_cst.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_cst.res.oracle
@@ -3,8 +3,8 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 2 goals scheduled
-[wp] [Qed] Goal typed_f_ensures_A : Valid
-[wp] [Qed] Goal typed_f_ensures_B : Valid
+[wp] [Valid] typed_f_ensures_A (Qed)
+[wp] [Valid] typed_f_ensures_B (Qed)
[wp] Proved goals: 2 / 2
Qed: 2
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_float.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_float.res.oracle
index 65274bde623..e4b89916e0f 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_float.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_float.res.oracle
@@ -6,12 +6,12 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 6 goals scheduled
-[wp] [Qed] Goal typed_main_ensures_CST_F : Valid
-[wp] [Qed] Goal typed_main_ensures_CST_D : Valid
-[wp] [Qed] Goal typed_main_ensures_CNV_F : Valid
-[wp] [Qed] Goal typed_main_ensures_CNV_D : Valid
-[wp] [Qed] Goal typed_main_ensures_VAR_F : Valid
-[wp] [Qed] Goal typed_main_ensures_VAR_D : Valid
+[wp] [Valid] typed_main_ensures_CST_F (Qed)
+[wp] [Valid] typed_main_ensures_CST_D (Qed)
+[wp] [Valid] typed_main_ensures_CNV_F (Qed)
+[wp] [Valid] typed_main_ensures_CNV_D (Qed)
+[wp] [Valid] typed_main_ensures_VAR_F (Qed)
+[wp] [Valid] typed_main_ensures_VAR_D (Qed)
[wp] Proved goals: 6 / 6
Qed: 6
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_hard.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_hard.res.oracle
index 0ed8a513df7..8641173d9ca 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_hard.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_hard.res.oracle
@@ -3,9 +3,9 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 3 goals scheduled
-[wp] [Qed] Goal typed_main_requires_p_is_33FF : Valid
-[wp] [Qed] Goal typed_main_requires_q_is_66F0 : Valid
-[wp] [Alt-Ergo] Goal typed_main_requires_r_is_q1_ko : Unsuccess
+[wp] [Valid] typed_main_requires_p_is_33FF (Qed)
+[wp] [Valid] typed_main_requires_q_is_66F0 (Qed)
+[wp] [Unknown] typed_main_requires_r_is_q1_ko (Alt-Ergo) (Cached)
[wp] Proved goals: 2 / 3
Qed: 2
Alt-Ergo: 0 (unsuccess: 1)
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_ite.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_ite.res.oracle
index e1e6ce212b4..086d1312038 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_ite.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_ite.res.oracle
@@ -3,7 +3,7 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 1 goal scheduled
-[wp] [Qed] Goal typed_check_ensures : Valid
+[wp] [Valid] typed_check_ensures (Qed)
[wp] Proved goals: 1 / 1
Qed: 1
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_labels.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_labels.res.oracle
index 050fa05259a..37b2344206f 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_labels.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_labels.res.oracle
@@ -3,9 +3,9 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 3 goals scheduled
-[wp] [Alt-Ergo] Goal typed_duplet_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_duplet_assert_PI : Valid
-[wp] [Alt-Ergo] Goal typed_duplet_assert_PJ : Valid
+[wp] [Valid] typed_duplet_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_duplet_assert_PI (Alt-Ergo) (Cached)
+[wp] [Valid] typed_duplet_assert_PJ (Alt-Ergo) (Cached)
[wp] Proved goals: 3 / 3
Qed: 0
Alt-Ergo: 3
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_lemma.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_lemma.res.oracle
index 9f0f8042b98..9783d65de72 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_lemma.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_lemma.res.oracle
@@ -2,12 +2,12 @@
[kernel] Parsing unit_lemma.i (no preprocessing)
[wp] Running WP plugin...
[wp] 6 goals scheduled
-[wp] [Alt-Ergo] Goal typed_lemma_Foo : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_P13 : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_P14 : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_P23_KO : Unsuccess
-[wp] [Alt-Ergo] Goal typed_lemma_P52 : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_P54 : Valid
+[wp] [Valid] typed_lemma_Foo (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_P13 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_P14 (Alt-Ergo) (Cached)
+[wp] [Unknown] typed_lemma_P23_KO (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_P52 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_lemma_P54 (Alt-Ergo) (Cached)
[wp] Proved goals: 5 / 6
Qed: 0
Alt-Ergo: 5 (unsuccess: 1)
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_local.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_local.0.res.oracle
index 47f5d6597bd..0f6204c6403 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_local.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_local.0.res.oracle
@@ -3,9 +3,9 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 3 goals scheduled
-[wp] [Qed] Goal typed_foo_assigns_part1 : Valid
-[wp] [Alt-Ergo] Goal typed_foo_assigns_part2 : Valid
-[wp] [Qed] Goal typed_bar_assigns : Valid
+[wp] [Valid] typed_foo_assigns_part1 (Qed)
+[wp] [Valid] typed_foo_assigns_part2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_bar_assigns (Qed)
[wp] Proved goals: 3 / 3
Qed: 2
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_local.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_local.1.res.oracle
index 8a6a8ae7efc..6d4b2c6c035 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_local.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_local.1.res.oracle
@@ -3,9 +3,9 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 3 goals scheduled
-[wp] [Alt-Ergo] Goal typed_raw_foo_assigns_part1 : Valid
-[wp] [Alt-Ergo] Goal typed_raw_foo_assigns_part2 : Valid
-[wp] [Alt-Ergo] Goal typed_raw_bar_assigns : Valid
+[wp] [Valid] typed_raw_foo_assigns_part1 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_raw_foo_assigns_part2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_raw_bar_assigns (Alt-Ergo) (Cached)
[wp] Proved goals: 3 / 3
Qed: 0
Alt-Ergo: 3
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_loopscope.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_loopscope.0.res.oracle
index 2729ba2028b..9cd1606c484 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_loopscope.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_loopscope.0.res.oracle
@@ -5,8 +5,8 @@
[wp] unit_loopscope.i:14: Warning:
Missing assigns clause (assigns 'everything' instead)
[wp] 2 goals scheduled
-[wp] [Qed] Goal typed_f_loop_invariant_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_f_loop_invariant_established : Unsuccess
+[wp] [Valid] typed_f_loop_invariant_preserved (Qed)
+[wp] [Unknown] typed_f_loop_invariant_established (Alt-Ergo) (Cached)
[wp] Proved goals: 1 / 2
Qed: 1
Alt-Ergo: 0 (unsuccess: 1)
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_loopscope.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_loopscope.1.res.oracle
index cdfb6b1f86b..6aa84b3c5fc 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_loopscope.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_loopscope.1.res.oracle
@@ -5,8 +5,8 @@
[wp] unit_loopscope.i:14: Warning:
Missing assigns clause (assigns 'everything' instead)
[wp] 2 goals scheduled
-[wp] [Qed] Goal typed_ref_f_loop_invariant_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_ref_f_loop_invariant_established : Unsuccess
+[wp] [Valid] typed_ref_f_loop_invariant_preserved (Qed)
+[wp] [Unknown] typed_ref_f_loop_invariant_established (Alt-Ergo) (Cached)
[wp] Proved goals: 1 / 2
Qed: 1
Alt-Ergo: 0 (unsuccess: 1)
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_matrix.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_matrix.res.oracle
index bf852b0844c..f9baeaed92a 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_matrix.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_matrix.res.oracle
@@ -3,9 +3,9 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 3 goals scheduled
-[wp] [Alt-Ergo] Goal typed_make_ensures_OK1 : Valid
-[wp] [Qed] Goal typed_make_ensures_OK2 : Valid
-[wp] [Alt-Ergo] Goal typed_make_ensures_KO : Unsuccess
+[wp] [Valid] typed_make_ensures_OK1 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_make_ensures_OK2 (Qed)
+[wp] [Timeout] typed_make_ensures_KO (Alt-Ergo) (Cached)
[wp] Proved goals: 2 / 3
Qed: 1
Alt-Ergo: 1 (unsuccess: 1)
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_string.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_string.res.oracle
index f894ee5abee..9a54cc2ef60 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_string.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_string.res.oracle
@@ -3,12 +3,12 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 6 goals scheduled
-[wp] [Alt-Ergo] Goal typed_f_assert_AB : Valid
-[wp] [Alt-Ergo] Goal typed_f_assert_B_valid : Valid
-[wp] [Alt-Ergo] Goal typed_f_assert_B_end : Valid
-[wp] [Alt-Ergo] Goal typed_f_assert_B_out : Valid
-[wp] [Alt-Ergo] Goal typed_f_assert_B_rw : Valid
-[wp] [Alt-Ergo] Goal typed_f_assert_VAL : Valid
+[wp] [Valid] typed_f_assert_AB (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_assert_B_valid (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_assert_B_end (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_assert_B_out (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_assert_B_rw (Alt-Ergo) (Cached)
+[wp] [Valid] typed_f_assert_VAL (Alt-Ergo) (Cached)
[wp] Proved goals: 6 / 6
Qed: 0
Alt-Ergo: 6
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_tset.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_tset.res.oracle
index 0a57553d8fa..fbc655a8548 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_tset.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_tset.res.oracle
@@ -3,9 +3,9 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 3 goals scheduled
-[wp] [Qed] Goal typed_complex_assigns_exit : Valid
-[wp] [Qed] Goal typed_complex_assigns_normal : Valid
-[wp] [Qed] Goal typed_complex_call_job_requires : Valid
+[wp] [Valid] typed_complex_assigns_exit (Qed)
+[wp] [Valid] typed_complex_assigns_normal (Qed)
+[wp] [Valid] typed_complex_call_job_requires (Qed)
[wp] Proved goals: 3 / 3
Qed: 3
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.res.oracle
index 552cfc2b333..d5996a1a091 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.res.oracle
@@ -3,18 +3,18 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 12 goals scheduled
-[wp] [Qed] Goal typed_ref_rl1_ensures_b0 : Valid
-[wp] [Alt-Ergo] Goal typed_ref_rl1_ensures_bk : Valid
-[wp] [Qed] Goal typed_ref_rr1_ensures_b0 : Valid
-[wp] [Alt-Ergo] Goal typed_ref_rr1_ensures_bk : Valid
-[wp] [Alt-Ergo] Goal typed_ref_rln32_ensures_b1 : Valid
-[wp] [Alt-Ergo] Goal typed_ref_rln32_ensures_b2 : Valid
-[wp] [Alt-Ergo] Goal typed_ref_rrn32_ensures_b1 : Valid
-[wp] [Alt-Ergo] Goal typed_ref_rrn32_ensures_b2 : Valid
-[wp] [Alt-Ergo] Goal typed_ref_rln64_ensures_b1 : Valid
-[wp] [Alt-Ergo] Goal typed_ref_rln64_ensures_b2 : Valid
-[wp] [Alt-Ergo] Goal typed_ref_rrn64_ensures_b1 : Valid
-[wp] [Alt-Ergo] Goal typed_ref_rrn64_ensures_b2 : Valid
+[wp] [Valid] typed_ref_rl1_ensures_b0 (Qed)
+[wp] [Valid] typed_ref_rl1_ensures_bk (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_rr1_ensures_b0 (Qed)
+[wp] [Valid] typed_ref_rr1_ensures_bk (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_rln32_ensures_b1 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_rln32_ensures_b2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_rrn32_ensures_b1 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_rrn32_ensures_b2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_rln64_ensures_b1 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_rln64_ensures_b2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_rrn64_ensures_b1 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_ref_rrn64_ensures_b2 (Alt-Ergo) (Cached)
[wp] Proved goals: 12 / 12
Qed: 2
Alt-Ergo: 10
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_collect.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_collect.res.oracle
index 2b77015db8f..ec4b7d19a42 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_collect.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_collect.res.oracle
@@ -3,38 +3,38 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 32 goals scheduled
-[wp] [Qed] Goal typed_job_ensures_K : Valid
-[wp] [Qed] Goal typed_job_ensures_P : Valid
-[wp] [Qed] Goal typed_job_assigns_part1 : Valid
-[wp] [Qed] Goal typed_job_assigns_part2 : Valid
-[wp] [Qed] Goal typed_job_assigns_part3 : Valid
-[wp] [Qed] Goal typed_job2_ensures_K : Valid
-[wp] [Qed] Goal typed_job2_ensures_Q : Valid
-[wp] [Qed] Goal typed_job2_assigns_part1 : Valid
-[wp] [Qed] Goal typed_job2_assigns_part2 : Valid
-[wp] [Qed] Goal typed_job2_assigns_part3 : Valid
-[wp] [Qed] Goal typed_job3_ensures_K : Valid
-[wp] [Alt-Ergo] Goal typed_job3_ensures_Q : Valid
-[wp] [Qed] Goal typed_job3_assigns_part1 : Valid
-[wp] [Qed] Goal typed_job3_assigns_part2 : Valid
-[wp] [Qed] Goal typed_job3_assigns_part3 : Valid
-[wp] [Qed] Goal typed_caller_ensures_K : Valid
-[wp] [Alt-Ergo] Goal typed_caller_ensures_P1 : Valid
-[wp] [Alt-Ergo] Goal typed_caller_ensures_P2 : Valid
-[wp] [Qed] Goal typed_caller_call_job_requires : Valid
-[wp] [Qed] Goal typed_caller_call_job_2_requires : Valid
-[wp] [Qed] Goal typed_caller2_ensures_K : Valid
-[wp] [Alt-Ergo] Goal typed_caller2_ensures_Q1 : Valid
-[wp] [Alt-Ergo] Goal typed_caller2_ensures_Q2 : Valid
-[wp] [Alt-Ergo] Goal typed_caller2_ensures_R : Valid
-[wp] [Qed] Goal typed_caller2_call_job2_requires : Valid
-[wp] [Qed] Goal typed_caller2_call_job2_2_requires : Valid
-[wp] [Qed] Goal typed_caller3_ensures_K : Valid
-[wp] [Alt-Ergo] Goal typed_caller3_ensures_Q1 : Valid
-[wp] [Alt-Ergo] Goal typed_caller3_ensures_Q2 : Valid
-[wp] [Alt-Ergo] Goal typed_caller3_ensures_R : Valid
-[wp] [Qed] Goal typed_caller3_call_job3_requires : Valid
-[wp] [Qed] Goal typed_caller3_call_job3_2_requires : Valid
+[wp] [Valid] typed_job_ensures_K (Qed)
+[wp] [Valid] typed_job_ensures_P (Qed)
+[wp] [Valid] typed_job_assigns_part1 (Qed)
+[wp] [Valid] typed_job_assigns_part2 (Qed)
+[wp] [Valid] typed_job_assigns_part3 (Qed)
+[wp] [Valid] typed_job2_ensures_K (Qed)
+[wp] [Valid] typed_job2_ensures_Q (Qed)
+[wp] [Valid] typed_job2_assigns_part1 (Qed)
+[wp] [Valid] typed_job2_assigns_part2 (Qed)
+[wp] [Valid] typed_job2_assigns_part3 (Qed)
+[wp] [Valid] typed_job3_ensures_K (Qed)
+[wp] [Valid] typed_job3_ensures_Q (Alt-Ergo) (Cached)
+[wp] [Valid] typed_job3_assigns_part1 (Qed)
+[wp] [Valid] typed_job3_assigns_part2 (Qed)
+[wp] [Valid] typed_job3_assigns_part3 (Qed)
+[wp] [Valid] typed_caller_ensures_K (Qed)
+[wp] [Valid] typed_caller_ensures_P1 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_caller_ensures_P2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_caller_call_job_requires (Qed)
+[wp] [Valid] typed_caller_call_job_2_requires (Qed)
+[wp] [Valid] typed_caller2_ensures_K (Qed)
+[wp] [Valid] typed_caller2_ensures_Q1 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_caller2_ensures_Q2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_caller2_ensures_R (Alt-Ergo) (Cached)
+[wp] [Valid] typed_caller2_call_job2_requires (Qed)
+[wp] [Valid] typed_caller2_call_job2_2_requires (Qed)
+[wp] [Valid] typed_caller3_ensures_K (Qed)
+[wp] [Valid] typed_caller3_ensures_Q1 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_caller3_ensures_Q2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_caller3_ensures_R (Alt-Ergo) (Cached)
+[wp] [Valid] typed_caller3_call_job3_requires (Qed)
+[wp] [Valid] typed_caller3_call_job3_2_requires (Qed)
[wp] Proved goals: 32 / 32
Qed: 23
Alt-Ergo: 9
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.res.oracle
index 03608893948..a40dba8e302 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.res.oracle
@@ -8,98 +8,98 @@
[wp] [CFG] Goal init_t2_v2_exits : Valid (Unreachable)
[wp] [CFG] Goal init_t2_v3_exits : Valid (Unreachable)
[wp] 92 goals scheduled
-[wp] [Alt-Ergo] Goal typed_init_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_init_loop_invariant_Partial_preserved : Valid
-[wp] [Qed] Goal typed_init_loop_invariant_Partial_established : Valid
-[wp] [Qed] Goal typed_init_loop_invariant_Range_preserved : Valid
-[wp] [Qed] Goal typed_init_loop_invariant_Range_established : Valid
-[wp] [Qed] Goal typed_init_loop_assigns_part1 : Valid
-[wp] [Qed] Goal typed_init_loop_assigns_part2 : Valid
-[wp] [Alt-Ergo] Goal typed_init_loop_assigns_part3 : Valid
-[wp] [Qed] Goal typed_init_assigns : Valid
-[wp] [Qed] Goal typed_init_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_init_loop_variant_positive : Valid
-[wp] [Alt-Ergo] Goal typed_init_t1_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_init_t1_loop_invariant_Partial_preserved : Valid
-[wp] [Qed] Goal typed_init_t1_loop_invariant_Partial_established : Valid
-[wp] [Alt-Ergo] Goal typed_init_t1_loop_invariant_Range_preserved : Valid
-[wp] [Qed] Goal typed_init_t1_loop_invariant_Range_established : Valid
-[wp] [Qed] Goal typed_init_t1_loop_assigns : Valid
-[wp] [Qed] Goal typed_init_t1_assigns_part1 : Valid
-[wp] [Qed] Goal typed_init_t1_assigns_part2 : Valid
-[wp] [Alt-Ergo] Goal typed_init_t1_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_init_t1_loop_variant_positive : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_v1_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_v1_loop_invariant_Partial_i_preserved : Valid
-[wp] [Qed] Goal typed_init_t2_v1_loop_invariant_Partial_i_established : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_v1_loop_invariant_Range_i_preserved : Valid
-[wp] [Qed] Goal typed_init_t2_v1_loop_invariant_Range_i_established : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_v1_loop_invariant_Partial_j_preserved : Valid
-[wp] [Qed] Goal typed_init_t2_v1_loop_invariant_Partial_j_established : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_v1_loop_invariant_Previous_i_preserved : Valid
-[wp] [Qed] Goal typed_init_t2_v1_loop_invariant_Previous_i_established : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_v1_loop_invariant_Range_j_preserved : Valid
-[wp] [Qed] Goal typed_init_t2_v1_loop_invariant_Range_j_established : Valid
-[wp] [Qed] Goal typed_init_t2_v1_assert_Last_j : Valid
-[wp] [Qed] Goal typed_init_t2_v1_assert_Last_i : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_v1_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_init_t2_v1_loop_variant_positive : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_v1_loop_variant_2_decrease : Valid
-[wp] [Qed] Goal typed_init_t2_v1_loop_variant_2_positive : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_v2_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_v2_loop_invariant_Partial_i_preserved : Valid
-[wp] [Qed] Goal typed_init_t2_v2_loop_invariant_Partial_i_established : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_v2_loop_invariant_Range_i_preserved : Valid
-[wp] [Qed] Goal typed_init_t2_v2_loop_invariant_Range_i_established : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_v2_loop_invariant_Partial_j_preserved : Valid
-[wp] [Qed] Goal typed_init_t2_v2_loop_invariant_Partial_j_established : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_v2_loop_invariant_Previous_i_preserved : Valid
-[wp] [Qed] Goal typed_init_t2_v2_loop_invariant_Previous_i_established : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_v2_loop_invariant_Range_j_preserved : Valid
-[wp] [Qed] Goal typed_init_t2_v2_loop_invariant_Range_j_established : Valid
-[wp] [Qed] Goal typed_init_t2_v2_assert_Last_j : Valid
-[wp] [Qed] Goal typed_init_t2_v2_assert_Last_i : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_v2_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_init_t2_v2_loop_variant_positive : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_v2_loop_variant_2_decrease : Valid
-[wp] [Qed] Goal typed_init_t2_v2_loop_variant_2_positive : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_v3_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_v3_loop_invariant_Partial_i_preserved : Valid
-[wp] [Qed] Goal typed_init_t2_v3_loop_invariant_Partial_i_established : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_v3_loop_invariant_Range_i_preserved : Valid
-[wp] [Qed] Goal typed_init_t2_v3_loop_invariant_Range_i_established : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_v3_loop_invariant_Partial_j_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_v3_loop_invariant_Partial_j_established : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_v3_loop_invariant_Range_j_preserved : Valid
-[wp] [Qed] Goal typed_init_t2_v3_loop_invariant_Range_j_established : Valid
-[wp] [Qed] Goal typed_init_t2_v3_assert_Last_j : Valid
-[wp] [Qed] Goal typed_init_t2_v3_assert_Last_i : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_v3_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_init_t2_v3_loop_variant_positive : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_v3_loop_variant_2_decrease : Valid
-[wp] [Qed] Goal typed_init_t2_v3_loop_variant_2_positive : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_bis_v1_ensures : Valid
-[wp] [Qed] Goal typed_init_t2_bis_v1_exits : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_bis_v1_loop_invariant_Partial_preserved : Valid
-[wp] [Qed] Goal typed_init_t2_bis_v1_loop_invariant_Partial_established : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_bis_v1_loop_invariant_Range_preserved : Valid
-[wp] [Qed] Goal typed_init_t2_bis_v1_loop_invariant_Range_established : Valid
-[wp] [Qed] Goal typed_init_t2_bis_v1_assert_Offset : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_bis_v1_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_init_t2_bis_v1_loop_variant_positive : Valid
-[wp] [Qed] Goal typed_init_t2_bis_v1_call_init_requires : Valid
-[wp] [Qed] Goal typed_init_t2_bis_v1_call_init_requires_2 : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_bis_v2_ensures : Valid
-[wp] [Qed] Goal typed_init_t2_bis_v2_exits : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_bis_v2_loop_invariant_Partial_preserved : Valid
-[wp] [Qed] Goal typed_init_t2_bis_v2_loop_invariant_Partial_established : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_bis_v2_loop_invariant_Range_preserved : Valid
-[wp] [Qed] Goal typed_init_t2_bis_v2_loop_invariant_Range_established : Valid
-[wp] [Qed] Goal typed_init_t2_bis_v2_assert_Offset_i : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_bis_v2_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_init_t2_bis_v2_loop_variant_positive : Valid
-[wp] [Qed] Goal typed_init_t2_bis_v2_call_init_requires : Valid
-[wp] [Qed] Goal typed_init_t2_bis_v2_call_init_requires_2 : Valid
+[wp] [Valid] typed_init_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_loop_invariant_Partial_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_loop_invariant_Partial_established (Qed)
+[wp] [Valid] typed_init_loop_invariant_Range_preserved (Qed)
+[wp] [Valid] typed_init_loop_invariant_Range_established (Qed)
+[wp] [Valid] typed_init_loop_assigns_part1 (Qed)
+[wp] [Valid] typed_init_loop_assigns_part2 (Qed)
+[wp] [Valid] typed_init_loop_assigns_part3 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_assigns (Qed)
+[wp] [Valid] typed_init_loop_variant_decrease (Qed)
+[wp] [Valid] typed_init_loop_variant_positive (Qed)
+[wp] [Valid] typed_init_t1_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t1_loop_invariant_Partial_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t1_loop_invariant_Partial_established (Qed)
+[wp] [Valid] typed_init_t1_loop_invariant_Range_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t1_loop_invariant_Range_established (Qed)
+[wp] [Valid] typed_init_t1_loop_assigns (Qed)
+[wp] [Valid] typed_init_t1_assigns_part1 (Qed)
+[wp] [Valid] typed_init_t1_assigns_part2 (Qed)
+[wp] [Valid] typed_init_t1_loop_variant_decrease (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t1_loop_variant_positive (Qed)
+[wp] [Valid] typed_init_t2_v1_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t2_v1_loop_invariant_Partial_i_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t2_v1_loop_invariant_Partial_i_established (Qed)
+[wp] [Valid] typed_init_t2_v1_loop_invariant_Range_i_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t2_v1_loop_invariant_Range_i_established (Qed)
+[wp] [Valid] typed_init_t2_v1_loop_invariant_Partial_j_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t2_v1_loop_invariant_Partial_j_established (Qed)
+[wp] [Valid] typed_init_t2_v1_loop_invariant_Previous_i_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t2_v1_loop_invariant_Previous_i_established (Qed)
+[wp] [Valid] typed_init_t2_v1_loop_invariant_Range_j_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t2_v1_loop_invariant_Range_j_established (Qed)
+[wp] [Valid] typed_init_t2_v1_assert_Last_j (Qed)
+[wp] [Valid] typed_init_t2_v1_assert_Last_i (Qed)
+[wp] [Valid] typed_init_t2_v1_loop_variant_decrease (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t2_v1_loop_variant_positive (Qed)
+[wp] [Valid] typed_init_t2_v1_loop_variant_2_decrease (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t2_v1_loop_variant_2_positive (Qed)
+[wp] [Valid] typed_init_t2_v2_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t2_v2_loop_invariant_Partial_i_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t2_v2_loop_invariant_Partial_i_established (Qed)
+[wp] [Valid] typed_init_t2_v2_loop_invariant_Range_i_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t2_v2_loop_invariant_Range_i_established (Qed)
+[wp] [Valid] typed_init_t2_v2_loop_invariant_Partial_j_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t2_v2_loop_invariant_Partial_j_established (Qed)
+[wp] [Valid] typed_init_t2_v2_loop_invariant_Previous_i_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t2_v2_loop_invariant_Previous_i_established (Qed)
+[wp] [Valid] typed_init_t2_v2_loop_invariant_Range_j_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t2_v2_loop_invariant_Range_j_established (Qed)
+[wp] [Valid] typed_init_t2_v2_assert_Last_j (Qed)
+[wp] [Valid] typed_init_t2_v2_assert_Last_i (Qed)
+[wp] [Valid] typed_init_t2_v2_loop_variant_decrease (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t2_v2_loop_variant_positive (Qed)
+[wp] [Valid] typed_init_t2_v2_loop_variant_2_decrease (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t2_v2_loop_variant_2_positive (Qed)
+[wp] [Valid] typed_init_t2_v3_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t2_v3_loop_invariant_Partial_i_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t2_v3_loop_invariant_Partial_i_established (Qed)
+[wp] [Valid] typed_init_t2_v3_loop_invariant_Range_i_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t2_v3_loop_invariant_Range_i_established (Qed)
+[wp] [Valid] typed_init_t2_v3_loop_invariant_Partial_j_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t2_v3_loop_invariant_Partial_j_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t2_v3_loop_invariant_Range_j_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t2_v3_loop_invariant_Range_j_established (Qed)
+[wp] [Valid] typed_init_t2_v3_assert_Last_j (Qed)
+[wp] [Valid] typed_init_t2_v3_assert_Last_i (Qed)
+[wp] [Valid] typed_init_t2_v3_loop_variant_decrease (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t2_v3_loop_variant_positive (Qed)
+[wp] [Valid] typed_init_t2_v3_loop_variant_2_decrease (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t2_v3_loop_variant_2_positive (Qed)
+[wp] [Valid] typed_init_t2_bis_v1_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t2_bis_v1_exits (Qed)
+[wp] [Valid] typed_init_t2_bis_v1_loop_invariant_Partial_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t2_bis_v1_loop_invariant_Partial_established (Qed)
+[wp] [Valid] typed_init_t2_bis_v1_loop_invariant_Range_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t2_bis_v1_loop_invariant_Range_established (Qed)
+[wp] [Valid] typed_init_t2_bis_v1_assert_Offset (Qed)
+[wp] [Valid] typed_init_t2_bis_v1_loop_variant_decrease (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t2_bis_v1_loop_variant_positive (Qed)
+[wp] [Valid] typed_init_t2_bis_v1_call_init_requires (Qed)
+[wp] [Valid] typed_init_t2_bis_v1_call_init_requires_2 (Qed)
+[wp] [Valid] typed_init_t2_bis_v2_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t2_bis_v2_exits (Qed)
+[wp] [Valid] typed_init_t2_bis_v2_loop_invariant_Partial_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t2_bis_v2_loop_invariant_Partial_established (Qed)
+[wp] [Valid] typed_init_t2_bis_v2_loop_invariant_Range_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t2_bis_v2_loop_invariant_Range_established (Qed)
+[wp] [Valid] typed_init_t2_bis_v2_assert_Offset_i (Qed)
+[wp] [Valid] typed_init_t2_bis_v2_loop_variant_decrease (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t2_bis_v2_loop_variant_positive (Qed)
+[wp] [Valid] typed_init_t2_bis_v2_call_init_requires (Qed)
+[wp] [Valid] typed_init_t2_bis_v2_call_init_requires_2 (Qed)
[wp] Proved goals: 97 / 97
Qed: 53
Alt-Ergo: 39
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.res.oracle
index cf4d5306048..e67a634d8b1 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.res.oracle
@@ -3,29 +3,29 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 23 goals scheduled
-[wp] [Qed] Goal typed_init_t2_v2_loop_assigns_part1 : Valid
-[wp] [Script] Goal typed_init_t2_v2_loop_assigns_part2 : Valid
-[wp] [Script] Goal typed_init_t2_v2_loop_assigns_part3 : Valid
-[wp] [Qed] Goal typed_init_t2_v2_loop_assigns_2_part1 : Valid
-[wp] [Script] Goal typed_init_t2_v2_loop_assigns_2_part2 : Valid
-[wp] [Script] Goal typed_init_t2_v2_loop_assigns_2_part3 : Valid
-[wp] [Qed] Goal typed_init_t2_v2_assigns_part1 : Valid
-[wp] [Script] Goal typed_init_t2_v2_assigns_part2 : Valid
-[wp] [Qed] Goal typed_init_t2_v3_loop_assigns_part1 : Valid
-[wp] [Script] Goal typed_init_t2_v3_loop_assigns_part2 : Valid
-[wp] [Script] Goal typed_init_t2_v3_loop_assigns_part3 : Valid
-[wp] [Qed] Goal typed_init_t2_v3_loop_assigns_2_part1 : Valid
-[wp] [Qed] Goal typed_init_t2_v3_loop_assigns_2_part2 : Valid
-[wp] [Qed] Goal typed_init_t2_v3_assigns_part1 : Valid
-[wp] [Script] Goal typed_init_t2_v3_assigns_part2 : Valid
-[wp] [Qed] Goal typed_init_t2_bis_v2_loop_assigns_part1 : Valid
-[wp] [Script] Goal typed_init_t2_bis_v2_loop_assigns_part2 : Valid
-[wp] [Script] Goal typed_init_t2_bis_v2_loop_assigns_part3 : Valid
-[wp] [Qed] Goal typed_init_t2_bis_v2_assigns_exit_part1 : Valid
-[wp] [Script] Goal typed_init_t2_bis_v2_assigns_exit_part2 : Valid
-[wp] [Qed] Goal typed_init_t2_bis_v2_assigns_exit_part3 : Valid
-[wp] [Qed] Goal typed_init_t2_bis_v2_assigns_normal_part1 : Valid
-[wp] [Script] Goal typed_init_t2_bis_v2_assigns_normal_part2 : Valid
+[wp] [Valid] typed_init_t2_v2_loop_assigns_part1 (Qed)
+[wp] [Valid] typed_init_t2_v2_loop_assigns_part2 (Script)
+[wp] [Valid] typed_init_t2_v2_loop_assigns_part3 (Script)
+[wp] [Valid] typed_init_t2_v2_loop_assigns_2_part1 (Qed)
+[wp] [Valid] typed_init_t2_v2_loop_assigns_2_part2 (Script)
+[wp] [Valid] typed_init_t2_v2_loop_assigns_2_part3 (Script)
+[wp] [Valid] typed_init_t2_v2_assigns_part1 (Qed)
+[wp] [Valid] typed_init_t2_v2_assigns_part2 (Script)
+[wp] [Valid] typed_init_t2_v3_loop_assigns_part1 (Qed)
+[wp] [Valid] typed_init_t2_v3_loop_assigns_part2 (Script)
+[wp] [Valid] typed_init_t2_v3_loop_assigns_part3 (Script)
+[wp] [Valid] typed_init_t2_v3_loop_assigns_2_part1 (Qed)
+[wp] [Valid] typed_init_t2_v3_loop_assigns_2_part2 (Qed)
+[wp] [Valid] typed_init_t2_v3_assigns_part1 (Qed)
+[wp] [Valid] typed_init_t2_v3_assigns_part2 (Script)
+[wp] [Valid] typed_init_t2_bis_v2_loop_assigns_part1 (Qed)
+[wp] [Valid] typed_init_t2_bis_v2_loop_assigns_part2 (Script)
+[wp] [Valid] typed_init_t2_bis_v2_loop_assigns_part3 (Script)
+[wp] [Valid] typed_init_t2_bis_v2_assigns_exit_part1 (Qed)
+[wp] [Valid] typed_init_t2_bis_v2_assigns_exit_part2 (Script)
+[wp] [Valid] typed_init_t2_bis_v2_assigns_exit_part3 (Qed)
+[wp] [Valid] typed_init_t2_bis_v2_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_init_t2_bis_v2_assigns_normal_part2 (Script)
[wp] Proved goals: 23 / 23
Qed: 11
Script: 12
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.2.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.2.res.oracle
index 3416ef1be51..49c3d939f28 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.2.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.2.res.oracle
@@ -3,22 +3,22 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 16 goals scheduled
-[wp] [Qed] Goal typed_init_t2_v1_loop_assigns_part1 : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_v1_loop_assigns_part2 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_init_t2_v1_loop_assigns_part3 : Unsuccess
-[wp] [Qed] Goal typed_init_t2_v1_loop_assigns_2_part1 : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_v1_loop_assigns_2_part2 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_init_t2_v1_loop_assigns_2_part3 : Unsuccess
-[wp] [Qed] Goal typed_init_t2_v1_assigns_part1 : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_v1_assigns_part2 : Unsuccess
-[wp] [Qed] Goal typed_init_t2_bis_v1_loop_assigns_part1 : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_bis_v1_loop_assigns_part2 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_init_t2_bis_v1_loop_assigns_part3 : Unsuccess
-[wp] [Qed] Goal typed_init_t2_bis_v1_assigns_exit_part1 : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_bis_v1_assigns_exit_part2 : Unsuccess
-[wp] [Qed] Goal typed_init_t2_bis_v1_assigns_exit_part3 : Valid
-[wp] [Qed] Goal typed_init_t2_bis_v1_assigns_normal_part1 : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_bis_v1_assigns_normal_part2 : Unsuccess
+[wp] [Valid] typed_init_t2_v1_loop_assigns_part1 (Qed)
+[wp] [Timeout] typed_init_t2_v1_loop_assigns_part2 (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_init_t2_v1_loop_assigns_part3 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t2_v1_loop_assigns_2_part1 (Qed)
+[wp] [Timeout] typed_init_t2_v1_loop_assigns_2_part2 (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_init_t2_v1_loop_assigns_2_part3 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t2_v1_assigns_part1 (Qed)
+[wp] [Timeout] typed_init_t2_v1_assigns_part2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t2_bis_v1_loop_assigns_part1 (Qed)
+[wp] [Timeout] typed_init_t2_bis_v1_loop_assigns_part2 (Alt-Ergo) (Cached)
+[wp] [Timeout] typed_init_t2_bis_v1_loop_assigns_part3 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t2_bis_v1_assigns_exit_part1 (Qed)
+[wp] [Unknown] typed_init_t2_bis_v1_assigns_exit_part2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_init_t2_bis_v1_assigns_exit_part3 (Qed)
+[wp] [Valid] typed_init_t2_bis_v1_assigns_normal_part1 (Qed)
+[wp] [Unknown] typed_init_t2_bis_v1_assigns_normal_part2 (Alt-Ergo) (Cached)
[wp] Proved goals: 7 / 16
Qed: 7
Alt-Ergo: 0 (unsuccess: 9)
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_injector.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_injector.0.res.oracle
index f55bf7c679f..b930588a078 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_injector.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_injector.0.res.oracle
@@ -3,26 +3,26 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 20 goals scheduled
-[wp] [Qed] Goal typed_job_ensures_SEQ : Valid
-[wp] [Qed] Goal typed_job_ensures_ID1 : Valid
-[wp] [Qed] Goal typed_job_ensures_ID2 : Valid
-[wp] [Qed] Goal typed_job_ensures_R1 : Valid
-[wp] [Qed] Goal typed_job_ensures_R2 : Valid
-[wp] [Qed] Goal typed_job_ensures_R0 : Valid
-[wp] [Qed] Goal typed_job_ensures_E1 : Valid
-[wp] [Qed] Goal typed_job_ensures_E2 : Valid
-[wp] [Qed] Goal typed_job_assigns_exit_part1 : Valid
-[wp] [Qed] Goal typed_job_assigns_exit_part2 : Valid
-[wp] [Qed] Goal typed_job_assigns_exit_part3 : Valid
-[wp] [Qed] Goal typed_job_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_job_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_job_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_job_assigns_normal_part4 : Valid
-[wp] [Qed] Goal typed_job_assigns_normal_part5 : Valid
-[wp] [Qed] Goal typed_job_assigns_normal_part6 : Valid
-[wp] [Qed] Goal typed_job_assigns_normal_part7 : Valid
-[wp] [Qed] Goal typed_job_assigns_normal_part8 : Valid
-[wp] [Qed] Goal typed_job_assigns_normal_part9 : Valid
+[wp] [Valid] typed_job_ensures_SEQ (Qed)
+[wp] [Valid] typed_job_ensures_ID1 (Qed)
+[wp] [Valid] typed_job_ensures_ID2 (Qed)
+[wp] [Valid] typed_job_ensures_R1 (Qed)
+[wp] [Valid] typed_job_ensures_R2 (Qed)
+[wp] [Valid] typed_job_ensures_R0 (Qed)
+[wp] [Valid] typed_job_ensures_E1 (Qed)
+[wp] [Valid] typed_job_ensures_E2 (Qed)
+[wp] [Valid] typed_job_assigns_exit_part1 (Qed)
+[wp] [Valid] typed_job_assigns_exit_part2 (Qed)
+[wp] [Valid] typed_job_assigns_exit_part3 (Qed)
+[wp] [Valid] typed_job_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_job_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_job_assigns_normal_part3 (Qed)
+[wp] [Valid] typed_job_assigns_normal_part4 (Qed)
+[wp] [Valid] typed_job_assigns_normal_part5 (Qed)
+[wp] [Valid] typed_job_assigns_normal_part6 (Qed)
+[wp] [Valid] typed_job_assigns_normal_part7 (Qed)
+[wp] [Valid] typed_job_assigns_normal_part8 (Qed)
+[wp] [Valid] typed_job_assigns_normal_part9 (Qed)
[wp] Proved goals: 20 / 20
Qed: 20
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_injector.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_injector.1.res.oracle
index a15c36af50f..1bb99dacb0e 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_injector.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_injector.1.res.oracle
@@ -3,22 +3,22 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 16 goals scheduled
-[wp] [Qed] Goal typed_ref_job_ensures_SEQ : Valid
-[wp] [Qed] Goal typed_ref_job_ensures_ID1 : Valid
-[wp] [Qed] Goal typed_ref_job_ensures_ID2 : Valid
-[wp] [Qed] Goal typed_ref_job_ensures_R1 : Valid
-[wp] [Qed] Goal typed_ref_job_ensures_R2 : Valid
-[wp] [Qed] Goal typed_ref_job_ensures_R0 : Valid
-[wp] [Qed] Goal typed_ref_job_ensures_E1 : Valid
-[wp] [Qed] Goal typed_ref_job_ensures_E2 : Valid
-[wp] [Qed] Goal typed_ref_job_assigns_exit_part1 : Valid
-[wp] [Qed] Goal typed_ref_job_assigns_exit_part2 : Valid
-[wp] [Qed] Goal typed_ref_job_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_ref_job_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_ref_job_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_ref_job_assigns_normal_part4 : Valid
-[wp] [Qed] Goal typed_ref_job_assigns_normal_part5 : Valid
-[wp] [Qed] Goal typed_ref_job_assigns_normal_part6 : Valid
+[wp] [Valid] typed_ref_job_ensures_SEQ (Qed)
+[wp] [Valid] typed_ref_job_ensures_ID1 (Qed)
+[wp] [Valid] typed_ref_job_ensures_ID2 (Qed)
+[wp] [Valid] typed_ref_job_ensures_R1 (Qed)
+[wp] [Valid] typed_ref_job_ensures_R2 (Qed)
+[wp] [Valid] typed_ref_job_ensures_R0 (Qed)
+[wp] [Valid] typed_ref_job_ensures_E1 (Qed)
+[wp] [Valid] typed_ref_job_ensures_E2 (Qed)
+[wp] [Valid] typed_ref_job_assigns_exit_part1 (Qed)
+[wp] [Valid] typed_ref_job_assigns_exit_part2 (Qed)
+[wp] [Valid] typed_ref_job_assigns_normal_part1 (Qed)
+[wp] [Valid] typed_ref_job_assigns_normal_part2 (Qed)
+[wp] [Valid] typed_ref_job_assigns_normal_part3 (Qed)
+[wp] [Valid] typed_ref_job_assigns_normal_part4 (Qed)
+[wp] [Valid] typed_ref_job_assigns_normal_part5 (Qed)
+[wp] [Valid] typed_ref_job_assigns_normal_part6 (Qed)
[wp] Proved goals: 16 / 16
Qed: 16
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.res.oracle
index e5acf75e0c5..f82c3a51625 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.res.oracle
@@ -3,24 +3,24 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 18 goals scheduled
-[wp] [Alt-Ergo] Goal typed_F1_ensures : Valid
-[wp] [Qed] Goal typed_F1_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_F1_loop_invariant_established : Valid
-[wp] [Alt-Ergo] Goal typed_F1_loop_invariant_2_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_F1_loop_invariant_2_established : Valid
-[wp] [Qed] Goal typed_F1_loop_assigns : Valid
-[wp] [Alt-Ergo] Goal typed_F2_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_F2_loop_invariant_PART_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_F2_loop_invariant_PART_established : Valid
-[wp] [Alt-Ergo] Goal typed_F2_loop_invariant_RANGE_preserved : Valid
-[wp] [Qed] Goal typed_F2_loop_invariant_RANGE_established : Valid
-[wp] [Qed] Goal typed_F2_loop_assigns : Valid
-[wp] [Alt-Ergo] Goal typed_F4_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_F4_loop_invariant_NEVER_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_F4_loop_invariant_NEVER_established : Valid
-[wp] [Alt-Ergo] Goal typed_F4_loop_invariant_RANGE_preserved : Valid
-[wp] [Qed] Goal typed_F4_loop_invariant_RANGE_established : Valid
-[wp] [Qed] Goal typed_F4_loop_assigns : Valid
+[wp] [Valid] typed_F1_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_F1_loop_invariant_preserved (Qed)
+[wp] [Valid] typed_F1_loop_invariant_established (Qed)
+[wp] [Valid] typed_F1_loop_invariant_2_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_F1_loop_invariant_2_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_F1_loop_assigns (Qed)
+[wp] [Valid] typed_F2_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_F2_loop_invariant_PART_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_F2_loop_invariant_PART_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_F2_loop_invariant_RANGE_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_F2_loop_invariant_RANGE_established (Qed)
+[wp] [Valid] typed_F2_loop_assigns (Qed)
+[wp] [Valid] typed_F4_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_F4_loop_invariant_NEVER_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_F4_loop_invariant_NEVER_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_F4_loop_invariant_RANGE_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_F4_loop_invariant_RANGE_established (Qed)
+[wp] [Valid] typed_F4_loop_assigns (Qed)
[wp] Proved goals: 18 / 18
Qed: 7
Alt-Ergo: 11
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_string.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_string.res.oracle
index 7ce998fa950..e2823ba2672 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_string.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_string.res.oracle
@@ -3,19 +3,19 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 13 goals scheduled
-[wp] [Qed] Goal typed_strlen_ensures : Valid
-[wp] [Qed] Goal typed_strlen_loop_invariant_BASE_preserved : Valid
-[wp] [Qed] Goal typed_strlen_loop_invariant_BASE_established : Valid
-[wp] [Alt-Ergo] Goal typed_strlen_loop_invariant_RANGE_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_strlen_loop_invariant_RANGE_established : Valid
-[wp] [Alt-Ergo] Goal typed_strlen_loop_invariant_ZERO_preserved : Valid
-[wp] [Qed] Goal typed_strlen_loop_invariant_ZERO_established : Valid
-[wp] [Alt-Ergo] Goal typed_strlen_assert_END : Valid
-[wp] [Qed] Goal typed_strlen_loop_assigns : Valid
-[wp] [Qed] Goal typed_strlen_assigns_part1 : Valid
-[wp] [Qed] Goal typed_strlen_assigns_part2 : Valid
-[wp] [Qed] Goal typed_strlen_loop_variant_decrease : Valid
-[wp] [Alt-Ergo] Goal typed_strlen_loop_variant_positive : Valid
+[wp] [Valid] typed_strlen_ensures (Qed)
+[wp] [Valid] typed_strlen_loop_invariant_BASE_preserved (Qed)
+[wp] [Valid] typed_strlen_loop_invariant_BASE_established (Qed)
+[wp] [Valid] typed_strlen_loop_invariant_RANGE_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_strlen_loop_invariant_RANGE_established (Alt-Ergo) (Cached)
+[wp] [Valid] typed_strlen_loop_invariant_ZERO_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_strlen_loop_invariant_ZERO_established (Qed)
+[wp] [Valid] typed_strlen_assert_END (Alt-Ergo) (Cached)
+[wp] [Valid] typed_strlen_loop_assigns (Qed)
+[wp] [Valid] typed_strlen_assigns_part1 (Qed)
+[wp] [Valid] typed_strlen_assigns_part2 (Qed)
+[wp] [Valid] typed_strlen_loop_variant_decrease (Qed)
+[wp] [Valid] typed_strlen_loop_variant_positive (Alt-Ergo) (Cached)
[wp] Proved goals: 13 / 13
Qed: 8
Alt-Ergo: 5
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_swap.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_swap.0.res.oracle
index 3257125abab..afe608c07d5 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_swap.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_swap.0.res.oracle
@@ -3,13 +3,13 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 7 goals scheduled
-[wp] [Alt-Ergo] Goal typed_swap_ensures_A : Valid
-[wp] [Qed] Goal typed_swap_ensures_B : Valid
-[wp] [Qed] Goal typed_swap_assigns_part1 : Valid
-[wp] [Qed] Goal typed_swap_assigns_part2 : Valid
-[wp] [Qed] Goal typed_main_assert : Valid
-[wp] [Qed] Goal typed_main_call_swap_requires : Valid
-[wp] [Qed] Goal typed_main_call_swap_requires_2 : Valid
+[wp] [Valid] typed_swap_ensures_A (Alt-Ergo) (Cached)
+[wp] [Valid] typed_swap_ensures_B (Qed)
+[wp] [Valid] typed_swap_assigns_part1 (Qed)
+[wp] [Valid] typed_swap_assigns_part2 (Qed)
+[wp] [Valid] typed_main_assert (Qed)
+[wp] [Valid] typed_main_call_swap_requires (Qed)
+[wp] [Valid] typed_main_call_swap_requires_2 (Qed)
[wp] Proved goals: 7 / 7
Qed: 6
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_swap.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_swap.1.res.oracle
index 3deaec819b6..125d6a55c07 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_swap.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_swap.1.res.oracle
@@ -3,12 +3,12 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 6 goals scheduled
-[wp] [Qed] Goal typed_ref_swap_ensures_A : Valid
-[wp] [Qed] Goal typed_ref_swap_ensures_B : Valid
-[wp] [Qed] Goal typed_ref_swap_assigns : Valid
-[wp] [Qed] Goal typed_ref_main_assert : Valid
-[wp] [Qed] Goal typed_ref_main_call_swap_requires : Valid
-[wp] [Qed] Goal typed_ref_main_call_swap_requires_2 : Valid
+[wp] [Valid] typed_ref_swap_ensures_A (Qed)
+[wp] [Valid] typed_ref_swap_ensures_B (Qed)
+[wp] [Valid] typed_ref_swap_assigns (Qed)
+[wp] [Valid] typed_ref_main_assert (Qed)
+[wp] [Valid] typed_ref_main_call_swap_requires (Qed)
+[wp] [Valid] typed_ref_main_call_swap_requires_2 (Qed)
[wp] Proved goals: 6 / 6
Qed: 6
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_usage/oracle_qualif/caveat2.res.oracle b/src/plugins/wp/tests/wp_usage/oracle_qualif/caveat2.res.oracle
index 1797f0fdbbb..4b4999bcc31 100644
--- a/src/plugins/wp/tests/wp_usage/oracle_qualif/caveat2.res.oracle
+++ b/src/plugins/wp/tests/wp_usage/oracle_qualif/caveat2.res.oracle
@@ -4,15 +4,15 @@
[wp] Warning: Missing RTE guards
[wp] caveat2.i:14: Warning: Undefined array-size (sint32[])
[wp] 9 goals scheduled
-[wp] [Qed] Goal typed_caveat_job_ensures_N : Valid
-[wp] [Alt-Ergo] Goal typed_caveat_job_ensures_A : Valid
-[wp] [Qed] Goal typed_caveat_job_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_caveat_job_loop_invariant_established : Valid
-[wp] [Alt-Ergo] Goal typed_caveat_job_loop_invariant_2_preserved : Valid
-[wp] [Qed] Goal typed_caveat_job_loop_invariant_2_established : Valid
-[wp] [Qed] Goal typed_caveat_job_loop_assigns : Valid
-[wp] [Qed] Goal typed_caveat_job_assigns_part1 : Valid
-[wp] [Qed] Goal typed_caveat_job_assigns_part2 : Valid
+[wp] [Valid] typed_caveat_job_ensures_N (Qed)
+[wp] [Valid] typed_caveat_job_ensures_A (Alt-Ergo) (Cached) (Stronger)
+[wp] [Valid] typed_caveat_job_loop_invariant_preserved (Qed)
+[wp] [Valid] typed_caveat_job_loop_invariant_established (Qed)
+[wp] [Valid] typed_caveat_job_loop_invariant_2_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_caveat_job_loop_invariant_2_established (Qed)
+[wp] [Valid] typed_caveat_job_loop_assigns (Qed)
+[wp] [Valid] typed_caveat_job_assigns_part1 (Qed)
+[wp] [Valid] typed_caveat_job_assigns_part2 (Qed)
[wp] Proved goals: 9 / 9
Qed: 7
Alt-Ergo: 2
diff --git a/src/plugins/wp/tests/wp_usage/oracle_qualif/caveat_range.res.oracle b/src/plugins/wp/tests/wp_usage/oracle_qualif/caveat_range.res.oracle
index 4dd118b0742..7d81e16a03d 100644
--- a/src/plugins/wp/tests/wp_usage/oracle_qualif/caveat_range.res.oracle
+++ b/src/plugins/wp/tests/wp_usage/oracle_qualif/caveat_range.res.oracle
@@ -3,18 +3,18 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 12 goals scheduled
-[wp] [Alt-Ergo] Goal typed_caveat_reset_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_caveat_reset_ensures_2 : Valid
-[wp] [Qed] Goal typed_caveat_reset_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_caveat_reset_loop_invariant_established : Valid
-[wp] [Alt-Ergo] Goal typed_caveat_reset_loop_invariant_2_preserved : Valid
-[wp] [Qed] Goal typed_caveat_reset_loop_invariant_2_established : Valid
-[wp] [Alt-Ergo] Goal typed_caveat_reset_loop_invariant_3_preserved : Valid
-[wp] [Qed] Goal typed_caveat_reset_loop_invariant_3_established : Valid
-[wp] [Qed] Goal typed_caveat_reset_loop_assigns_part1 : Valid
-[wp] [Qed] Goal typed_caveat_reset_loop_assigns_part2 : Valid
-[wp] [Qed] Goal typed_caveat_reset_loop_assigns_part3 : Valid
-[wp] [Qed] Goal typed_caveat_reset_assigns : Valid
+[wp] [Valid] typed_caveat_reset_ensures (Alt-Ergo) (Cached)
+[wp] [Valid] typed_caveat_reset_ensures_2 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_caveat_reset_loop_invariant_preserved (Qed)
+[wp] [Valid] typed_caveat_reset_loop_invariant_established (Qed)
+[wp] [Valid] typed_caveat_reset_loop_invariant_2_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_caveat_reset_loop_invariant_2_established (Qed)
+[wp] [Valid] typed_caveat_reset_loop_invariant_3_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_caveat_reset_loop_invariant_3_established (Qed)
+[wp] [Valid] typed_caveat_reset_loop_assigns_part1 (Qed)
+[wp] [Valid] typed_caveat_reset_loop_assigns_part2 (Qed)
+[wp] [Valid] typed_caveat_reset_loop_assigns_part3 (Qed)
+[wp] [Valid] typed_caveat_reset_assigns (Qed)
[wp] Proved goals: 12 / 12
Qed: 8
Alt-Ergo: 4
diff --git a/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.0.res.oracle b/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.0.res.oracle
index 593b7a3bd52..44b09c2a518 100644
--- a/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.0.res.oracle
+++ b/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.0.res.oracle
@@ -3,36 +3,36 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 30 goals scheduled
-[wp] [Alt-Ergo] Goal typed_memcpy_alias_vars_ensures_memcpy : Valid
-[wp] [Alt-Ergo] Goal typed_memcpy_alias_vars_ensures_unmodified : Valid
-[wp] [Alt-Ergo] Goal typed_memcpy_alias_vars_loop_invariant_cpy_preserved : Valid
-[wp] [Qed] Goal typed_memcpy_alias_vars_loop_invariant_cpy_established : Valid
-[wp] [Qed] Goal typed_memcpy_alias_vars_loop_invariant_dst_preserved : Valid
-[wp] [Qed] Goal typed_memcpy_alias_vars_loop_invariant_dst_established : Valid
-[wp] [Alt-Ergo] Goal typed_memcpy_alias_vars_loop_invariant_len_preserved : Valid
-[wp] [Qed] Goal typed_memcpy_alias_vars_loop_invariant_len_established : Valid
-[wp] [Qed] Goal typed_memcpy_alias_vars_loop_invariant_src_preserved : Valid
-[wp] [Qed] Goal typed_memcpy_alias_vars_loop_invariant_src_established : Valid
-[wp] [Qed] Goal typed_memcpy_alias_vars_loop_assigns_part1 : Valid
-[wp] [Qed] Goal typed_memcpy_alias_vars_loop_assigns_part2 : Valid
-[wp] [Qed] Goal typed_memcpy_alias_vars_loop_assigns_part3 : Valid
-[wp] [Alt-Ergo] Goal typed_memcpy_alias_vars_loop_assigns_part4 : Valid
-[wp] [Qed] Goal typed_memcpy_alias_vars_assigns : Valid
-[wp] [Alt-Ergo] Goal typed_memcpy_context_vars_ensures_memcpy_ok : Valid
-[wp] [Alt-Ergo] Goal typed_memcpy_context_vars_ensures_unmodified_ok : Valid
-[wp] [Alt-Ergo] Goal typed_memcpy_context_vars_loop_invariant_ok_cpy_preserved : Valid
-[wp] [Qed] Goal typed_memcpy_context_vars_loop_invariant_ok_cpy_established : Valid
-[wp] [Qed] Goal typed_memcpy_context_vars_loop_invariant_ok_dst_preserved : Valid
-[wp] [Qed] Goal typed_memcpy_context_vars_loop_invariant_ok_dst_established : Valid
-[wp] [Alt-Ergo] Goal typed_memcpy_context_vars_loop_invariant_ok_len_preserved : Valid
-[wp] [Qed] Goal typed_memcpy_context_vars_loop_invariant_ok_len_established : Valid
-[wp] [Qed] Goal typed_memcpy_context_vars_loop_invariant_ok_src_preserved : Valid
-[wp] [Qed] Goal typed_memcpy_context_vars_loop_invariant_ok_src_established : Valid
-[wp] [Qed] Goal typed_memcpy_context_vars_loop_assigns_part1 : Valid
-[wp] [Qed] Goal typed_memcpy_context_vars_loop_assigns_part2 : Valid
-[wp] [Qed] Goal typed_memcpy_context_vars_loop_assigns_part3 : Valid
-[wp] [Alt-Ergo] Goal typed_memcpy_context_vars_loop_assigns_part4 : Valid
-[wp] [Qed] Goal typed_memcpy_context_vars_assigns : Valid
+[wp] [Valid] typed_memcpy_alias_vars_ensures_memcpy (Alt-Ergo) (Cached)
+[wp] [Valid] typed_memcpy_alias_vars_ensures_unmodified (Alt-Ergo) (Cached)
+[wp] [Valid] typed_memcpy_alias_vars_loop_invariant_cpy_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_memcpy_alias_vars_loop_invariant_cpy_established (Qed)
+[wp] [Valid] typed_memcpy_alias_vars_loop_invariant_dst_preserved (Qed)
+[wp] [Valid] typed_memcpy_alias_vars_loop_invariant_dst_established (Qed)
+[wp] [Valid] typed_memcpy_alias_vars_loop_invariant_len_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_memcpy_alias_vars_loop_invariant_len_established (Qed)
+[wp] [Valid] typed_memcpy_alias_vars_loop_invariant_src_preserved (Qed)
+[wp] [Valid] typed_memcpy_alias_vars_loop_invariant_src_established (Qed)
+[wp] [Valid] typed_memcpy_alias_vars_loop_assigns_part1 (Qed)
+[wp] [Valid] typed_memcpy_alias_vars_loop_assigns_part2 (Qed)
+[wp] [Valid] typed_memcpy_alias_vars_loop_assigns_part3 (Qed)
+[wp] [Valid] typed_memcpy_alias_vars_loop_assigns_part4 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_memcpy_alias_vars_assigns (Qed)
+[wp] [Valid] typed_memcpy_context_vars_ensures_memcpy_ok (Alt-Ergo) (Cached)
+[wp] [Valid] typed_memcpy_context_vars_ensures_unmodified_ok (Alt-Ergo) (Cached)
+[wp] [Valid] typed_memcpy_context_vars_loop_invariant_ok_cpy_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_memcpy_context_vars_loop_invariant_ok_cpy_established (Qed)
+[wp] [Valid] typed_memcpy_context_vars_loop_invariant_ok_dst_preserved (Qed)
+[wp] [Valid] typed_memcpy_context_vars_loop_invariant_ok_dst_established (Qed)
+[wp] [Valid] typed_memcpy_context_vars_loop_invariant_ok_len_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_memcpy_context_vars_loop_invariant_ok_len_established (Qed)
+[wp] [Valid] typed_memcpy_context_vars_loop_invariant_ok_src_preserved (Qed)
+[wp] [Valid] typed_memcpy_context_vars_loop_invariant_ok_src_established (Qed)
+[wp] [Valid] typed_memcpy_context_vars_loop_assigns_part1 (Qed)
+[wp] [Valid] typed_memcpy_context_vars_loop_assigns_part2 (Qed)
+[wp] [Valid] typed_memcpy_context_vars_loop_assigns_part3 (Qed)
+[wp] [Valid] typed_memcpy_context_vars_loop_assigns_part4 (Alt-Ergo) (Cached)
+[wp] [Valid] typed_memcpy_context_vars_assigns (Qed)
[wp] Proved goals: 30 / 30
Qed: 20
Alt-Ergo: 10
diff --git a/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.1.res.oracle b/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.1.res.oracle
index 542edabc6c2..b48b2ec718c 100644
--- a/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.1.res.oracle
+++ b/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.1.res.oracle
@@ -3,16 +3,16 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 10 goals scheduled
-[wp] [Alt-Ergo] Goal typed_memcpy_context_vars_ensures_memcpy_ok : Valid
-[wp] [Qed] Goal typed_memcpy_context_vars_ensures_unmodified_ok : Valid
-[wp] [Alt-Ergo] Goal typed_memcpy_context_vars_loop_invariant_ok_cpy_preserved : Valid
-[wp] [Qed] Goal typed_memcpy_context_vars_loop_invariant_ok_cpy_established : Valid
-[wp] [Qed] Goal typed_memcpy_context_vars_loop_invariant_ok_dst_preserved : Valid
-[wp] [Qed] Goal typed_memcpy_context_vars_loop_invariant_ok_dst_established : Valid
-[wp] [Alt-Ergo] Goal typed_memcpy_context_vars_loop_invariant_ok_len_preserved : Valid
-[wp] [Qed] Goal typed_memcpy_context_vars_loop_invariant_ok_len_established : Valid
-[wp] [Qed] Goal typed_memcpy_context_vars_loop_invariant_ok_src_preserved : Valid
-[wp] [Qed] Goal typed_memcpy_context_vars_loop_invariant_ok_src_established : Valid
+[wp] [Valid] typed_memcpy_context_vars_ensures_memcpy_ok (Alt-Ergo) (Cached)
+[wp] [Valid] typed_memcpy_context_vars_ensures_unmodified_ok (Qed)
+[wp] [Valid] typed_memcpy_context_vars_loop_invariant_ok_cpy_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_memcpy_context_vars_loop_invariant_ok_cpy_established (Qed)
+[wp] [Valid] typed_memcpy_context_vars_loop_invariant_ok_dst_preserved (Qed)
+[wp] [Valid] typed_memcpy_context_vars_loop_invariant_ok_dst_established (Qed)
+[wp] [Valid] typed_memcpy_context_vars_loop_invariant_ok_len_preserved (Alt-Ergo) (Cached)
+[wp] [Valid] typed_memcpy_context_vars_loop_invariant_ok_len_established (Qed)
+[wp] [Valid] typed_memcpy_context_vars_loop_invariant_ok_src_preserved (Qed)
+[wp] [Valid] typed_memcpy_context_vars_loop_invariant_ok_src_established (Qed)
[wp] Proved goals: 10 / 10
Qed: 7
Alt-Ergo: 3
--
GitLab