Read the bride flag for methods

This is used for compiler generated methods to deal with type erasure.
NathanJPhillips · Jul 17, 2018 · efadba2 · efadba2
1 parent a18b32d
commit efadba2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/jbmc/src/java_bytecode/java_bytecode_convert_method.cpp b/jbmc/src/java_bytecode/java_bytecode_convert_method.cpp
@@ -371,6 +371,9 @@ void java_bytecode_convert_method_lazy(
   if(m.is_static)
     member_type.set(ID_is_static, true);
 
+  if(m.is_bridge)
+    member_type.set(ID_is_bridge_method, m.is_bridge);
+
   // do we need to add 'this' as a parameter?
   if(!m.is_static)
   {

diff --git a/jbmc/src/java_bytecode/java_bytecode_parse_tree.h b/jbmc/src/java_bytecode/java_bytecode_parse_tree.h
@@ -86,7 +86,7 @@ struct java_bytecode_parse_treet
   struct methodt : public membert
   {
     irep_idt base_name;
-    bool is_native, is_abstract, is_synchronized;
+    bool is_native, is_abstract, is_synchronized, is_bridge;
     source_locationt source_location;
 
     typedef std::vector<instructiont> instructionst;
@@ -164,10 +164,11 @@ struct java_bytecode_parse_treet
 
     void output(std::ostream &out) const;
 
-    methodt():
-      is_native(false),
-      is_abstract(false),
-      is_synchronized(false)
+    methodt()
+      : is_native(false),
+        is_abstract(false),
+        is_synchronized(false),
+        is_bridge(false)
     {
     }
   };

diff --git a/jbmc/src/java_bytecode/java_bytecode_parser.cpp b/jbmc/src/java_bytecode/java_bytecode_parser.cpp
@@ -1766,6 +1766,7 @@ void java_bytecode_parsert::rmethod(classt &parsed_class)
   method.is_private=(access_flags&ACC_PRIVATE)!=0;
   method.is_synchronized=(access_flags&ACC_SYNCHRONIZED)!=0;
   method.is_native=(access_flags&ACC_NATIVE)!=0;
+  method.is_bridge = (access_flags & ACC_BRIDGE) != 0;
   method.name=pool_entry(name_index).s;
   method.base_name=pool_entry(name_index).s;
   method.descriptor=id2string(pool_entry(descriptor_index).s);

diff --git a/src/util/irep_ids.def b/src/util/irep_ids.def
@@ -676,6 +676,7 @@ IREP_ID_TWO(C_must_not_throw, #must_not_throw)
 IREP_ID_ONE(is_inner_class)
 IREP_ID_ONE(is_anonymous)
 IREP_ID_ONE(outer_class)
+IREP_ID_ONE(is_bridge_method)
 
 // Projects depending on this code base that wish to extend the list of
 // available ids should provide a file local_irep_ids.h in their source tree and