Refactor error handling of function pointer restriction

Author: danpoe

src/goto-programs/restrict_function_pointers.cpp

@@ -20,66 +20,6 @@ Author: Diffblue Ltd.
 
 namespace
 {
-void typecheck_function_pointer_restrictions(
-  const goto_modelt &goto_model,
-  const function_pointer_restrictionst &restrictions)
-{
-  const std::string options =
-    "--" RESTRICT_FUNCTION_POINTER_OPT "/"
-    "--" RESTRICT_FUNCTION_POINTER_FROM_FILE_OPT "/"
-    "--" RESTRICT_FUNCTION_POINTER_BY_NAME_OPT;
-
-  for(auto const &restriction : restrictions.restrictions)
-  {
-    auto const function_pointer_sym =
-      goto_model.symbol_table.lookup(restriction.first);
-    if(function_pointer_sym == nullptr)
-    {
-      throw invalid_command_line_argument_exceptiont{
-        id2string(restriction.first) + " not found in the symbol table",
-        options};
-    }
-    auto const &function_pointer_type = function_pointer_sym->type;
-    if(function_pointer_type.id() != ID_pointer)
-    {
-      throw invalid_command_line_argument_exceptiont{
-        "not a function pointer: " + id2string(restriction.first),
-        options};
-    }
-    auto const &function_type =
-      to_pointer_type(function_pointer_type).subtype();
-    if(function_type.id() != ID_code)
-    {
-      throw invalid_command_line_argument_exceptiont{
-        "not a function pointer: " + id2string(restriction.first),
-        options};
-    }
-    auto const &ns = namespacet{goto_model.symbol_table};
-    for(auto const &function_pointer_target : restriction.second)
-    {
-      auto const function_pointer_target_sym =
-        goto_model.symbol_table.lookup(function_pointer_target);
-      if(function_pointer_target_sym == nullptr)
-      {
-        throw invalid_command_line_argument_exceptiont{
-          "symbol not found: " + id2string(function_pointer_target),
-          options};
-      }
-      auto const &function_pointer_target_type =
-        function_pointer_target_sym->type;
-      if(function_type != function_pointer_target_type)
-      {
-        throw invalid_command_line_argument_exceptiont{
-          "type mismatch: `" + id2string(restriction.first) + "' points to `" +
-            type2c(function_type, ns) + "', but restriction `" +
-            id2string(function_pointer_target) + "' has type `" +
-            type2c(function_pointer_target_type, ns) + "'",
-          options};
-      }
-    }
-  }
-}
-
 source_locationt make_function_pointer_restriction_assertion_source_location(
   source_locationt source_location,
   const function_pointer_restrictionst::restrictiont restriction)
@@ -200,12 +140,83 @@ void restrict_function_pointer(
 }
 } // namespace
 
+function_pointer_restrictionst::invalid_restriction_exceptiont::
+invalid_restriction_exceptiont(std::string reason, std::string correct_format)
+  : reason(std::move(reason)), correct_format(std::move(correct_format))
+{
+
+}
+
+std::string
+function_pointer_restrictionst::invalid_restriction_exceptiont::what() const
+{
+  std::string res;
+
+  res += "Invalid restriction";
+  res += "\nReason: " + reason;
+
+  if(!correct_format.empty())
+  {
+    res += "\nFormat: " + correct_format;
+  }
+
+  return res;
+}
+
+void function_pointer_restrictionst::typecheck_function_pointer_restrictions(
+  const goto_modelt &goto_model,
+  const function_pointer_restrictionst::restrictionst &restrictions)
+{
+  for(auto const &restriction : restrictions)
+  {
+    auto const function_pointer_sym =
+      goto_model.symbol_table.lookup(restriction.first);
+    if(function_pointer_sym == nullptr)
+    {
+      throw invalid_restriction_exceptiont{
+        id2string(restriction.first) + " not found in the symbol table"};
+    }
+    auto const &function_pointer_type = function_pointer_sym->type;
+    if(function_pointer_type.id() != ID_pointer)
+    {
+      throw invalid_restriction_exceptiont{
+        "not a function pointer: " + id2string(restriction.first)};
+    }
+    auto const &function_type =
+      to_pointer_type(function_pointer_type).subtype();
+    if(function_type.id() != ID_code)
+    {
+      throw invalid_restriction_exceptiont{
+        "not a function pointer: " + id2string(restriction.first)};
+    }
+    auto const &ns = namespacet{goto_model.symbol_table};
+    for(auto const &function_pointer_target : restriction.second)
+    {
+      auto const function_pointer_target_sym =
+        goto_model.symbol_table.lookup(function_pointer_target);
+      if(function_pointer_target_sym == nullptr)
+      {
+        throw invalid_restriction_exceptiont{
+          "symbol not found: " + id2string(function_pointer_target)};
+      }
+      auto const &function_pointer_target_type =
+        function_pointer_target_sym->type;
+      if(function_type != function_pointer_target_type)
+      {
+        throw invalid_restriction_exceptiont{
+          "type mismatch: `" + id2string(restriction.first) + "' points to `" +
+            type2c(function_type, ns) + "', but restriction `" +
+            id2string(function_pointer_target) + "' has type `" +
+            type2c(function_pointer_target_type, ns) + "'"};
+      }
+    }
+  }
+}
+
 void restrict_function_pointers(
   goto_modelt &goto_model,
   const function_pointer_restrictionst &restrictions)
 {
-  typecheck_function_pointer_restrictions(goto_model, restrictions);
-
   for(auto &function_item : goto_model.goto_functions.function_map)
   {
     goto_functiont &goto_function = function_item.second;
@@ -283,10 +294,9 @@ function_pointer_restrictionst::parse_function_pointer_restrictions(
 
     if(!inserted)
     {
-      throw invalid_command_line_argument_exceptiont{
+      throw invalid_restriction_exceptiont{
         "function pointer restriction for `" + id2string(restriction.first) +
-          "' was specified twice",
-        option};
+          "' was specified twice"};
     }
   }
 
@@ -335,25 +345,22 @@ function_pointer_restrictionst::parse_function_pointer_restriction(
 
   if(pointer_name_end == std::string::npos)
   {
-    throw invalid_command_line_argument_exceptiont{
+    throw invalid_restriction_exceptiont{
       "couldn't find '/' in `" + restriction_opt + "'",
-      option,
       restriction_format_message};
   }
 
   if(pointer_name_end == restriction_opt.size())
   {
-    throw invalid_command_line_argument_exceptiont{
+    throw invalid_restriction_exceptiont{
       "couldn't find names of targets after '/' in `" + restriction_opt + "'",
-      option,
       restriction_format_message};
   }
 
   if(pointer_name_end == 0)
   {
-    throw invalid_command_line_argument_exceptiont{
-      "couldn't find target name before '/' in `" + restriction_opt + "'",
-      option};
+    throw invalid_restriction_exceptiont{
+      "couldn't find target name before '/' in `" + restriction_opt + "'"};
   }
 
   auto const pointer_name = restriction_opt.substr(0, pointer_name_end);
@@ -363,9 +370,8 @@ function_pointer_restrictionst::parse_function_pointer_restriction(
 
   if(target_name_strings.size() == 1 && target_name_strings[0].empty())
   {
-    throw invalid_command_line_argument_exceptiont{
+    throw invalid_restriction_exceptiont{
       "missing target list for function pointer restriction " + pointer_name,
-      option,
       restriction_format_message};
   }
 
@@ -376,9 +382,8 @@ function_pointer_restrictionst::parse_function_pointer_restriction(
   {
     if(target_name == ID_empty_string)
     {
-      throw invalid_command_line_argument_exceptiont(
+      throw invalid_restriction_exceptiont(
         "leading or trailing comma in restrictions for `" + pointer_name + "'",
-        option,
         restriction_format_message);
     }
   }
@@ -436,18 +441,49 @@ function_pointer_restrictionst function_pointer_restrictionst::from_options(
 {
   auto const restriction_opts =
     options.get_list_option(RESTRICT_FUNCTION_POINTER_OPT);
-  auto const commandline_restrictions =
-    parse_function_pointer_restrictions_from_command_line(restriction_opts);
-
-  auto const restriction_file_opts =
-    options.get_list_option(RESTRICT_FUNCTION_POINTER_FROM_FILE_OPT);
-  auto const file_restrictions = parse_function_pointer_restrictions_from_file(
-    restriction_file_opts, message_handler);
-
-  auto const restriction_name_opts =
-    options.get_list_option(RESTRICT_FUNCTION_POINTER_BY_NAME_OPT);
-  auto const name_restrictions = get_function_pointer_by_name_restrictions(
-    restriction_name_opts, goto_model);
+
+  restrictionst commandline_restrictions;
+  try
+  {
+    commandline_restrictions =
+      parse_function_pointer_restrictions_from_command_line(restriction_opts);
+    typecheck_function_pointer_restrictions(
+      goto_model, commandline_restrictions);
+  }
+  catch(const invalid_restriction_exceptiont &e)
+  {
+    throw invalid_command_line_argument_exceptiont{
+      e.reason, "--" RESTRICT_FUNCTION_POINTER_OPT, e.correct_format};
+  }
+
+  restrictionst file_restrictions;
+  try
+  {
+    auto const restriction_file_opts =
+      options.get_list_option(RESTRICT_FUNCTION_POINTER_FROM_FILE_OPT);
+    file_restrictions = parse_function_pointer_restrictions_from_file(
+      restriction_file_opts, message_handler);
+    typecheck_function_pointer_restrictions(goto_model, file_restrictions);
+  }
+  catch(const invalid_restriction_exceptiont &e)
+  {
+    throw deserialization_exceptiont{e.what()};
+  }
+
+  restrictionst name_restrictions;
+  try
+  {
+    auto const restriction_name_opts =
+      options.get_list_option(RESTRICT_FUNCTION_POINTER_BY_NAME_OPT);
+    name_restrictions = get_function_pointer_by_name_restrictions(
+      restriction_name_opts, goto_model);
+    typecheck_function_pointer_restrictions(goto_model, name_restrictions);
+  }
+  catch(const invalid_restriction_exceptiont &e)
+  {
+    throw invalid_command_line_argument_exceptiont{
+      e.reason, "--" RESTRICT_FUNCTION_POINTER_BY_NAME_OPT, e.correct_format};
+  }
 
   return {merge_function_pointer_restrictions(
     commandline_restrictions,

src/goto-programs/restrict_function_pointers.h

@@ -82,6 +82,23 @@ class function_pointer_restrictionst
   void write_to_file(const std::string &filename) const;
 
 protected:
+  class invalid_restriction_exceptiont : public cprover_exception_baset
+  {
+  public:
+    explicit invalid_restriction_exceptiont(
+      std::string reason,
+      std::string correct_format = "");
+
+    std::string what() const override;
+
+    std::string reason;
+    std::string correct_format;
+  };
+
+  static void typecheck_function_pointer_restrictions(
+    const goto_modelt &goto_model,
+    const restrictionst &restrictions);
+
   static restrictionst merge_function_pointer_restrictions(
     restrictionst lhs,
     const restrictionst &rhs);

unit/goto-programs/restrict_function_pointers.cpp

@@ -45,29 +45,29 @@ void restriction_parsing_test()
 
   REQUIRE_THROWS_AS(
     fp_restrictionst::parse_function_pointer_restriction("func", "test"),
-    invalid_command_line_argument_exceptiont);
+    fp_restrictionst::invalid_restriction_exceptiont);
 
   REQUIRE_THROWS_AS(
     fp_restrictionst::parse_function_pointer_restriction("/func", "test"),
-    invalid_command_line_argument_exceptiont);
+    fp_restrictionst::invalid_restriction_exceptiont);
 
   REQUIRE_THROWS_AS(
     fp_restrictionst::parse_function_pointer_restriction("func/", "test"),
-    invalid_command_line_argument_exceptiont);
+    fp_restrictionst::invalid_restriction_exceptiont);
 
   REQUIRE_THROWS_AS(
     fp_restrictionst::parse_function_pointer_restriction("func/,", "test"),
-    invalid_command_line_argument_exceptiont);
+    fp_restrictionst::invalid_restriction_exceptiont);
 
   REQUIRE_THROWS_AS(
     fp_restrictionst::parse_function_pointer_restriction(
       "func1/func2,", "test"),
-    invalid_command_line_argument_exceptiont);
+      fp_restrictionst::invalid_restriction_exceptiont);
 
   REQUIRE_THROWS_AS(
     fp_restrictionst::parse_function_pointer_restriction(
       "func1/,func2", "test"),
-    invalid_command_line_argument_exceptiont);
+      fp_restrictionst::invalid_restriction_exceptiont);
 }
 
 void merge_restrictions_test()