Add remove_instanceof overload to remove from a particular instruction

Author: NathanJPhillips

src/goto-programs/remove_instanceof.cpp

@@ -28,16 +28,17 @@ class remove_instanceoft
     class_hierarchy(symbol_table);
   }
 
-  // Lower instanceof for a single functions
+  // Lower instanceof for a single function
   bool lower_instanceof(goto_programt &);
 
+  // Lower instanceof for a single instruction
+  bool lower_instanceof(goto_programt &, goto_programt::targett);
+
 protected:
   symbol_tablet &symbol_table;
   namespacet ns;
   class_hierarchyt class_hierarchy;
 
-  bool lower_instanceof(goto_programt &, goto_programt::targett);
-
   std::size_t lower_instanceof(
     exprt &, goto_programt &, goto_programt::targett);
 };
@@ -168,9 +169,24 @@ bool remove_instanceoft::lower_instanceof(goto_programt &goto_program)
 }
 
 
+/// Replace an instanceof in the expression or guard of the passed instruction
+/// of the given function body with an explicit class-identifier test.
+/// \remarks Extra auxiliary variables may be introduced into symbol_table.
+/// \param target: The instruction to work on.
+/// \param goto_program: The function body containing the instruction.
+/// \param symbol_table: The symbol table to add symbols to.
+void remove_instanceof(
+  goto_programt::targett target,
+  goto_programt &goto_program,
+  symbol_tablet &symbol_table)
+{
+  remove_instanceoft rem(symbol_table);
+  rem.lower_instanceof(goto_program, target);
+}
+
 /// Replace every instanceof in the passed function with an explicit
 /// class-identifier test.
-/// Extra auxiliary variables may be introduced into symbol_table.
+/// \remarks Extra auxiliary variables may be introduced into symbol_table.
 /// \param function: The function to work on.
 /// \param symbol_table: The symbol table to add symbols to.
 void remove_instanceof(
@@ -183,7 +199,7 @@ void remove_instanceof(
 
 /// Replace every instanceof in every function with an explicit
 /// class-identifier test.
-/// Extra auxiliary variables may be introduced into symbol_table.
+/// \remarks Extra auxiliary variables may be introduced into symbol_table.
 /// \param goto_functions: The functions to work on.
 /// \param symbol_table: The symbol table to add symbols to.
 void remove_instanceof(
@@ -198,6 +214,11 @@ void remove_instanceof(
     goto_functions.compute_location_numbers();
 }
 
+/// Replace every instanceof in every function with an explicit
+/// class-identifier test.
+/// \remarks Extra auxiliary variables may be introduced into symbol_table.
+/// \param goto_model: The functions to work on and the symbol table to add
+/// symbols to.
 void remove_instanceof(goto_modelt &goto_model)
 {
   remove_instanceof(goto_model.goto_functions, goto_model.symbol_table);

src/goto-programs/remove_instanceof.h

@@ -16,6 +16,11 @@ Author: Chris Smowton, [email protected]
 #include "goto_functions.h"
 #include "goto_model.h"
 
+void remove_instanceof(
+  goto_programt::targett target,
+  goto_programt &goto_program,
+  symbol_tablet &symbol_table);
+
 void remove_instanceof(
   goto_functionst::goto_functiont &function,
   symbol_tablet &symbol_table);