Merge pull request #1452 from diffblue/call-seq-fix

Daniel Kroening · web-flow · commit c73b758f6eda · 2017-10-12T17:30:01.000+01:00
fix for call-sequences and call-graph
diff --git a/src/goto-instrument/goto_instrument_parse_options.cpp b/src/goto-instrument/goto_instrument_parse_options.cpp
@@ -413,6 +413,7 @@ int goto_instrument_parse_optionst::doit()
 
     if(cmdline.isset("show-call-sequences"))
     {
+      do_indirect_call_and_rtti_removal();
       show_call_sequences(goto_model);
       return 0;
     }
@@ -644,6 +645,7 @@ int goto_instrument_parse_optionst::doit()
 
     if(cmdline.isset("call-graph"))
     {
+      do_indirect_call_and_rtti_removal();
       call_grapht call_graph(goto_model);
 
       if(cmdline.isset("xml"))

Original file line number	Diff line number	Diff line change
`@@ -413,6 +413,7 @@ int goto_instrument_parse_optionst::doit()`
`413`	`413`
`414`	`414`	`if(cmdline.isset("show-call-sequences"))`
`415`	`415`	`{`
	`416`	`+ do_indirect_call_and_rtti_removal();`
`416`	`417`	`show_call_sequences(goto_model);`
`417`	`418`	`return 0;`
`418`	`419`	`}`
`@@ -644,6 +645,7 @@ int goto_instrument_parse_optionst::doit()`
`644`	`645`
`645`	`646`	`if(cmdline.isset("call-graph"))`
`646`	`647`	`{`
	`648`	`+ do_indirect_call_and_rtti_removal();`
`647`	`649`	`call_grapht call_graph(goto_model);`
`648`	`650`
`649`	`651`	`if(cmdline.isset("xml"))`