Changeset 15597

Timestamp:

11/27/22 00:22:36 (4 months ago)

Author:

Mark Evenson

Message:

Fix class annotations on JDK17 and newer

JDK 17 Removed some obsolete class file format in regards to runtime
visible annotations.

Now, the annotation parser expects a class type signature, instead of a
class, in the constant pool.

See the JDK commit "Remove vestiages of intermediate JSR 175 annotation format"
(​https://github.com/openjdk/jdk/commit/8758b554#diff-50de65a27d09a727c0b6ea40ce7ebd97bf7ead098ff910d7757ae0dd781fc2c8R240)

Location:

trunk/abcl

Files:

• src/org/armedbear/lisp/jvm-class-file.lisp (modified) (1 diff)
• test/lisp/abcl/runtime-class.lisp (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/jvm-class-file.lisp

@@ -1688 +1688 @@
     (finalize-annotation ann class)))
 
+;; See https://github.com/openjdk/jdk/blob/8758b554a089af98fdc3be4201d61278d5f01af3/src/java.base/share/classes/sun/reflect/generics/parser/SignatureParser.java#L295-L312
+(defun class-name->type-signature (class-name)
+  (concatenate 'string
+               '(#\L)
+               (substitute #\/ #\. class-name)
+               '(#\;)))
+
 (defun finalize-annotation (ann class)
   (setf (annotation-type ann)
-        (pool-add-class (class-file-constants class) (annotation-type ann)))
+        (pool-add-utf8 (class-file-constants class)
+                       (class-name->type-signature (annotation-type ann))))
   (dolist (elem (annotation-elements ann))
     (finalize-annotation-element elem class)))

trunk/abcl/test/lisp/abcl/runtime-class.lisp

@@ -74 +74 @@
      20)
   "#<FooList [Foo, Foo,")
+
+
+;; class annotations
+(deftest runtime-class.class-annotations
+  (let* ((class (java:jnew-runtime-class
+                "Foo"
+                :annotations '("java.lang.Deprecated")))
+         (annotations (java:jcall "getAnnotations" class)))
+    (assert (java:jinstance-of-p (aref annotations 0) "java.lang.Deprecated"))
+    t)
+  t)