Updates requested in the PR diffblue#133.

Author: marek-trtik

src/taint-slicer/instrumentation_props.cpp

@@ -22,32 +22,53 @@ instrumentation_props data structure.
 \*******************************************************************/
 
 #include <taint-slicer/instrumentation_props.h>
+#include <goto-programs/remove_returns.h>
+#include <util/msgstream.h>
 #include <util/msgstream.h>
 #include <deque>
 
-static std::string parse_return_type_from_function_name(
-  const std::string &fname)
+static std::string parse_type_name(const typet &type)
 {
-  const std::string::size_type idx=fname.rfind(")");
-  if(idx==std::string::npos)
-    return "ERROR: cannot find the start of the return type.";
-  const std::string raw_type=fname.substr(idx+1UL);
-  if(raw_type.empty())
-    return "ERROR: the return type is missing.";
-  std::string result;
-  switch(raw_type[0])
+  const typet * restype = &type;
+  if(type.id()==ID_pointer)
+    restype=&to_pointer_type(type).subtype();
+  else if(type.id()==ID_array)
+    restype=&to_array_type(type).subtype();
+  if(restype->id()==ID_signedbv)
+  {
+    const signedbv_typet &sbv=to_signedbv_type(*restype);
+    if(sbv.get_width()==8UL)
+      return as_string(ID_char);
+    if(sbv.get_width()==16UL)
+      return as_string(ID_short);
+    if(sbv.get_width()==32UL)
+      return as_string(ID_int);
+    if(sbv.get_width()==64UL)
+      return as_string(ID_long);
+    return msgstream() << "ERROR: unexpected bit-width '"
+                       << sbv.get_width() << "' of signedbv type. Valid sizes "
+                       << "are 8, 16, 32, and 64.";
+  }
+  if(restype->id()==ID_unsignedbv)
   {
-  case 'L':
-    result="java::"+raw_type.substr(1UL, raw_type.size()-2UL);
-    std::replace(result.begin(), result.end(), '/', '.');
-    return result;
-  case 'C':
-    return "char";
-  case 'I':
-    return "int";
-  default:
-    return msgstream() << "ERROR: unknown return type type: " << raw_type;
+    const unsignedbv_typet &ubv=to_unsignedbv_type(*restype);
+    if(ubv.get_width()==8UL)
+      return as_string(ID_byte);
+    if(ubv.get_width()==16UL)
+      return as_string(ID_unsigned_short_int);
+    if(ubv.get_width()==32UL)
+      return as_string(ID_unsigned_int);
+    if(ubv.get_width()==64UL)
+      return as_string(ID_unsigned_long_int);
+    return msgstream() << "ERROR: unexpected bit-width '"
+                       << ubv.get_width() << "' of unsignedbv type. Valid "
+                       << "sizes are 8, 16, 32 and 64.";
   }
+  if(restype->id()!=ID_symbol)
+    return msgstream() << "ERROR: expecting the '"
+                       << as_string(ID_symbol) << "' type id, but received '"
+                       << as_string(restype->id()) << "'.";
+  return as_string(to_symbol_type(*restype).get_identifier());
 }
 
 bool is_primitive_type_name(const std::string &datatype)
@@ -85,52 +106,16 @@ bool does_instrumentation_of_type_require_subclass(const std::string &datatype)
           || datatype=="java::java.lang.Object";
 }
 
-
-static std::string parse_param_type_name(const typet &param_type)
+static std::string get_return_type_name_from_function_name(
+  const std::string &fname, const symbol_tablet &symbol_table)
 {
-  const typet * restype = &param_type;
-  if(param_type.id()==ID_pointer)
-    restype=&to_pointer_type(param_type).subtype();
-  else if(param_type.id()==ID_array)
-    restype=&to_array_type(param_type).subtype();
-  if(restype->id()==ID_signedbv)
-  {
-    const signedbv_typet &sbv=to_signedbv_type(*restype);
-    if(sbv.get_width()==8UL)
-      return as_string(ID_char);
-    if(sbv.get_width()==16UL)
-      return as_string(ID_short);
-    if(sbv.get_width()==32UL)
-      return as_string(ID_int);
-    if(sbv.get_width()==64UL)
-      return as_string(ID_long);
-    return msgstream() << "ERROR: unexpected bit-width '"
-                       << sbv.get_width() << "' of signedbv type. Valid sizes "
-                       << "are 8, 16, 32, and 64.";
-  }
-  if(restype->id()==ID_unsignedbv)
-  {
-    const unsignedbv_typet &ubv=to_unsignedbv_type(*restype);
-    if(ubv.get_width()==8UL)
-      return as_string(ID_byte);
-    if(ubv.get_width()==16UL)
-      return as_string(ID_unsigned_short_int);
-    if(ubv.get_width()==32UL)
-      return as_string(ID_unsigned_int);
-    if(ubv.get_width()==64UL)
-      return as_string(ID_unsigned_long_int);
-    return msgstream() << "ERROR: unexpected bit-width '"
-                       << ubv.get_width() << "' of unsignedbv type. Valid "
-                       << "sizes are 8, 16, 32 and 64.";
-  }
-  if(restype->id()!=ID_symbol)
-    return msgstream() << "ERROR: expecting the '"
-                       << as_string(ID_symbol) << "' type id, but received '"
-                       << as_string(restype->id()) << "'.";
-  return as_string(to_symbol_type(*restype).get_identifier());
+  assert(symbol_table.has_symbol(fname+RETURN_VALUE_SUFFIX));
+  typet t=symbol_table.lookup(fname+RETURN_VALUE_SUFFIX).type;
+  if(t.id()==ID_pointer)
+    t=to_pointer_type(t).subtype();
+  return parse_type_name(t);
 }
 
-
 /*******************************************************************\
 
 Function: perform_BFS
@@ -261,10 +246,11 @@ void taint_instrumentation_propst::build_map_from_typenames_to_tokennames(
              taint_tokens_propagation_grapht::get_void_loc());
       std::string datatype;
       if(arg_token.get_argidx()==-1) // Return value
-        datatype=parse_return_type_from_function_name(callee_ident);
+        datatype=get_return_type_name_from_function_name(
+                  callee_ident, program.get_symbol_table());
       else
       {
-        datatype=parse_param_type_name(
+        datatype=parse_type_name(
           fn_type.parameters().at(arg_token.get_argidx()).type());
       }
       assert(datatype.find("ERROR:")==std::string::npos);