diff --git a/src/plugins/value/partitioning/partitioning_parameters.ml b/src/plugins/value/partitioning/partitioning_parameters.ml index 2c6b4ccb8eb2b6acc5ce9a9b4f291f3923c3c0e2..77aecd2890d236914afb00f77473f73f280a2f4e 100644 --- a/src/plugins/value/partitioning/partitioning_parameters.ml +++ b/src/plugins/value/partitioning/partitioning_parameters.ml @@ -140,12 +140,11 @@ struct in List.fold_left map_annot [] (get_flow_annot stmt) - let call_return_policy = { - Partition.callee_splits = - Value_parameters.InterproceduralPartitioningKeepSplits.get (); - callee_history = - Value_parameters.InterproceduralPartitioningKeepHistory.get (); - caller_history = true; - history_size = history_size; - } + let call_return_policy = + Partition.{ + callee_splits = Value_parameters.InterproceduralSplits.get (); + callee_history = Value_parameters.InterproceduralHistory.get (); + caller_history = true; + history_size = history_size; + } end diff --git a/src/plugins/value/value_parameters.ml b/src/plugins/value/value_parameters.ml index 324cb0f02f98b6d146f2e27a16e5ca41e25a285c..11f8cce3e58081ea89ad878f2ad8534a50e6507e 100644 --- a/src/plugins/value/value_parameters.ml +++ b/src/plugins/value/value_parameters.ml @@ -792,24 +792,22 @@ let () = add_precision_dep SplitLimit.parameter let () = SplitLimit.set_range 0 max_int let () = Parameter_customize.set_group precision_tuning -let () = Parameter_customize.is_invisible () -module InterproceduralPartitioningKeepSplits = +module InterproceduralSplits = False (struct - let option_name = "-eva-interprocedural-partitioning-keep-splits" + let option_name = "-eva-interprocedural-splits" let help = "Keep partitioning splits through function returns" end) -let () = add_precision_dep InterproceduralPartitioningKeepSplits.parameter +let () = add_precision_dep InterproceduralSplits.parameter let () = Parameter_customize.set_group precision_tuning -let () = Parameter_customize.is_invisible () -module InterproceduralPartitioningKeepHistory = +module InterproceduralHistory = False (struct - let option_name = "-eva-interprocedural-partitioning-keep-history" + let option_name = "-eva-interprocedural-history" let help = "Keep partitioning history through function returns" end) -let () = add_precision_dep InterproceduralPartitioningKeepHistory.parameter +let () = add_precision_dep InterproceduralHistory.parameter let () = Parameter_customize.set_group precision_tuning let () = Parameter_customize.argument_may_be_fundecl () diff --git a/src/plugins/value/value_parameters.mli b/src/plugins/value/value_parameters.mli index dca2eb2210838753fa044d046fcc2d01ffe24f54..a05cde2a46d6bbdf015865524e5dda608eb4d91d 100644 --- a/src/plugins/value/value_parameters.mli +++ b/src/plugins/value/value_parameters.mli @@ -79,8 +79,8 @@ module DefaultLoopUnroll : Parameter_sig.Int module HistoryPartitioning : Parameter_sig.Int module ValuePartitioning : Parameter_sig.String_set module SplitLimit : Parameter_sig.Int -module InterproceduralPartitioningKeepSplits : Parameter_sig.Bool -module InterproceduralPartitioningKeepHistory : Parameter_sig.Bool +module InterproceduralSplits : Parameter_sig.Bool +module InterproceduralHistory : Parameter_sig.Bool module ArrayPrecisionLevel: Parameter_sig.Int diff --git a/tests/value/partitioning-interproc.c b/tests/value/partitioning-interproc.c index 5e6882b7dd9e77aa263eaff689ed424a37117585..a8ff322ad4e4cc3e76ddad2118ce3087a3bb5a87 100644 --- a/tests/value/partitioning-interproc.c +++ b/tests/value/partitioning-interproc.c @@ -1,8 +1,8 @@ /* run.config* GCC: - STDOPT: #"-main cassign_test -eva-partition-history 1 -eva-interprocedural-partitioning-keep-history" - STDOPT: #"-main fabs_test -eva-partition-history 1 -eva-domains equality -eva-interprocedural-partitioning-keep-history" - STDOPT: #"-main fabs_splits_test -eva-partition-history 1 -eva-domains equality -eva-interprocedural-partitioning-keep-splits" + STDOPT: #"-main cassign_test -eva-partition-history 1 -eva-interprocedural-history" + STDOPT: #"-main fabs_test -eva-partition-history 1 -eva-domains equality -eva-interprocedural-history" + STDOPT: #"-main fabs_splits_test -eva-partition-history 1 -eva-domains equality -eva-interprocedural-splits" */ #include "__fc_builtin.h"