openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dam...@apache.org
Subject svn commit: r1826078 - /openoffice/trunk/main/soltools/javadep/javadep.c
Date Wed, 07 Mar 2018 05:14:45 GMT
Author: damjan
Date: Wed Mar  7 05:14:45 2018
New Revision: 1826078

URL: http://svn.apache.org/viewvc?rev=1826078&view=rev
Log:
Update the main/soltools javadep tool to deal with Java 9
(possibily 7 and 8 too, when using invokedynamic).

Patch by: me


Modified:
    openoffice/trunk/main/soltools/javadep/javadep.c

Modified: openoffice/trunk/main/soltools/javadep/javadep.c
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/soltools/javadep/javadep.c?rev=1826078&r1=1826077&r2=1826078&view=diff
==============================================================================
--- openoffice/trunk/main/soltools/javadep/javadep.c (original)
+++ openoffice/trunk/main/soltools/javadep/javadep.c Wed Mar  7 05:14:45 2018
@@ -93,7 +93,10 @@ enum {
     CONSTANT_Long               = 5,
     CONSTANT_Double             = 6,
     CONSTANT_NameAndType        = 12,
-    CONSTANT_Utf8               = 1
+    CONSTANT_Utf8               = 1,
+    CONSTANT_MethodHandle       = 15,
+    CONSTANT_MethodType         = 16,
+    CONSTANT_InvokeDynamic      = 18
 };
 
 enum { NGROW_INIT = 10, NGROW = 2 };
@@ -512,6 +515,15 @@ process_class_file(const char *pfilename
                 a_utf8 = read_utf8(&file);
                 pc_pool[i] = a_utf8;
                 break;
+            case CONSTANT_MethodHandle:
+                skip_bytes(&file, 3);
+                break;
+            case CONSTANT_MethodType:
+                skip_bytes(&file, 2);
+                break;
+            case CONSTANT_InvokeDynamic:
+                skip_bytes(&file, 4);
+                break;
             default:
                 /* Unknown Constant_pool entry, this means we are
                  * in trouble



Mime
View raw message