Merge branch 'fix/eva/protect' into 'master'

[Eva] Fixes function Value_util.protect, which can be called multiple times.

See merge request frama-c/frama-c!3487

src/plugins/value/utils/value_util.ml

@@ -111,17 +111,19 @@ let protect_only_once = ref true
 
 let protect f ~cleanup =
   let catch () = !protect_only_once && not (Kernel.SaveState.is_empty ()) in
+  let cleanup () =
+    Value_parameters.feedback ~once:true "Clean up and save partial results.";
+    try cleanup ()
+    with e ->
+      protect_only_once := false;
+      raise e
+  in
   try f ();
   with
   | Log.AbortError _ | Log.AbortFatal _ | Log.FeatureRequest _
   | Sys.Break as e when catch () ->
-    try
-      Value_parameters.feedback ~once:true "Clean up and save partial results.";
-      cleanup ();
-      raise e;
-    with e ->
-      protect_only_once := false;
-      raise e
+    cleanup ();
+    raise e
 
 let register_new_var v typ =
   if Cil.isFunctionType typ then