Merge pull request #1908 from mgudemann/bugfix/fix_bootstrapmethods_empty_optional

[TG-2684] Bugfix/fix bootstrapmethods empty optional

Author: Matthias Güdemann

regression/cbmc-java/lambda2/SymStream.class

@@ -0,0 +1 @@
+from https://github.com/symphonyoss/symphony-java-client/

regression/cbmc-java/lambda2/readme.txt

@@ -0,0 +1,9 @@
+KNOWNBUG
+SymStream.class
+--verbosity 10 --show-goto-functions
+lambda function reference org/symphonyoss/symphony/clients/model/SymUser\.toSymUser in class \"SymStream\"
+^EXIT=0
+^SIGNAL=0
+--
+--
+lambda functions without "lambda$" prefix aren't recognized currently TG-2691

regression/cbmc-java/lambda2/test.desc

@@ -0,0 +1,8 @@
+CORE
+SymStream.class
+--verbosity 10 --show-goto-functions
+^EXIT=0
+^SIGNAL=0
+--
+--
+just to test that it doesn't crash in this situation, cf. TG-2684

regression/cbmc-java/lambda2/test_no_crash.desc

@@ -1893,10 +1893,18 @@ void java_bytecode_parsert::read_bootstrapmethods_entry(classt &parsed_class)
       optionalt<lambda_method_handlet> lambda_method_handle =
         parse_method_handle(method_handle_infot{method_handle_argument});
 
-      if(
-        !lambda_method_handle.has_value() ||
+      if(!lambda_method_handle.has_value())
+      {
+        lambda_method_handlet lambda_method_handle;
+        lambda_method_handle.handle_type = method_handle_typet::UNKNOWN_HANDLE;
+        lambda_method_handle.u2_values = std::move(u2_values);
+        parsed_class.lambda_method_handle_map[{parsed_class.name, i}] =
+          lambda_method_handle;
+        return;
+      }
+      else if(
         lambda_method_handle->handle_type !=
-          method_handle_typet::LAMBDA_METHOD_HANDLE)
+        method_handle_typet::LAMBDA_METHOD_HANDLE)
       {
         lambda_method_handle->u2_values = std::move(u2_values);
         error() << "ERROR: could not parse lambda function method handle"