Merge pull request #1946 from thk123/feature/TG-1811/unit-tests-for-invokedynamic-static-lambda

Unit tests for invokedynamic with static lambdas [TG-2811]

Author: Thomas Kiley

src/java_bytecode/java_bytecode_convert_method_class.h

@@ -250,8 +250,6 @@ class java_bytecode_convert_methodt:public messaget
 
   const bytecode_infot &get_bytecode_info(const irep_idt &statement);
 
-  bool class_needs_clinit(const irep_idt &classname);
-  exprt get_or_create_clinit_wrapper(const irep_idt &classname);
   codet get_clinit_call(const irep_idt &classname);
 
   bool is_method_inherited(

unit/Makefile

@@ -21,6 +21,7 @@ SRC += unit_tests.cpp \
        goto-programs/class_hierarchy_graph.cpp \
        goto-programs/remove_virtual_functions_without_fallback.cpp \
        java_bytecode/java_bytecode_convert_class/convert_abstract_class.cpp \
+       java_bytecode/java_bytecode_convert_method/convert_invoke_dynamic.cpp \
        java_bytecode/java_bytecode_parse_generics/parse_generic_class.cpp \
        java_bytecode/java_object_factory/gen_nondet_string_init.cpp \
        java_bytecode/java_bytecode_parse_lambdas/java_bytecode_parse_lambda_method_table.cpp \

unit/java_bytecode/ci_lazy_methods/lazy_load_lambdas.cpp

@@ -18,7 +18,8 @@ SCENARIO(
   {
     const symbol_tablet symbol_table = load_java_class_lazy(
       "LocalLambdas",
-      "./java_bytecode/java_bytecode_parse_lambdas/lambda_examples/",
+      "./java_bytecode/java_bytecode_parse_lambdas/lambda_examples/"
+      "openjdk_8_classes",
       "LocalLambdas.test");
 
     THEN("Then the lambdas should be loaded")
@@ -68,7 +69,8 @@ SCENARIO(
   {
     const symbol_tablet symbol_table = load_java_class_lazy(
       "MemberLambdas",
-      "./java_bytecode/java_bytecode_parse_lambdas/lambda_examples/",
+      "./java_bytecode/java_bytecode_parse_lambdas/lambda_examples/"
+      "openjdk_8_classes",
       "MemberLambdas.test");
 
     THEN("Then the lambdas should be loaded")
@@ -117,7 +119,8 @@ SCENARIO(
   {
     const symbol_tablet symbol_table = load_java_class_lazy(
       "StaticLambdas",
-      "./java_bytecode/java_bytecode_parse_lambdas/lambda_examples/",
+      "./java_bytecode/java_bytecode_parse_lambdas/lambda_examples/"
+      "openjdk_8_classes",
       "StaticLambdas.test");
 
     THEN("Then the lambdas should be loaded")
@@ -166,7 +169,8 @@ SCENARIO(
   {
     const symbol_tablet symbol_table = load_java_class_lazy(
       "OuterMemberLambdas$Inner",
-      "./java_bytecode/java_bytecode_parse_lambdas/lambda_examples/",
+      "./java_bytecode/java_bytecode_parse_lambdas/lambda_examples/"
+      "openjdk_8_classes",
       "OuterMemberLambdas$Inner.test");
 
     THEN("Then the lambdas should be loaded")
@@ -192,7 +196,8 @@ SCENARIO(
 {
   const symbol_tablet symbol_table = load_java_class_lazy(
     "ExternalLambdaAccessor",
-    "./java_bytecode/java_bytecode_parse_lambdas/lambda_examples/",
+    "./java_bytecode/java_bytecode_parse_lambdas/lambda_examples/"
+    "openjdk_8_classes",
     "ExternalLambdaAccessor.test");
 
   THEN("Then the lambdas should be loaded")