From 7421ddf7b1a1e2debc799eebf35d68b7195ef99d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20B=C3=BChler?= <david.buhler@cea.fr>
Date: Wed, 18 Mar 2020 18:20:48 +0100
Subject: [PATCH] [Eva] "-eva-domains name" is a shortcut for
"-eva-domains-function name:main+".
---
src/plugins/value/engine/abstractions.ml | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/plugins/value/engine/abstractions.ml b/src/plugins/value/engine/abstractions.ml
index d53585ed479..5f568596c56 100644
--- a/src/plugins/value/engine/abstractions.ml
+++ b/src/plugins/value/engine/abstractions.ml
@@ -90,15 +90,18 @@ module Config = struct
dynamic_abstractions := dynamic :: !dynamic_abstractions
let configure () =
+ let add_main_mode mode =
+ let main, _ = Globals.entry_point () in
+ (main, Domain_mode.Mode.all) :: mode
+ in
let add config name make =
- let enabled = Value_parameters.Domains.mem name
- and mode =
- try Some (Value_parameters.DomainsFunction.find name)
- with Not_found -> None
- in
- if enabled || mode <> None
- then add (make (), mode) config
- else config
+ let enabled = Value_parameters.Domains.mem name in
+ try
+ let mode = Value_parameters.DomainsFunction.find name in
+ let mode = if enabled then add_main_mode mode else mode in
+ add (make (), Some mode) config
+ with Not_found ->
+ if enabled then add (make (), None) config else config
in
let aux config (Flag domain as flag) =
add config domain.name (fun () -> flag)
--
GitLab