use new goto_programt::instructiont API

Straight-forward replacement of checked casts.

Author: kroening

src/goto-programs/goto_inline_class.cpp

@@ -343,7 +343,7 @@ void goto_inlinet::insert_function_body(
         if(it->function==identifier)
         {
           // don't hide assignment to lhs
-          if(it->is_assign() && to_code_assign(it->code).lhs()==lhs)
+          if(it->is_assign() && it->get_assign().lhs()==lhs)
           {
           }
           else
@@ -502,7 +502,7 @@ void goto_inlinet::get_call(
 {
   PRECONDITION(it->is_function_call());
 
-  const code_function_callt &call=to_code_function_call(it->code);
+  const code_function_callt &call = it->get_function_call();
 
   lhs=call.lhs();
   function=call.function();

src/goto-programs/goto_program.cpp

@@ -278,14 +278,14 @@ std::list<exprt> expressions_read(
     break;
 
   case RETURN:
-    if(to_code_return(instruction.code).return_value().is_not_nil())
-      dest.push_back(to_code_return(instruction.code).return_value());
+    if(instruction.get_return().return_value().is_not_nil())
+      dest.push_back(instruction.get_return().return_value());
     break;
 
   case FUNCTION_CALL:
     {
-      const code_function_callt &function_call=
-        to_code_function_call(instruction.code);
+      const code_function_callt &function_call =
+        instruction.get_function_call();
       forall_expr(it, function_call.arguments())
         dest.push_back(*it);
       if(function_call.lhs().is_not_nil())
@@ -295,7 +295,7 @@ std::list<exprt> expressions_read(
 
   case ASSIGN:
     {
-      const code_assignt &assignment=to_code_assign(instruction.code);
+      const code_assignt &assignment = instruction.get_assign();
       dest.push_back(assignment.rhs());
       parse_lhs_read(assignment.lhs(), dest);
     }
@@ -318,15 +318,15 @@ std::list<exprt> expressions_written(
   {
   case FUNCTION_CALL:
     {
-      const code_function_callt &function_call=
-        to_code_function_call(instruction.code);
+      const code_function_callt &function_call =
+        instruction.get_function_call();
       if(function_call.lhs().is_not_nil())
         dest.push_back(function_call.lhs());
     }
     break;
 
   case ASSIGN:
-    dest.push_back(to_code_assign(instruction.code).lhs());
+    dest.push_back(instruction.get_assign().lhs());
     break;
 
   default:
@@ -792,9 +792,9 @@ void goto_programt::instructiont::validate(
       source_location);
     DATA_CHECK_WITH_DIAGNOSTICS(
       vm,
-      !ns.lookup(to_code_decl(code).get_identifier(), table_symbol),
+      !ns.lookup(get_decl().get_identifier(), table_symbol),
       "declared symbols should be known",
-      id2string(to_code_decl(code).get_identifier()),
+      id2string(get_decl().get_identifier()),
       source_location);
     break;
   case DEAD:
@@ -805,9 +805,9 @@ void goto_programt::instructiont::validate(
       source_location);
     DATA_CHECK_WITH_DIAGNOSTICS(
       vm,
-      !ns.lookup(to_code_dead(code).get_identifier(), table_symbol),
+      !ns.lookup(get_dead().get_identifier(), table_symbol),
       "removed symbols should be known",
-      id2string(to_code_dead(code).get_identifier()),
+      id2string(get_dead().get_identifier()),
       source_location);
     break;
   case FUNCTION_CALL:

src/goto-programs/graphml_witness.cpp

@@ -144,10 +144,10 @@ static bool filter_out(
   const goto_tracet::stepst::const_iterator &prev_it,
   goto_tracet::stepst::const_iterator &it)
 {
-  if(it->hidden &&
-     (!it->pc->is_assign() ||
-      to_code_assign(it->pc->code).rhs().id()!=ID_side_effect ||
-      to_code_assign(it->pc->code).rhs().get(ID_statement)!=ID_nondet))
+  if(
+    it->hidden && (!it->pc->is_assign() ||
+                   it->pc->get_assign().rhs().id() != ID_side_effect ||
+                   it->pc->get_assign().rhs().get(ID_statement) != ID_nondet))
     return true;
 
   if(!it->is_assignment() && !it->is_goto() && !it->is_assert())

src/goto-programs/instrument_preconditions.cpp

@@ -101,7 +101,7 @@ void instrument_preconditions(
     if(it->is_function_call())
     {
       // does the function we call have preconditions?
-      const auto &call=to_code_function_call(it->code);
+      const auto &call = it->get_function_call();
 
       if(call.function().id()==ID_symbol)
       {

src/goto-programs/interpreter.cpp

@@ -746,8 +746,7 @@ void interpretert::execute_assert()
 
 void interpretert::execute_function_call()
 {
-  const code_function_callt &function_call=
-    to_code_function_call(pc->code);
+  const code_function_callt &function_call = pc->get_function_call();
 
   // function to be called
   mp_integer address=evaluate_address(function_call.function());

src/goto-programs/mm_io.cpp

@@ -45,7 +45,7 @@ void mm_io(
 
     if(it->is_assign())
     {
-      auto &a=to_code_assign(it->code);
+      auto &a = it->get_assign();
       collect_deref_expr(a.rhs(), deref_expr_r);
 
       if(mm_io_r.is_not_nil())

src/goto-programs/parameter_assignments.cpp

@@ -42,7 +42,7 @@ void parameter_assignmentst::do_function_calls(
   {
     if(i_it->is_function_call())
     {
-      code_function_callt &function_call=to_code_function_call(i_it->code);
+      code_function_callt &function_call = i_it->get_function_call();
 
       // add x=y for f(y) where x is the parameter
 

src/goto-programs/remove_calls_no_body.cpp

@@ -74,7 +74,7 @@ bool remove_calls_no_bodyt::is_opaque_function_call(
   if(!target->is_function_call())
     return false;
 
-  const code_function_callt &cfc = to_code_function_call(target->code);
+  const code_function_callt &cfc = target->get_function_call();
   const exprt &f = cfc.function();
 
   if(f.id() != ID_symbol)
@@ -108,7 +108,7 @@ operator()(goto_programt &goto_program, const goto_functionst &goto_functions)
   {
     if(is_opaque_function_call(it, goto_functions))
     {
-      const code_function_callt &cfc = to_code_function_call(it->code);
+      const code_function_callt &cfc = it->get_function_call();
       remove_call_no_body(goto_program, it, cfc.lhs(), cfc.arguments());
     }
     else

src/goto-programs/remove_function_pointers.cpp

@@ -265,8 +265,7 @@ void remove_function_pointerst::remove_function_pointer(
   goto_programt &goto_program,
   goto_programt::targett target)
 {
-  const code_function_callt &code=
-    to_code_function_call(target->code);
+  const code_function_callt &code = target->get_function_call();
 
   const auto &function = to_dereference_expr(code.function());
 
@@ -312,7 +311,7 @@ void remove_function_pointerst::remove_function_pointer(
 
     if(functions.size()==1)
     {
-      to_code_function_call(target->code).function()=*functions.cbegin();
+      target->get_function_call().function() = *functions.cbegin();
       return;
     }
   }
@@ -360,7 +359,7 @@ void remove_function_pointerst::remove_function_pointer(
   goto_programt::targett target,
   const functionst &functions)
 {
-  const code_function_callt &code = to_code_function_call(target->code);
+  const code_function_callt &code = target->get_function_call();
 
   const exprt &function = code.function();
   const exprt &pointer = to_dereference_expr(function).pointer();
@@ -381,12 +380,12 @@ void remove_function_pointerst::remove_function_pointer(
     // call function
     goto_programt::targett t1=new_code_calls.add_instruction();
     t1->make_function_call(code);
-    to_code_function_call(t1->code).function()=fun;
+    t1->get_function_call().function() = fun;
 
     // the signature of the function might not match precisely
-    fix_argument_types(to_code_function_call(t1->code));
+    fix_argument_types(t1->get_function_call());
 
-    fix_return_type(to_code_function_call(t1->code), new_code_calls);
+    fix_return_type(t1->get_function_call(), new_code_calls);
     // goto final
     goto_programt::targett t3=new_code_calls.add_instruction();
     t3->make_goto(t_final, true_exprt());
@@ -474,8 +473,7 @@ bool remove_function_pointerst::remove_function_pointers(
   Forall_goto_program_instructions(target, goto_program)
     if(target->is_function_call())
     {
-      const code_function_callt &code=
-        to_code_function_call(target->code);
+      const code_function_callt &code = target->get_function_call();
 
       if(code.function().id()==ID_dereference)
       {

src/goto-programs/remove_returns.cpp

@@ -149,7 +149,7 @@ void remove_returnst::do_function_calls(
   {
     if(i_it->is_function_call())
     {
-      code_function_callt &function_call=to_code_function_call(i_it->code);
+      code_function_callt &function_call = i_it->get_function_call();
 
       INVARIANT(
         function_call.function().id() == ID_symbol,
@@ -357,7 +357,7 @@ bool remove_returnst::restore_returns(
   {
     if(i_it->is_assign())
     {
-      code_assignt &assign=to_code_assign(i_it->code);
+      code_assignt &assign = i_it->get_assign();
       if(assign.lhs().id()!=ID_symbol ||
          to_symbol_expr(assign.lhs()).get_identifier()!=rv_name_id)
         continue;
@@ -386,7 +386,7 @@ void remove_returnst::undo_function_calls(
   {
     if(i_it->is_function_call())
     {
-      code_function_callt &function_call=to_code_function_call(i_it->code);
+      code_function_callt &function_call = i_it->get_function_call();
 
       // ignore function pointers
       if(function_call.function().id()!=ID_symbol)
@@ -412,7 +412,7 @@ void remove_returnst::undo_function_calls(
       if(!next->is_assign())
         continue;
 
-      const code_assignt &assign=to_code_assign(next->code);
+      const code_assignt &assign = next->get_assign();
 
       if(assign.rhs().id()!=ID_symbol)
         continue;