Make sure that both the caller and callee have exceptional return vars before instrumenting function calls

cristina-david · cristina-david · commit 727f37b4791f · 2017-03-16T14:17:22.000Z
diff --git a/src/goto-programs/remove_exceptions.cpp b/src/goto-programs/remove_exceptions.cpp
@@ -332,7 +332,8 @@ void remove_exceptionst::instrument_function_call(
   const irep_idt &callee_id=
     to_symbol_expr(function_call.function()).get_identifier();
 
-  if(symbol_table.has_symbol(id2string(callee_id)+EXC_SUFFIX))
+  if(symbol_table.has_symbol(id2string(callee_id)+EXC_SUFFIX) &&
+     symbol_table.has_symbol(id2string(function_id)+EXC_SUFFIX))
   {
     // we may have an escaping exception
     const symbolt &callee_exc_symbol=

Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,8 @@ void remove_exceptionst::instrument_function_call(`
`332`	`332`	`const irep_idt &callee_id=`
`333`	`333`	`to_symbol_expr(function_call.function()).get_identifier();`
`334`	`334`
`335`		`- if(symbol_table.has_symbol(id2string(callee_id)+EXC_SUFFIX))`
	`335`	`+ if(symbol_table.has_symbol(id2string(callee_id)+EXC_SUFFIX) &&`
	`336`	`+ symbol_table.has_symbol(id2string(function_id)+EXC_SUFFIX))`
`336`	`337`	`{`
`337`	`338`	`// we may have an escaping exception`
`338`	`339`	`const symbolt &callee_exc_symbol=`