Merge pull request #7566 from diffblue/goto_program_deprecated

remove three deprecated goto_instructiont methods

Author: kroening

src/cprover/cprover_parse_options.cpp

@@ -62,7 +62,7 @@ static void show_goto_functions(const goto_modelt &goto_model)
       std::cout << "^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n\n";
 
       std::cout << symbol.display_name() << " /* " << symbol.name << " */\n";
-      fun->second.body.output(ns, symbol.name, std::cout);
+      fun->second.body.output(std::cout);
     }
   }
 }

src/goto-instrument/cover_basic_blocks.cpp

@@ -163,7 +163,7 @@ void cover_basic_blockst::add_block_lines(
     }
   };
   add_location(instruction.source_location());
-  instruction.get_code().visit_pre([&](const exprt &expr) {
+  instruction.code().visit_pre([&](const exprt &expr) {
     const auto &location = expr.source_location();
     if(!location.get_function().empty())
       add_location(location);

src/goto-instrument/full_slicer.cpp

@@ -235,7 +235,7 @@ static bool implicit(goto_programt::const_targett target)
 {
   // some variables are used during symbolic execution only
 
-  const irep_idt &statement = target->get_code().get_statement();
+  const irep_idt &statement = target->code().get_statement();
   if(statement==ID_array_copy)
     return true;
 

src/goto-instrument/goto_program2code.cpp

@@ -1964,8 +1964,8 @@ void goto_program2codet::copy_source_location(
   goto_programt::const_targett src,
   codet &dst)
 {
-  if(src->get_code().source_location().is_not_nil())
-    dst.add_source_location() = src->get_code().source_location();
+  if(src->code().source_location().is_not_nil())
+    dst.add_source_location() = src->code().source_location();
   else if(src->source_location().is_not_nil())
     dst.add_source_location() = src->source_location();
 }

src/goto-programs/goto_program.h

@@ -19,7 +19,6 @@ Author: Daniel Kroening, [email protected]
 #include <limits>
 #include <string>
 
-#include <util/deprecate.h>
 #include <util/invariant.h>
 #include <util/source_location.h>
 
@@ -184,13 +183,6 @@ class goto_programt
     goto_instruction_codet _code;
 
   public:
-    /// Get the code represented by this instruction
-    DEPRECATED(SINCE(2021, 10, 12, "Use code() instead"))
-    const goto_instruction_codet &get_code() const
-    {
-      return _code;
-    }
-
     /// Get the code represented by this instruction
     const goto_instruction_codet &code() const
     {
@@ -734,30 +726,9 @@ class goto_programt
     return add(instructiont(type));
   }
 
-  /// Output goto program to given stream
-  DEPRECATED(SINCE(2022, 5, 29, "Use output(out) instead"))
-  std::ostream &output(
-    const namespacet &ns,
-    const irep_idt &identifier,
-    std::ostream &out) const
-  {
-    return output(out);
-  }
-
   /// Output goto-program to given stream
   std::ostream &output(std::ostream &out) const;
 
-  /// Output a single instruction
-  DEPRECATED(SINCE(2022, 5, 29, "Use instruction.output(out) instead"))
-  std::ostream &output_instruction(
-    const namespacet &ns,
-    const irep_idt &identifier,
-    std::ostream &out,
-    const instructionst::value_type &instruction) const
-  {
-    return instruction.output(out);
-  }
-
   /// Compute the target numbers
   void compute_target_numbers();