Changeset 15578

Timestamp:

05/23/22 06:23:38 (10 months ago)

Author:

Mark Evenson

Message:

Fix DISASSEMBLE in some situations by falling back to funcall

Originally part of <​https://github.com/armedbear/abcl/pull/437/>

File:

• trunk/abcl/src/org/armedbear/lisp/disassemble.lisp (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/disassemble.lisp

@@ -149 +149 @@
               (if (or (java:jinstance-of-p classloader "org.armedbear.lisp.MemoryClassLoader")
                       (java:jinstance-of-p classloader "org.armedbear.lisp.FaslClassLoader"))
-                  (disassemble-bytes 
-                   (java:jcall "getFunctionClassBytes" classloader class))
+                  (disassemble-bytes
+                   (or
+                    (ignore-errors
+                     (java:jcall "getFunctionClassBytes" classloader class))
+                    ;;; alanr found that in certain situations (under
+                    ;;; OSGI?) that one has to explicitly FUNCALL the
+                    ;;; function slot, so we fall back to that strategy.
+                    (ignore-errors
+                     (funcall (java:jfield "org.armedbear.lisp.Function" "FUNCTION_CLASS_BYTES") function))))
                   (disassemble-bytes
                    (read-byte-array-from-stream