Merge pull request #5188 from diffblue/move_replace_calls

Daniel Kroening · web-flow · commit dd282e320a6d · 2019-11-15T10:36:09.000Z
move replace_calls to goto-instrument
diff --git a/src/goto-instrument/Makefile b/src/goto-instrument/Makefile
@@ -55,6 +55,7 @@ SRC = accelerate/accelerate.cpp \
       race_check.cpp \
       reachability_slicer.cpp \
       remove_function.cpp \
+      replace_calls.cpp \
       rw_set.cpp \
       show_locations.cpp \
       skip_loops.cpp \
diff --git a/src/goto-instrument/goto_instrument_parse_options.h b/src/goto-instrument/goto_instrument_parse_options.h
@@ -23,7 +23,6 @@ Author: Daniel Kroening, kroening@kroening.com
 #include <goto-programs/goto_functions.h>
 #include <goto-programs/remove_calls_no_body.h>
 #include <goto-programs/remove_const_function_pointers.h>
-#include <goto-programs/replace_calls.h>
 #include <goto-programs/show_goto_functions.h>
 #include <goto-programs/show_properties.h>
 
@@ -32,6 +31,7 @@ Author: Daniel Kroening, kroening@kroening.com
 #include "aggressive_slicer.h"
 #include "generate_function_bodies.h"
 #include "insert_final_assert_false.h"
+#include "replace_calls.h"
 
 #include "count_eloc.h"
 
diff --git a/src/goto-instrument/replace_calls.cpp b/src/goto-instrument/replace_calls.cpp
diff --git a/src/goto-instrument/replace_calls.h b/src/goto-instrument/replace_calls.h
@@ -13,7 +13,7 @@ Author: Daniel Poetzl
 #ifndef CPROVER_GOTO_PROGRAMS_REPLACE_CALLS_H
 #define CPROVER_GOTO_PROGRAMS_REPLACE_CALLS_H
 
-#include "goto_model.h"
+#include <goto-programs/goto_model.h>
 
 class replace_callst
 {
diff --git a/src/goto-programs/Makefile b/src/goto-programs/Makefile
@@ -52,7 +52,6 @@ SRC = adjust_float_expressions.cpp \
       remove_vector.cpp \
       remove_virtual_functions.cpp \
       rewrite_union.cpp \
-      replace_calls.cpp \
       resolve_inherited_component.cpp \
       safety_checker.cpp \
       set_properties.cpp \

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ Author: Daniel Poetzl`
`13`	`13`	`#ifndef CPROVER_GOTO_PROGRAMS_REPLACE_CALLS_H`
`14`	`14`	`#define CPROVER_GOTO_PROGRAMS_REPLACE_CALLS_H`
`15`	`15`
`16`		`-#include "goto_model.h"`
	`16`	`+#include <goto-programs/goto_model.h>`
`17`	`17`
`18`	`18`	`class replace_callst`
`19`	`19`	`{`