Cleanup invariants in replace_calls

Author: hannes-steffenhagen-diffblue

regression/goto-instrument/replace-calls-03/test.desc

@@ -1,8 +1,8 @@
 CORE
 main.c
 --replace-calls f:g
-Functions f and g are not type-compatible
-^EXIT=11$
+functions f and g are not type-compatible
+^EXIT=1$
 ^SIGNAL=0$
 --
 ^warning: ignoring

regression/goto-instrument/replace-calls-04/test.desc

@@ -1,8 +1,8 @@
 CORE
 main.c
 --replace-calls f:g
-Functions f and g are not type-compatible
-^EXIT=11$
+functions f and g are not type-compatible
+^EXIT=1$
 ^SIGNAL=0$
 --
 ^warning: ignoring

regression/goto-instrument/replace-calls-05/test.desc

@@ -1,8 +1,8 @@
 CORE
 main.c
 --replace-calls f:g --replace-calls h:f
-Function f cannot both be replaced and be a replacement
-^EXIT=11$
+function f cannot both be replaced and be a replacement
+^EXIT=1$
 ^SIGNAL=0$
 --
 ^warning: ignoring

src/goto-programs/replace_calls.cpp

@@ -16,6 +16,7 @@ Author: Daniel Poetzl
 #include <goto-programs/remove_returns.h>
 
 #include <util/base_type.h>
+#include <util/exception_utils.h>
 #include <util/invariant.h>
 #include <util/irep.h>
 #include <util/string_utils.h>
@@ -105,8 +106,9 @@ void replace_callst::operator()(
       if(rhs.id() == ID_symbol)
       {
         const symbol_exprt &se = to_symbol_expr(rhs);
-        if(has_suffix(id2string(se.get_identifier()), RETURN_VALUE_SUFFIX))
-          throw "Returns must not be removed before replacing calls";
+        INVARIANT(
+          !has_suffix(id2string(se.get_identifier()), RETURN_VALUE_SUFFIX),
+          "returns must not be removed before replacing calls");
       }
     }
 
@@ -132,7 +134,10 @@ replace_callst::replacement_mapt replace_callst::parse_replacement_list(
       replacement_map.insert(std::make_pair(original, replacement));
 
     if(!r.second)
-      throw "Conflicting replacement for function " + original;
+    {
+      throw invalid_command_line_argument_exceptiont(
+        "conflicting replacement for function " + original, "--replace-calls");
+    }
   }
 
   return replacement_map;
@@ -146,22 +151,26 @@ void replace_callst::check_replacement_map(
   for(const auto &p : replacement_map)
   {
     if(replacement_map.find(p.second) != replacement_map.end())
-      throw "Function " + id2string(p.second) +
-        " cannot both be replaced and "
-        "be a replacement";
+      throw invalid_command_line_argument_exceptiont(
+        "function " + id2string(p.second) +
+          " cannot both be replaced and be a replacement",
+        "--replace-calls");
 
     auto it2 = goto_functions.function_map.find(p.second);
 
     if(it2 == goto_functions.function_map.end())
-      throw "Replacement function " + id2string(p.second) +
-        " needs to be present";
+      throw invalid_command_line_argument_exceptiont(
+        "replacement function " + id2string(p.second) + " needs to be present",
+        "--replace-calls");
 
     auto it1 = goto_functions.function_map.find(p.first);
     if(it1 != goto_functions.function_map.end())
     {
       if(!base_type_eq(it1->second.type, it2->second.type, ns))
-        throw "Functions " + id2string(p.first) + " and " +
-          id2string(p.second) + " are not type-compatible";
+        throw invalid_command_line_argument_exceptiont(
+          "functions " + id2string(p.first) + " and " + id2string(p.second) +
+            " are not type-compatible",
+          "--replace-calls");
     }
   }
 }