Make annotations comments in irep_idt

This avoids failing type comparison when one contains annotations and not
the other.

Author: romainbrenguier

src/java_bytecode/java_types.h

@@ -71,14 +71,14 @@ class annotated_typet : public typet
   {
     // This cast should be safe as java_annotationt doesn't add data to irept
     return reinterpret_cast<const std::vector<java_annotationt> &>(
-      find(ID_annotations).get_sub());
+      find(ID_C_annotations).get_sub());
   }
 
   std::vector<java_annotationt> &get_annotations()
   {
     // This cast should be safe as java_annotationt doesn't add data to irept
     return reinterpret_cast<std::vector<java_annotationt> &>(
-      add(ID_annotations).get_sub());
+      add(ID_C_annotations).get_sub());
   }
 };
 

src/util/irep_ids.def

@@ -664,7 +664,7 @@ IREP_ID_TWO(overflow_shl, overflow-shl)
 IREP_ID_TWO(C_no_initialization_required, #no_initialization_required)
 IREP_ID_TWO(overlay_class, java::com.diffblue.OverlayClassImplementation)
 IREP_ID_TWO(overlay_method, java::com.diffblue.OverlayMethodImplementation)
-IREP_ID_ONE(annotations)
+IREP_ID_TWO(C_annotations, #annotations)
 
 // 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