fixup! fixup! Do not use optionalt::value()

Author: tautschnig

src/goto-cc/gcc_message_handler.cpp

@@ -69,9 +69,9 @@ void gcc_message_handlert::print(
     if(file_name.has_value() && !line.empty())
     {
 #ifdef _MSC_VER
-      std::ifstream in(widen(file_name.value()));
+      std::ifstream in(widen(*file_name));
 #else
-      std::ifstream in(file_name.value());
+      std::ifstream in(*file_name);
 #endif
       if(in)
       {

src/goto-harness/goto_harness_generator.cpp

@@ -46,7 +46,7 @@ std::size_t require_one_size_value(
   auto value = string2optional<std::size_t>(string_value, 10);
   if(value.has_value())
   {
-    return value.value();
+    return *value;
   }
   else
   {

src/goto-harness/goto_harness_parse_options.cpp

@@ -118,7 +118,7 @@ int goto_harness_parse_optionst::doit()
     throw deserialization_exceptiont{"failed to read goto program from file '" +
                                      got_harness_config.in_file + "'"};
   }
-  auto goto_model = std::move(read_goto_binary_result.value());
+  auto goto_model = std::move(*read_goto_binary_result);
   auto const goto_model_without_harness_symbols =
     get_symbol_names_from_goto_model(goto_model);
 

src/goto-harness/recursive_initialization.cpp

@@ -39,7 +39,7 @@ bool recursive_initialization_configt::handle_option(
       string2optional<std::size_t>(value, 10);
     if(user_min_null_tree_depth.has_value())
     {
-      min_null_tree_depth = user_min_null_tree_depth.value();
+      min_null_tree_depth = *user_min_null_tree_depth;
     }
     else
     {
@@ -57,7 +57,7 @@ bool recursive_initialization_configt::handle_option(
       string2optional<std::size_t>(value, 10);
     if(user_max_nondet_tree_depth.has_value())
     {
-      max_nondet_tree_depth = user_max_nondet_tree_depth.value();
+      max_nondet_tree_depth = *user_max_nondet_tree_depth;
     }
     else
     {
@@ -203,7 +203,7 @@ void recursive_initializationt::initialize(
       if(size_var.has_value())
       {
         const symbol_exprt &size_symbol =
-          goto_model.symbol_table.lookup_ref(size_var.value()).symbol_expr();
+          goto_model.symbol_table.lookup_ref(*size_var).symbol_expr();
         body.add(code_function_callt{
           fun_symbol.symbol_expr(),
           {depth, address_of_exprt{lhs}, address_of_exprt{size_symbol}}});
@@ -304,7 +304,7 @@ irep_idt recursive_initializationt::build_constructor(const exprt &expr)
   {
     expr_name = to_symbol_expr(expr).get_identifier();
     is_nullable = initialization_config.potential_null_function_pointers.count(
-      expr_name.value());
+      *expr_name);
     if(should_be_treated_as_array(*expr_name))
     {
       size_var = get_associated_size_variable(*expr_name);

src/solvers/flattening/boolbv_quantifier.cpp

@@ -195,8 +195,8 @@ static optionalt<exprt> eager_quantifier_instantiation(
   if(!min_i.has_value() || !max_i.has_value())
     return {};
 
-  mp_integer lb = numeric_cast_v<mp_integer>(min_i.value());
-  mp_integer ub = numeric_cast_v<mp_integer>(max_i.value());
+  mp_integer lb = numeric_cast_v<mp_integer>(*min_i);
+  mp_integer ub = numeric_cast_v<mp_integer>(*max_i);
 
   if(lb > ub)
     return {};

src/solvers/flattening/pointer_logic.cpp

@@ -116,7 +116,7 @@ exprt pointer_logict::pointer_expr(
   auto deep_object_opt =
     get_subexpression_at_offset(object_expr, pointer.offset, subtype, ns);
   CHECK_RETURN(deep_object_opt.has_value());
-  exprt deep_object = deep_object_opt.value();
+  exprt deep_object = *deep_object_opt;
   simplify(deep_object, ns);
   if(
     deep_object.id() != ID_byte_extract_little_endian &&