Use goto verifier for --paths in CBMC

Author: peterschrammel

src/cbmc/cbmc_parse_options.cpp

@@ -37,6 +37,7 @@ Author: Daniel Kroening, [email protected]
 #include <goto-checker/multi_path_symex_checker.h>
 #include <goto-checker/multi_path_symex_only_checker.h>
 #include <goto-checker/properties.h>
+#include <goto-checker/single_path_symex_checker.h>
 #include <goto-checker/single_path_symex_only_checker.h>
 #include <goto-checker/stop_on_fail_verifier.h>
 
@@ -571,32 +572,57 @@ int cbmc_parse_optionst::doit()
   if(
     options.get_bool_option("dimacs") || !options.get_option("outfile").empty())
   {
-    if(!options.get_bool_option("paths"))
+    std::unique_ptr<goto_verifiert> verifier;
+    if(options.get_bool_option("paths"))
     {
-      stop_on_fail_verifiert<multi_path_symex_checkert> verifier(
-        options, ui_message_handler, goto_model);
-      (void)verifier();
-      return CPROVER_EXIT_SUCCESS;
+      verifier =
+        util_make_unique<stop_on_fail_verifiert<single_path_symex_checkert>>(
+          options, ui_message_handler, goto_model);
+    }
+    else
+    {
+      verifier =
+        util_make_unique<stop_on_fail_verifiert<multi_path_symex_checkert>>(
+          options, ui_message_handler, goto_model);
     }
+
+    (void)(*verifier)();
+    return CPROVER_EXIT_SUCCESS;
   }
 
   std::unique_ptr<goto_verifiert> verifier = nullptr;
 
   if(
-    !options.get_bool_option("paths") && !options.is_set("cover") &&
-    !options.get_bool_option("dimacs") && options.get_option("outfile").empty())
+    !options.is_set("cover") && !options.get_bool_option("dimacs") &&
+    options.get_option("outfile").empty())
   {
     if(options.get_bool_option("stop-on-fail"))
     {
-      verifier =
-        util_make_unique<stop_on_fail_verifiert<multi_path_symex_checkert>>(
-          options, ui_message_handler, goto_model);
+      if(options.get_bool_option("paths"))
+      {
+        verifier =
+          util_make_unique<stop_on_fail_verifiert<single_path_symex_checkert>>(
+            options, ui_message_handler, goto_model);
+      }
+      else
+      {
+        verifier =
+          util_make_unique<stop_on_fail_verifiert<multi_path_symex_checkert>>(
+            options, ui_message_handler, goto_model);
+      }
     }
     else
     {
-      verifier = util_make_unique<
-        all_properties_verifier_with_trace_storaget<multi_path_symex_checkert>>(
-        options, ui_message_handler, goto_model);
+      if(options.get_bool_option("paths"))
+      {
+        verifier = util_make_unique<all_properties_verifier_with_trace_storaget<
+          single_path_symex_checkert>>(options, ui_message_handler, goto_model);
+      }
+      else
+      {
+        verifier = util_make_unique<all_properties_verifier_with_trace_storaget<
+          multi_path_symex_checkert>>(options, ui_message_handler, goto_model);
+      }
     }
   }