Merge pull request #6857 from diffblue/_code

instructiont::get_code -> code

Author: kroening

jbmc/src/java_bytecode/remove_exceptions.cpp

@@ -234,7 +234,7 @@ void remove_exceptionst::instrument_exception_handler(
   {
     // retrieve the exception variable
     const exprt &thrown_exception_local =
-      to_code_landingpad(instr_it->get_code()).catch_expr();
+      to_code_landingpad(instr_it->code()).catch_expr();
 
     const symbol_exprt thrown_global_symbol=
       get_inflight_exception_global();
@@ -407,7 +407,7 @@ bool remove_exceptionst::instrument_throw(
   PRECONDITION(instr_it->type() == THROW);
 
   const exprt &exc_expr =
-    uncaught_exceptions_domaint::get_exception_symbol(instr_it->get_code());
+    uncaught_exceptions_domaint::get_exception_symbol(instr_it->code());
 
   add_exception_dispatch_sequence(
     function_identifier, goto_program, instr_it, stack_catch, locals);
@@ -512,7 +512,7 @@ void remove_exceptionst::instrument_exceptions(
     // Is it a handler push/pop or catch landing-pad?
     else if(instr_it->type() == CATCH)
     {
-      const irep_idt &statement = instr_it->get_code().get_statement();
+      const irep_idt &statement = instr_it->code().get_statement();
       // Is it an exception landing pad (start of a catch block)?
       if(statement==ID_exception_landingpad)
       {
@@ -553,7 +553,7 @@ void remove_exceptionst::instrument_exceptions(
 
         // copy targets
         const code_push_catcht::exception_listt &exception_list =
-          to_code_push_catch(instr_it->get_code()).exception_list();
+          to_code_push_catch(instr_it->code()).exception_list();
 
         // The target list can be empty if `finish_catch_push_targets` found that
         // the targets were unreachable (in which case no exception can truly

jbmc/src/java_bytecode/remove_instanceof.cpp

@@ -242,8 +242,8 @@ bool remove_instanceoft::lower_instanceof(
   goto_programt::targett target)
 {
   if(
-    target->is_target() && (contains_instanceof(target->get_code()) ||
-                            contains_instanceof(target->guard)))
+    target->is_target() &&
+    (contains_instanceof(target->code()) || contains_instanceof(target->guard)))
   {
     // If this is a branch target, add a skip beforehand so we can splice new
     // GOTO programs before the target instruction without inserting into the

jbmc/src/java_bytecode/replace_java_nondet.cpp

@@ -89,11 +89,11 @@ is_nondet_returning_object(const code_function_callt &function_call)
 static nondet_instruction_infot
 get_nondet_instruction_info(const goto_programt::const_targett &instr)
 {
-  if(!(instr->is_function_call() && instr->get_code().id() == ID_code))
+  if(!(instr->is_function_call() && instr->code().id() == ID_code))
   {
     return nondet_instruction_infot();
   }
-  const auto &code = instr->get_code();
+  const auto &code = instr->code();
   INVARIANT(
     code.get_statement() == ID_function_call,
     "function_call should have ID_function_call");

jbmc/unit/java_bytecode/java_bytecode_instrument/virtual_call_null_checks.cpp

@@ -79,8 +79,8 @@ SCENARIO(
               instrend = main_function.body.instructions.end();
             instrit != instrend; ++instrit)
         {
-          for(auto it = instrit->get_code().depth_begin(),
-                   itend = instrit->get_code().depth_end();
+          for(auto it = instrit->code().depth_begin(),
+                   itend = instrit->code().depth_end();
               it != itend;
               ++it)
           {

jbmc/unit/java_bytecode/java_replace_nondet/replace_nondet.cpp

@@ -93,7 +93,7 @@ void validate_nondets_converted(
     exprt target_expression =
       (inst.is_assign()
          ? inst.assign_rhs()
-         : inst.is_set_return_value() ? inst.return_value() : inst.get_code());
+         : inst.is_set_return_value() ? inst.return_value() : inst.code());
 
     if(
       const auto side_effect =

src/analyses/cfg_dominators.h

@@ -267,7 +267,7 @@ inline void dominators_pretty_print_node(
   const goto_programt::targett& target,
   std::ostream& out)
 {
-  out << target->get_code().pretty();
+  out << target->code().pretty();
 }
 
 /// Print the result of the dominator computation

src/analyses/invariant_set_domain.cpp

@@ -60,15 +60,15 @@ void invariant_set_domaint::transform(
 
     case OTHER:
       if(from_l->get_other().is_not_nil())
-        invariant_set.apply_code(from_l->get_code());
+        invariant_set.apply_code(from_l->code());
       break;
 
     case DECL:
-      invariant_set.apply_code(from_l->get_code());
+      invariant_set.apply_code(from_l->code());
       break;
 
     case FUNCTION_CALL:
-      invariant_set.apply_code(from_l->get_code());
+      invariant_set.apply_code(from_l->code());
       break;
 
     case START_THREAD:

src/analyses/uncaught_exceptions_analysis.cpp

@@ -71,7 +71,7 @@ void uncaught_exceptions_domaint::transform(
   {
   case THROW:
   {
-    const exprt &exc_symbol = get_exception_symbol(instruction.get_code());
+    const exprt &exc_symbol = get_exception_symbol(instruction.code());
     // retrieve the static type of the thrown exception
     const irep_idt &type_id =
       get_exception_type(to_pointer_type(exc_symbol.type()));
@@ -85,15 +85,15 @@ void uncaught_exceptions_domaint::transform(
   }
   case CATCH:
   {
-    if(!instruction.get_code().has_operands())
+    if(!instruction.code().has_operands())
     {
       if(!instruction.targets.empty()) // push
       {
         std::set<irep_idt> caught;
         stack_caught.push_back(caught);
         std::set<irep_idt> &last_caught=stack_caught.back();
         const irept::subt &exception_list =
-          instruction.get_code().find(ID_exception_list).get_sub();
+          instruction.code().find(ID_exception_list).get_sub();
 
         for(const auto &exc : exception_list)
         {

src/goto-instrument/contracts/instrument_spec_assigns.cpp

@@ -1021,8 +1021,7 @@ void instrument_spec_assignst::instrument_call_statement(
 
   if(callee_name == "malloc")
   {
-    const auto &function_call =
-      to_code_function_call(instruction_it->get_code());
+    const auto &function_call = to_code_function_call(instruction_it->code());
     if(function_call.lhs().is_not_nil())
     {
       // grab the returned pointer from malloc

src/goto-instrument/dot.cpp

@@ -160,7 +160,7 @@ void dott::write_dot_subgraph(
         it->is_assign() || it->is_decl() || it->is_set_return_value() ||
         it->is_other())
       {
-        std::string t = from_expr(ns, function_id, it->get_code());
+        std::string t = from_expr(ns, function_id, it->code());
         while(t[ t.size()-1 ]=='\n')
           t = t.substr(0, t.size()-1);
         tmp.str(escape(t));