Merge commit 'bb88574aaa4043f0ebf0ad6881ccaaeb1f0413ff' into merge-develop-20180327

Author: smowton

src/goto-programs/remove_returns.cpp

@@ -96,7 +96,7 @@ void remove_returnst::replace_returns(
 {
   typet return_type = function.type.return_type();
 
-  // Nothing to do if this function returns void
+  // returns something but void?
   if(return_type == empty_typet())
     return;
 

src/java_bytecode/java_bytecode_convert_class.cpp

@@ -239,19 +239,9 @@ void java_bytecode_convert_classt::convert(const classt &c)
       extract_generic_superclass_reference(c.signature);
     if(superclass_ref.has_value())
     {
-      try
-      {
-        const java_generic_symbol_typet generic_base(
-          base, superclass_ref.value(), qualified_classname);
-        class_type.add_base(generic_base);
-      }
-      catch(unsupported_java_class_signature_exceptiont)
-      {
-        debug() << "unsupported generic superclass signature "
-                << id2string(*superclass_ref)
-                << " falling back on using the descriptor" << eom;
-        class_type.add_base(base);
-      }
+      const java_generic_symbol_typet generic_base(
+        base, superclass_ref.value(), qualified_classname);
+      class_type.add_base(generic_base);
     }
     else
     {
@@ -278,19 +268,9 @@ void java_bytecode_convert_classt::convert(const classt &c)
       extract_generic_interface_reference(c.signature, id2string(interface));
     if(interface_ref.has_value())
     {
-      try
-      {
-        const java_generic_symbol_typet generic_base(
-          base, interface_ref.value(), qualified_classname);
-        class_type.add_base(generic_base);
-      }
-      catch(unsupported_java_class_signature_exceptiont)
-      {
-        debug() << "unsupported generic interface signature "
-                << id2string(*interface_ref)
-                << " falling back on using the descriptor" << eom;
-        class_type.add_base(base);
-      }
+      const java_generic_symbol_typet generic_base(
+        base, interface_ref.value(), qualified_classname);
+      class_type.add_base(generic_base);
     }
     else
     {