Merge pull request #4550 from diffblue/fix_replace_return

Fix replace_return

Author: tautschnig

regression/goto-instrument/inline_18/main.c

@@ -0,0 +1,13 @@
+inline int *foo()
+{
+  int dummy;
+  int *ptr = &dummy;
+  return ptr;
+}
+
+int main()
+{
+  int *ptr = foo();
+  *ptr = 42;
+  return 0;
+}

regression/goto-instrument/inline_18/test.desc

@@ -0,0 +1,9 @@
+CORE
+main.c
+--inline --pointer-check
+dereference failure: dead object in \*ptr: FAILURE$
+^VERIFICATION FAILED$
+^EXIT=10$
+^SIGNAL=0$
+--
+^warning: ignoring

src/goto-programs/goto_inline_class.cpp

@@ -165,14 +165,11 @@ void goto_inlinet::replace_return(
           lhs,
           typecast_exprt::conditional_cast(it->return_value(), lhs.type()));
         it->type=ASSIGN;
-
-        it++;
       }
       else
       {
         it->code_nonconst() = code_expressiont(it->return_value());
         it->type=OTHER;
-        it++;
       }
     }
   }