Enable parsing of annotations on parameters

Author: NathanJPhillips

jbmc/src/java_bytecode/java_bytecode_parse_tree.h

@@ -98,6 +98,14 @@ struct java_bytecode_parse_treet
       return instructions.back();
     }
 
+    /// Java annotations that were applied to parameters of this method
+    /// \remarks Each element in the vector corresponds to the annotations on
+    /// the parameter of this method with the matching index. A parameter that
+    /// does not have annotations can have an entry in this vector that is an
+    /// empty annotationst. Trailing parameters that have no annotations may be
+    /// entirely omitted from this vector.
+    std::vector<annotationst> parameter_annotations;
+
     struct exceptiont
     {
       exceptiont()

jbmc/src/java_bytecode/java_bytecode_parser.cpp

@@ -1243,6 +1243,21 @@ void java_bytecode_parsert::rmethod_attribute(methodt &method)
   {
     rRuntimeAnnotation_attribute(method.annotations);
   }
+  else if(
+    attribute_name == "RuntimeInvisibleParameterAnnotations" ||
+    attribute_name == "RuntimeVisibleParameterAnnotations")
+  {
+    u1 parameter_count = read_u1();
+    // There may be attributes for both runtime-visiible and rutime-invisible
+    // annotations, the length of either array may be longer than the other as
+    // trailing parameters without annotations are omitted.
+    // Extend our parameter_annotations if this one is longer than the one
+    // previously recorded (if any).
+    if(method.parameter_annotations.size() < parameter_count)
+      method.parameter_annotations.resize(parameter_count);
+    for(u2 param_no = 0; param_no < parameter_count; ++param_no)
+      rRuntimeAnnotation_attribute(method.parameter_annotations[param_no]);
+  }
   else if(attribute_name == "Exceptions")
   {
     method.throws_exception_table = rexceptions_attribute();

jbmc/unit/java_bytecode/java_bytecode_parser/AnnotationsEverywhere.class

@@ -0,0 +1,43 @@
+@interface ClassAnnotation {
+}
+
+@java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME)
+@interface RuntimeClassAnnotation {
+}
+
+@interface FieldAnnotation {
+}
+
+@java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME)
+@interface RuntimeFieldAnnotation {
+}
+
+@interface MethodAnnotation {
+}
+
+@java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME)
+@interface RuntimeMethodAnnotation {
+}
+
+@interface ParameterAnnotation {
+}
+
+@java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME)
+@interface RuntimeParameterAnnotation {
+}
+
+@ClassAnnotation
+@RuntimeClassAnnotation
+public class AnnotationsEverywhere {
+    @FieldAnnotation
+    @RuntimeFieldAnnotation
+    public int x;
+
+    @MethodAnnotation
+    @RuntimeMethodAnnotation
+    public void foo(
+        @RuntimeParameterAnnotation int p,
+        @ParameterAnnotation int q)
+    {
+    }
+}