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

Author: cristina-david

src/analyses/uncaught_exceptions_analysis.cpp

@@ -52,10 +52,11 @@ static void get_subtypes(
                 candidate)!=subtypes.end())
           continue;
         // get its base class
-        const irept::subt &bases=to_class_type((it->second).type).bases();
+        const class_typet::basest &bases=
+          to_class_type((it->second).type).bases();
         if(bases.size()>0)
         {
-          const irept &base = bases[0];
+          const class_typet::baset &base = bases[0];
           const irept &base_type=base.find(ID_type);
           assert(base_type.id()==ID_symbol);
 

src/goto-programs/remove_exceptions.cpp

@@ -386,7 +386,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=