Add optionst to path_storaget context

This is in preparation for a subclass of path_storaget that acts on some
of the options that are passed in.

Author: karkhaz

src/cbmc/bmc.cpp

@@ -492,7 +492,7 @@ int bmct::do_language_agnostic_bmc(
   INVARIANT(
     path_strategy_chooser.is_valid_strategy(strategy),
     "Front-end passed us invalid path strategy '" + strategy + "'");
-  const path_storaget::strategy_contextt strategy_context(message);
+  const path_storaget::strategy_contextt strategy_context(message, opts);
   worklist = path_strategy_chooser.get(strategy, strategy_context);
   try
   {

src/goto-instrument/accelerate/scratch_program.h

@@ -43,9 +43,9 @@ class scratch_programt:public goto_programt
       ns(symbol_table, symex_symbol_table),
       equation(),
       log(mh),
-      strategy_context(log),
-      path_storage(strategy_context),
       options(),
+      strategy_context(log, options),
+      path_storage(strategy_context),
       symex(mh, symbol_table, equation, options, path_storage),
       satcheck(util_make_unique<satcheckt>()),
       satchecker(ns, *satcheck),
@@ -86,9 +86,9 @@ class scratch_programt:public goto_programt
   namespacet ns;
   symex_target_equationt equation;
   messaget log;
+  optionst options;
   const path_storaget::strategy_contextt strategy_context;
   degenerate_path_storaget path_storage;
-  optionst options;
   goto_symext symex;
 
   std::unique_ptr<propt> satcheck;

src/goto-symex/path_storage.h

@@ -56,12 +56,13 @@ class path_storaget
   /// history.
   struct strategy_contextt
   {
-    explicit strategy_contextt(messaget &log)
-      : log(log)
+    strategy_contextt(messaget &log, const optionst &options)
+      : log(log), options(options)
     {
     }
 
     messaget &log;
+    const optionst &options;
   };
 
   explicit path_storaget(const strategy_contextt &ctx)

unit/path_strategies.cpp

@@ -355,7 +355,7 @@ void _check_with_strategy(
 
   path_strategy_choosert chooser;
   REQUIRE(chooser.is_valid_strategy(strategy));
-  const path_storaget::strategy_contextt strategy_context(log);
+  const path_storaget::strategy_contextt strategy_context(log, opts);
   std::unique_ptr<path_storaget> worklist = chooser.get(
     strategy, strategy_context);