" for JRE classes
- * @modules jdk.compiler
+ * @modules jdk.jdeps
*/
import java.io.*;
--- old/langtools/test/tools/javap/T6622216.java 2015-05-26 21:41:59.295832525 -0700
+++ new/langtools/test/tools/javap/T6622216.java 2015-05-26 21:41:59.191832523 -0700
@@ -25,7 +25,7 @@
* @test
* @bug 6622216
* @summary javap names some attributes incorrectly
- * @modules jdk.compiler
+ * @modules jdk.jdeps
*/
import java.io.*;
--- old/langtools/test/tools/javap/T6622232.java 2015-05-26 21:41:59.651832530 -0700
+++ new/langtools/test/tools/javap/T6622232.java 2015-05-26 21:41:59.547832528 -0700
@@ -25,7 +25,7 @@
* @test
* @bug 6622232
* @summary javap gets whitespace confused
- * @modules jdk.compiler
+ * @modules jdk.jdeps
*/
import java.io.*;
--- old/langtools/test/tools/javap/T6622260.java 2015-05-26 21:42:00.007832535 -0700
+++ new/langtools/test/tools/javap/T6622260.java 2015-05-26 21:41:59.903832534 -0700
@@ -25,7 +25,7 @@
* @test
* @bug 6622260
* @summary javap prints negative bytes incorrectly in hex
- * @modules jdk.compiler
+ * @modules jdk.jdeps
*/
import java.io.*;
--- old/langtools/test/tools/javap/T6715251.java 2015-05-26 21:42:00.383832541 -0700
+++ new/langtools/test/tools/javap/T6715251.java 2015-05-26 21:42:00.279832539 -0700
@@ -28,7 +28,7 @@
* @test
* @bug 6715251
* @summary javap should be consistent with javac and return 2 if given no arguments
- * @modules jdk.compiler
+ * @modules jdk.jdeps
*/
public class T6715251 {
--- old/langtools/test/tools/javap/T6715753.java 2015-05-26 21:42:00.743832546 -0700
+++ new/langtools/test/tools/javap/T6715753.java 2015-05-26 21:42:00.639832545 -0700
@@ -27,7 +27,7 @@
* @test
* @bug 6715753
* @summary Use javap to inquire about a specific inner class
- * @modules jdk.compiler
+ * @modules jdk.jdeps
*/
public class T6715753 {
--- old/langtools/test/tools/javap/T6715767.java 2015-05-26 21:42:01.103832552 -0700
+++ new/langtools/test/tools/javap/T6715767.java 2015-05-26 21:42:00.999832550 -0700
@@ -25,7 +25,7 @@
* @test
* @bug 6715767
* @summary javap on java.lang.ClassLoader crashes
- * @modules jdk.compiler
+ * @modules jdk.jdeps
*/
import java.io.*;
--- old/langtools/test/tools/javap/T6716452.java 2015-05-26 21:42:01.463832557 -0700
+++ new/langtools/test/tools/javap/T6716452.java 2015-05-26 21:42:01.359832555 -0700
@@ -24,7 +24,7 @@
/*
* @test 6716452
* @summary need a method to get an index of an attribute
- * @modules jdk.compiler/com.sun.tools.classfile
+ * @modules jdk.jdeps/com.sun.tools.classfile
*/
import java.io.*;
--- old/langtools/test/tools/javap/T6824493.java 2015-05-26 21:42:01.827832562 -0700
+++ new/langtools/test/tools/javap/T6824493.java 2015-05-26 21:42:01.719832561 -0700
@@ -28,7 +28,7 @@
* @test
* @bug 6824493
* @summary experimental support for additional info for instructions
- * @modules jdk.compiler
+ * @modules jdk.jdeps
* @compile -g T6824493.java
* @run main T6824493
*/
--- old/langtools/test/tools/javap/T6863746.java 2015-05-26 21:42:02.187832568 -0700
+++ new/langtools/test/tools/javap/T6863746.java 2015-05-26 21:42:02.083832566 -0700
@@ -27,7 +27,7 @@
* @test
* @bug 6863746
* @summary javap should not scan ct.sym by default
- * @modules jdk.compiler
+ * @modules jdk.jdeps
*/
public class T6863746 {
--- old/langtools/test/tools/javap/T6866657.java 2015-05-26 21:42:02.547832573 -0700
+++ new/langtools/test/tools/javap/T6866657.java 2015-05-26 21:42:02.443832571 -0700
@@ -26,7 +26,7 @@
* @test
* @bug 6866657
* @summary add byteLength() method to primary classfile types
- * @modules jdk.compiler/com.sun.tools.classfile
+ * @modules jdk.jdeps/com.sun.tools.classfile
*/
import java.io.*;
--- old/langtools/test/tools/javap/T6868539.java 2015-05-26 21:42:02.907832578 -0700
+++ new/langtools/test/tools/javap/T6868539.java 2015-05-26 21:42:02.803832577 -0700
@@ -26,7 +26,7 @@
* @bug 6868539 6868548 8035364
* @summary javap should use current names for constant pool entries,
* remove spurious ';' from constant pool entries
- * @modules jdk.compiler
+ * @modules jdk.jdeps
*/
import java.io.*;
--- old/langtools/test/tools/javap/T6879371.java 2015-05-26 21:42:03.267832584 -0700
+++ new/langtools/test/tools/javap/T6879371.java 2015-05-26 21:42:03.163832582 -0700
@@ -25,7 +25,7 @@
* @test
* @bug 6879371
* @summary javap does not close internal default file manager
- * @modules jdk.compiler
+ * @modules jdk.jdeps
*/
import java.io.*;
--- old/langtools/test/tools/javap/T7004698.java 2015-05-26 21:42:03.627832589 -0700
+++ new/langtools/test/tools/javap/T7004698.java 2015-05-26 21:42:03.523832587 -0700
@@ -25,7 +25,7 @@
* @test
* @bug 7004698
* @summary javap does not output CharacterRangeTable attributes correctly
- * @modules jdk.compiler
+ * @modules jdk.jdeps
*/
import java.io.*;
--- old/langtools/test/tools/javap/T7186925.java 2015-05-26 21:42:03.991832594 -0700
+++ new/langtools/test/tools/javap/T7186925.java 2015-05-26 21:42:03.887832593 -0700
@@ -25,7 +25,7 @@
* @test
* @bug 7186925
* @summary JavapTask passes null to java.io.Writer
- * @modules jdk.compiler/com.sun.tools.classfile
+ * @modules jdk.jdeps/com.sun.tools.classfile
*/
import java.io.*;
--- old/langtools/test/tools/javap/T7190862.java 2015-05-26 21:42:04.347832600 -0700
+++ new/langtools/test/tools/javap/T7190862.java 2015-05-26 21:42:04.243832598 -0700
@@ -3,7 +3,7 @@
* @test /nodynamiccopyright/
* @bug 7190862 7109747
* @summary javap shows an incorrect type for operands if the 'wide' prefix is used
- * @modules jdk.compiler
+ * @modules jdk.jdeps
*/
import com.sun.source.util.JavacTask;
--- old/langtools/test/tools/javap/T8032814.java 2015-05-26 21:42:04.707832605 -0700
+++ new/langtools/test/tools/javap/T8032814.java 2015-05-26 21:42:04.603832603 -0700
@@ -26,7 +26,7 @@
* @bug 8032814
* @summary LineNumberTable/LocalVariableTable tables duplication for the
* "-v -l" combination of options
- * @modules jdk.compiler
+ * @modules jdk.jdeps
* @compile -g T8032814.java
* @run main T8032814
*/
--- old/langtools/test/tools/javap/T8032819.java 2015-05-26 21:42:05.067832610 -0700
+++ new/langtools/test/tools/javap/T8032819.java 2015-05-26 21:42:04.959832609 -0700
@@ -25,7 +25,7 @@
* @test
* @bug 8032819
* @summary Extra empty line between field declarations for the "-v -c" and "-v -l" combination of options
- * @modules jdk.compiler
+ * @modules jdk.jdeps
* @compile -g T8032819.java
* @run main T8032819
*/
--- old/langtools/test/tools/javap/T8033180.java 2015-05-26 21:42:05.427832616 -0700
+++ new/langtools/test/tools/javap/T8033180.java 2015-05-26 21:42:05.323832614 -0700
@@ -25,7 +25,7 @@
* @test
* @bug 8033180
* @summary Bad newline characters
- * @modules jdk.compiler
+ * @modules jdk.jdeps
*/
import java.io.*;
--- old/langtools/test/tools/javap/T8033711.java 2015-05-26 21:42:05.787832621 -0700
+++ new/langtools/test/tools/javap/T8033711.java 2015-05-26 21:42:05.683832619 -0700
@@ -25,7 +25,7 @@
* @test
* @bug 8033711
* @summary An exception is thrown if using the "-classpath" option with no arguments
- * @modules jdk.compiler
+ * @modules jdk.jdeps
*/
--- old/langtools/test/tools/javap/T8035104.java 2015-05-26 21:42:06.147832626 -0700
+++ new/langtools/test/tools/javap/T8035104.java 2015-05-26 21:42:06.043832625 -0700
@@ -25,7 +25,7 @@
* @test
* @bug 8035104
* @summary reorder class file attributes in javap listing
- * @modules jdk.compiler
+ * @modules jdk.jdeps
*/
import java.io.*;
--- old/langtools/test/tools/javap/T8038414.java 2015-05-26 21:42:06.507832632 -0700
+++ new/langtools/test/tools/javap/T8038414.java 2015-05-26 21:42:06.407832630 -0700
@@ -32,7 +32,7 @@
* @test
* @bug 8038414
* @summary Constant pool's strings are not escaped properly
- * @modules jdk.compiler
+ * @modules jdk.jdeps
*/
public class T8038414 {
private static final String NEW_LINE = System.getProperty("line.separator");
--- old/langtools/test/tools/javap/TestSuperclass.java 2015-05-26 21:42:06.875832637 -0700
+++ new/langtools/test/tools/javap/TestSuperclass.java 2015-05-26 21:42:06.771832636 -0700
@@ -25,7 +25,7 @@
* @test
* @bug 7031005
* @summary javap prints "extends java.lang.Object"
- * @modules jdk.compiler
+ * @modules jdk.jdeps
*/
import java.io.File;
--- old/langtools/test/tools/javap/WhitespaceTest.java 2015-05-26 21:42:07.235832642 -0700
+++ new/langtools/test/tools/javap/WhitespaceTest.java 2015-05-26 21:42:07.131832641 -0700
@@ -25,7 +25,7 @@
* @test
* @bug 8033581 8033798 8033726
* @summary Check whitespace in generated output
- * @modules jdk.compiler
+ * @modules jdk.jdeps
*/
import java.io.*;
--- old/langtools/test/tools/javap/classfile/T6887895.java 2015-05-26 21:42:07.599832648 -0700
+++ new/langtools/test/tools/javap/classfile/T6887895.java 2015-05-26 21:42:07.495832646 -0700
@@ -25,7 +25,7 @@
* @test
* @bug 6887895
* @summary CONSTANT_Class_info getBaseName does not handle arrays of primitives correctly
- * @modules jdk.compiler/com.sun.tools.classfile
+ * @modules jdk.jdeps/com.sun.tools.classfile
*/
import java.io.*;
--- old/langtools/test/tools/javap/classfile/deps/T6907575.java 2015-05-26 21:42:07.967832653 -0700
+++ new/langtools/test/tools/javap/classfile/deps/T6907575.java 2015-05-26 21:42:07.859832652 -0700
@@ -26,7 +26,7 @@
/*
* @test
* @bug 6907575
- * @modules jdk.compiler/com.sun.tools.classfile
+ * @modules jdk.jdeps/com.sun.tools.classfile
* jdk.compiler/com.sun.tools.javac.file
* jdk.compiler/com.sun.tools.javac.util
* @build GetDeps p.C1
--- old/langtools/test/tools/javap/stackmap/StackmapTest.java 2015-05-26 21:42:08.323832659 -0700
+++ new/langtools/test/tools/javap/stackmap/StackmapTest.java 2015-05-26 21:42:08.223832657 -0700
@@ -26,9 +26,9 @@
* @bug 6271292
* @summary Verify that javap prints StackMapTable attribute contents
* @library /tools/lib
- * @modules jdk.compiler/com.sun.tools.javac.api
- * jdk.compiler/com.sun.tools.javac.file
- * jdk.compiler/com.sun.tools.javac.main
+ * @modules jdk.jdeps/com.sun.tools.javac.api
+ * jdk.jdeps/com.sun.tools.javac.file
+ * jdk.jdeps/com.sun.tools.javac.main
* @build ToolBox
* @run main StackmapTest
*/
--- old/langtools/test/tools/javap/typeAnnotations/JSR175Annotations.java 2015-05-26 21:42:08.687832664 -0700
+++ new/langtools/test/tools/javap/typeAnnotations/JSR175Annotations.java 2015-05-26 21:42:08.583832662 -0700
@@ -28,7 +28,7 @@
* @test JSR175Annotations
* @bug 6843077
* @summary test that only type annotations are recorded as such in classfile
- * @modules jdk.compiler/com.sun.tools.classfile
+ * @modules jdk.jdeps/com.sun.tools.classfile
*/
public class JSR175Annotations {
--- old/langtools/test/tools/javap/typeAnnotations/NewArray.java 2015-05-26 21:42:09.051832669 -0700
+++ new/langtools/test/tools/javap/typeAnnotations/NewArray.java 2015-05-26 21:42:08.947832668 -0700
@@ -28,7 +28,7 @@
* @test NewArray
* @bug 6843077
* @summary Test type annotations on local array are in method's code attribute.
- * @modules jdk.compiler/com.sun.tools.classfile
+ * @modules jdk.jdeps/com.sun.tools.classfile
*/
public class NewArray {
--- old/langtools/test/tools/javap/typeAnnotations/Presence.java 2015-05-26 21:42:09.411832675 -0700
+++ new/langtools/test/tools/javap/typeAnnotations/Presence.java 2015-05-26 21:42:09.307832673 -0700
@@ -30,7 +30,7 @@
* @test Presence
* @bug 6843077
* @summary test that all type annotations are present in the classfile
- * @modules jdk.compiler/com.sun.tools.classfile
+ * @modules jdk.jdeps/com.sun.tools.classfile
*/
public class Presence {
--- old/langtools/test/tools/javap/typeAnnotations/PresenceInner.java 2015-05-26 21:42:09.779832680 -0700
+++ new/langtools/test/tools/javap/typeAnnotations/PresenceInner.java 2015-05-26 21:42:09.675832679 -0700
@@ -28,7 +28,7 @@
* @test PresenceInner
* @bug 6843077
* @summary test that annotations in inner types count only once
- * @modules jdk.compiler/com.sun.tools.classfile
+ * @modules jdk.jdeps/com.sun.tools.classfile
*/
public class PresenceInner {
--- old/langtools/test/tools/javap/typeAnnotations/T6855990.java 2015-05-26 21:42:10.143832686 -0700
+++ new/langtools/test/tools/javap/typeAnnotations/T6855990.java 2015-05-26 21:42:10.039832684 -0700
@@ -27,7 +27,7 @@
* @test
* @bug 6855990
* @summary InstructionDetailWriter should support new 308 annotations attribute
- * @modules jdk.compiler
+ * @modules jdk.jdeps
*/
public class T6855990 {
--- old/langtools/test/tools/javap/typeAnnotations/TypeCasts.java 2015-05-26 21:42:10.503832691 -0700
+++ new/langtools/test/tools/javap/typeAnnotations/TypeCasts.java 2015-05-26 21:42:10.399832689 -0700
@@ -29,7 +29,7 @@
* @bug 6843077
* @summary test that typecasts annotation are emitted if only the cast
* expression is optimized away
- * @modules jdk.compiler/com.sun.tools.classfile
+ * @modules jdk.jdeps/com.sun.tools.classfile
*/
public class TypeCasts {
--- old/langtools/test/tools/javap/typeAnnotations/Visibility.java 2015-05-26 21:42:10.867832696 -0700
+++ new/langtools/test/tools/javap/typeAnnotations/Visibility.java 2015-05-26 21:42:10.763832695 -0700
@@ -28,7 +28,7 @@
* @test Visibility
* @bug 6843077
* @summary test that type annotations are recorded in the classfile
- * @modules jdk.compiler/com.sun.tools.classfile
+ * @modules jdk.jdeps/com.sun.tools.classfile
*/
public class Visibility {
--- old/langtools/test/tools/javap/typeAnnotations/Wildcards.java 2015-05-26 21:42:11.235832702 -0700
+++ new/langtools/test/tools/javap/typeAnnotations/Wildcards.java 2015-05-26 21:42:11.131832700 -0700
@@ -28,7 +28,7 @@
* @test Wildcards
* @bug 6843077
* @summary test that annotations target wildcards get emitted to classfile
- * @modules jdk.compiler/com.sun.tools.classfile
+ * @modules jdk.jdeps/com.sun.tools.classfile
*/
public class Wildcards {
public static void main(String[] args) throws Exception {
--- old/langtools/test/tools/jdeps/APIDeps.java 2015-05-26 21:42:11.595832707 -0700
+++ new/langtools/test/tools/jdeps/APIDeps.java 2015-05-26 21:42:11.491832705 -0700
@@ -27,8 +27,8 @@
* @summary Test -apionly and -jdkinternals options
* @modules java.base/sun.misc
* java.management
- * jdk.compiler/com.sun.tools.classfile
- * jdk.dev/com.sun.tools.jdeps
+ * jdk.jdeps/com.sun.tools.classfile
+ * jdk.jdeps/com.sun.tools.jdeps
* @build m.Bar m.Foo m.Gee b.B c.C c.I d.D e.E f.F g.G
* @run main APIDeps
*/
--- old/langtools/test/tools/jdeps/Basic.java 2015-05-26 21:42:11.955832712 -0700
+++ new/langtools/test/tools/jdeps/Basic.java 2015-05-26 21:42:11.851832711 -0700
@@ -26,7 +26,7 @@
* @bug 8003562 8005428 8015912 8027481 8048063 8068937
* @summary Basic tests for jdeps tool
* @modules java.management
- * jdk.dev/com.sun.tools.jdeps
+ * jdk.jdeps/com.sun.tools.jdeps
* @build Test p.Foo p.Bar p.C p.SubClass q.Gee javax.activity.NotCompactProfile
* @run main Basic
*/
--- old/langtools/test/tools/jdeps/DotFileTest.java 2015-05-26 21:42:12.323832718 -0700
+++ new/langtools/test/tools/jdeps/DotFileTest.java 2015-05-26 21:42:12.219832716 -0700
@@ -26,7 +26,7 @@
* @bug 8003562
* @summary Basic tests for jdeps -dotoutput option
* @modules java.management
- * jdk.dev/com.sun.tools.jdeps
+ * jdk.jdeps/com.sun.tools.jdeps
* @build Test p.Foo p.Bar javax.activity.NotCompactProfile
* @run main DotFileTest
*/
--- old/langtools/test/tools/jdeps/VerboseFormat/JdepsDependencyClosure.java 2015-05-26 21:42:12.687832723 -0700
+++ new/langtools/test/tools/jdeps/VerboseFormat/JdepsDependencyClosure.java 2015-05-26 21:42:12.583832722 -0700
@@ -43,7 +43,7 @@
* @summary Test that jdeps verbose output has a summary line when dependencies
* are found within the same archive. For each testcase, compare the
* result obtained from jdeps with the expected result.
- * @modules jdk.dev/com.sun.tools.jdeps
+ * @modules jdk.jdeps/com.sun.tools.jdeps
* @build use.indirect.DontUseUnsafe2
* @build use.indirect.UseUnsafeIndirectly
* @build use.indirect2.DontUseUnsafe3
--- old/jdk/make/closed/jdk.tbom 2015-05-26 21:42:13.027832728 -0700
+++ new/jdk/make/closed/jdk.tbom 2015-05-26 21:42:12.947832727 -0700
@@ -61,42 +61,42 @@
-
-
-
-
-
-
-
-
@@ -106,7 +106,7 @@
-
@@ -196,7 +196,7 @@
-
@@ -325,7 +325,7 @@
-
--- old/jdk/make/gendata/Gendata-jdk.dev.gmk 2015-05-26 21:42:13.523832736 -0700
+++ /dev/null 2015-04-26 22:05:36.465433038 -0700
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-include GendataCommon.gmk
-
-$(eval $(call IncludeCustomExtension, jdk, gendata/Gendata-jdk.dev.gmk))
-
-JDEPS_MODULES_XML := $(JDK_OUTPUTDIR)/modules/jdk.dev/com/sun/tools/jdeps/resources/jdeps-modules.xml
-MODULES_XML += $(TOPDIR)/modules.xml
-
-#
-# Generate modules.xml for jdeps to use
-# It augments $(TOPDIR)/modules.xml to include module membership
-#
-$(JDEPS_MODULES_XML): $(BUILD_TOOLS_JDK) $(MODULES_XML)
- $(MKDIR) -p $(@D)
- $(RM) $@
- $(TOOL_GENMODULESXML) -o $@ -mp $(JDK_OUTPUTDIR)/modules $(MODULES_XML)
-
-TARGETS += $(JDEPS_MODULES_XML)
--- /dev/null 2015-04-26 22:05:36.465433038 -0700
+++ new/jdk/make/gendata/Gendata-jdk.jdeps.gmk 2015-05-26 21:42:13.295832732 -0700
@@ -0,0 +1,42 @@
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+include GendataCommon.gmk
+
+$(eval $(call IncludeCustomExtension, jdk, gendata/Gendata-jdk.jdeps.gmk))
+
+JDEPS_MODULES_XML := $(JDK_OUTPUTDIR)/modules/jdk.jdeps/com/sun/tools/jdeps/resources/jdeps-modules.xml
+MODULES_XML += $(TOPDIR)/modules.xml
+
+#
+# Generate modules.xml for jdeps to use
+# It augments $(TOPDIR)/modules.xml to include module membership
+#
+$(JDEPS_MODULES_XML): $(BUILD_TOOLS_JDK) $(MODULES_XML)
+ $(MKDIR) -p $(@D)
+ $(RM) $@
+ $(TOOL_GENMODULESXML) -o $@ -mp $(JDK_OUTPUTDIR)/modules $(MODULES_XML)
+
+TARGETS += $(JDEPS_MODULES_XML)
--- old/jdk/make/closed/gendata/Gendata-jdk.dev.gmk 2015-05-26 21:42:14.399832749 -0700
+++ /dev/null 2015-04-26 22:05:36.465433038 -0700
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved.
-# ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
-#
-
-MODULES_XML += $(TOPDIR)/closed/modules.xml
--- /dev/null 2015-04-26 22:05:36.465433038 -0700
+++ new/jdk/make/closed/gendata/Gendata-jdk.jdeps.gmk 2015-05-26 21:42:13.811832740 -0700
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved.
+# ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+#
+
+MODULES_XML += $(TOPDIR)/closed/modules.xml
--- old/langtools/make/gensrc/Gensrc-jdk.dev.gmk 2015-05-26 21:42:14.699832753 -0700
+++ /dev/null 2015-04-26 22:05:36.465433038 -0700
@@ -1,33 +0,0 @@
-#
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-include GensrcCommon.gmk
-
-$(eval $(call SetupVersionProperties,JDEPS_VERSION,\
- com/sun/tools/jdeps/resources/version.properties))
-
-$(eval $(call SetupCompileProperties,COMPILE_PROPERTIES, $(JDEPS_VERSION)))
-
-all: $(COMPILE_PROPERTIES)
--- /dev/null 2015-04-26 22:05:36.465433038 -0700
+++ new/langtools/make/gensrc/Gensrc-jdk.jdeps.gmk 2015-05-26 21:42:14.527832750 -0700
@@ -0,0 +1,37 @@
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+include GensrcCommon.gmk
+
+$(eval $(call SetupVersionProperties,JAVAP_VERSION, \
+ com/sun/tools/javap/resources/version.properties))
+
+$(eval $(call SetupVersionProperties,JDEPS_VERSION,\
+ com/sun/tools/jdeps/resources/version.properties))
+
+$(eval $(call SetupCompileProperties,COMPILE_PROPERTIES,\
+ $(JDEPS_VERSION) $(JAVAP_VERSION)))
+
+all: $(COMPILE_PROPERTIES)
--- old/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/AccessFlags.java 2015-05-26 21:42:15.143832760 -0700
+++ /dev/null 2015-04-26 22:05:36.465433038 -0700
@@ -1,258 +0,0 @@
-/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.classfile;
-
-import java.io.IOException;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-/**
- * See JVMS, sections 4.2, 4.6, 4.7.
- *
- * This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own risk.
- * This code and its internal interfaces are subject to change or
- * deletion without notice.
- */
-public class AccessFlags {
- public static final int ACC_PUBLIC = 0x0001; // class, inner, field, method
- public static final int ACC_PRIVATE = 0x0002; // inner, field, method
- public static final int ACC_PROTECTED = 0x0004; // inner, field, method
- public static final int ACC_STATIC = 0x0008; // inner, field, method
- public static final int ACC_FINAL = 0x0010; // class, inner, field, method
- public static final int ACC_SUPER = 0x0020; // class
- public static final int ACC_SYNCHRONIZED = 0x0020; // method
- public static final int ACC_VOLATILE = 0x0040; // field
- public static final int ACC_BRIDGE = 0x0040; // method
- public static final int ACC_TRANSIENT = 0x0080; // field
- public static final int ACC_VARARGS = 0x0080; // method
- public static final int ACC_NATIVE = 0x0100; // method
- public static final int ACC_INTERFACE = 0x0200; // class, inner
- public static final int ACC_ABSTRACT = 0x0400; // class, inner, method
- public static final int ACC_STRICT = 0x0800; // method
- public static final int ACC_SYNTHETIC = 0x1000; // class, inner, field, method
- public static final int ACC_ANNOTATION = 0x2000; // class, inner
- public static final int ACC_ENUM = 0x4000; // class, inner, field
- public static final int ACC_MANDATED = 0x8000; // class, inner, field, method
-
- public static enum Kind { Class, InnerClass, Field, Method}
-
- AccessFlags(ClassReader cr) throws IOException {
- this(cr.readUnsignedShort());
- }
-
- public AccessFlags(int flags) {
- this.flags = flags;
- }
-
- public AccessFlags ignore(int mask) {
- return new AccessFlags(flags & ~mask);
- }
-
- public boolean is(int mask) {
- return (flags & mask) != 0;
- }
-
- public int byteLength() {
- return 2;
- }
-
- private static final int[] classModifiers = {
- ACC_PUBLIC, ACC_FINAL, ACC_ABSTRACT
- };
-
- private static final int[] classFlags = {
- ACC_PUBLIC, ACC_FINAL, ACC_SUPER, ACC_INTERFACE, ACC_ABSTRACT,
- ACC_SYNTHETIC, ACC_ANNOTATION, ACC_ENUM
- };
-
- public Set getClassModifiers() {
- int f = ((flags & ACC_INTERFACE) != 0 ? flags & ~ACC_ABSTRACT : flags);
- return getModifiers(f, classModifiers, Kind.Class);
- }
-
- public Set getClassFlags() {
- return getFlags(classFlags, Kind.Class);
- }
-
- private static final int[] innerClassModifiers = {
- ACC_PUBLIC, ACC_PRIVATE, ACC_PROTECTED, ACC_STATIC, ACC_FINAL,
- ACC_ABSTRACT
- };
-
- private static final int[] innerClassFlags = {
- ACC_PUBLIC, ACC_PRIVATE, ACC_PROTECTED, ACC_STATIC, ACC_FINAL, ACC_SUPER,
- ACC_INTERFACE, ACC_ABSTRACT, ACC_SYNTHETIC, ACC_ANNOTATION, ACC_ENUM
- };
-
- public Set getInnerClassModifiers() {
- int f = ((flags & ACC_INTERFACE) != 0 ? flags & ~ACC_ABSTRACT : flags);
- return getModifiers(f, innerClassModifiers, Kind.InnerClass);
- }
-
- public Set getInnerClassFlags() {
- return getFlags(innerClassFlags, Kind.InnerClass);
- }
-
- private static final int[] fieldModifiers = {
- ACC_PUBLIC, ACC_PRIVATE, ACC_PROTECTED, ACC_STATIC, ACC_FINAL,
- ACC_VOLATILE, ACC_TRANSIENT
- };
-
- private static final int[] fieldFlags = {
- ACC_PUBLIC, ACC_PRIVATE, ACC_PROTECTED, ACC_STATIC, ACC_FINAL,
- ACC_VOLATILE, ACC_TRANSIENT, ACC_SYNTHETIC, ACC_ENUM
- };
-
- public Set getFieldModifiers() {
- return getModifiers(fieldModifiers, Kind.Field);
- }
-
- public Set getFieldFlags() {
- return getFlags(fieldFlags, Kind.Field);
- }
-
- private static final int[] methodModifiers = {
- ACC_PUBLIC, ACC_PRIVATE, ACC_PROTECTED, ACC_STATIC, ACC_FINAL,
- ACC_SYNCHRONIZED, ACC_NATIVE, ACC_ABSTRACT, ACC_STRICT
- };
-
- private static final int[] methodFlags = {
- ACC_PUBLIC, ACC_PRIVATE, ACC_PROTECTED, ACC_STATIC, ACC_FINAL,
- ACC_SYNCHRONIZED, ACC_BRIDGE, ACC_VARARGS, ACC_NATIVE, ACC_ABSTRACT,
- ACC_STRICT, ACC_SYNTHETIC
- };
-
- public Set getMethodModifiers() {
- return getModifiers(methodModifiers, Kind.Method);
- }
-
- public Set getMethodFlags() {
- return getFlags(methodFlags, Kind.Method);
- }
-
- private Set getModifiers(int[] modifierFlags, Kind t) {
- return getModifiers(flags, modifierFlags, t);
- }
-
- private static Set getModifiers(int flags, int[] modifierFlags, Kind t) {
- Set s = new LinkedHashSet<>();
- for (int m: modifierFlags) {
- if ((flags & m) != 0)
- s.add(flagToModifier(m, t));
- }
- return s;
- }
-
- private Set getFlags(int[] expectedFlags, Kind t) {
- Set s = new LinkedHashSet<>();
- int f = flags;
- for (int e: expectedFlags) {
- if ((f & e) != 0) {
- s.add(flagToName(e, t));
- f = f & ~e;
- }
- }
- while (f != 0) {
- int bit = Integer.highestOneBit(f);
- s.add("0x" + Integer.toHexString(bit));
- f = f & ~bit;
- }
- return s;
- }
-
- private static String flagToModifier(int flag, Kind t) {
- switch (flag) {
- case ACC_PUBLIC:
- return "public";
- case ACC_PRIVATE:
- return "private";
- case ACC_PROTECTED:
- return "protected";
- case ACC_STATIC:
- return "static";
- case ACC_FINAL:
- return "final";
- case ACC_SYNCHRONIZED:
- return "synchronized";
- case 0x80:
- return (t == Kind.Field ? "transient" : null);
- case ACC_VOLATILE:
- return "volatile";
- case ACC_NATIVE:
- return "native";
- case ACC_ABSTRACT:
- return "abstract";
- case ACC_STRICT:
- return "strictfp";
- case ACC_MANDATED:
- return "mandated";
- default:
- return null;
- }
- }
-
- private static String flagToName(int flag, Kind t) {
- switch (flag) {
- case ACC_PUBLIC:
- return "ACC_PUBLIC";
- case ACC_PRIVATE:
- return "ACC_PRIVATE";
- case ACC_PROTECTED:
- return "ACC_PROTECTED";
- case ACC_STATIC:
- return "ACC_STATIC";
- case ACC_FINAL:
- return "ACC_FINAL";
- case 0x20:
- return (t == Kind.Class ? "ACC_SUPER" : "ACC_SYNCHRONIZED");
- case 0x40:
- return (t == Kind.Field ? "ACC_VOLATILE" : "ACC_BRIDGE");
- case 0x80:
- return (t == Kind.Field ? "ACC_TRANSIENT" : "ACC_VARARGS");
- case ACC_NATIVE:
- return "ACC_NATIVE";
- case ACC_INTERFACE:
- return "ACC_INTERFACE";
- case ACC_ABSTRACT:
- return "ACC_ABSTRACT";
- case ACC_STRICT:
- return "ACC_STRICT";
- case ACC_SYNTHETIC:
- return "ACC_SYNTHETIC";
- case ACC_ANNOTATION:
- return "ACC_ANNOTATION";
- case ACC_ENUM:
- return "ACC_ENUM";
- case ACC_MANDATED:
- return "ACC_MANDATED";
- default:
- return null;
- }
- }
-
- public final int flags;
-}
--- /dev/null 2015-04-26 22:05:36.465433038 -0700
+++ new/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/AccessFlags.java 2015-05-26 21:42:14.967832757 -0700
@@ -0,0 +1,258 @@
+/*
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.classfile;
+
+import java.io.IOException;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+/**
+ * See JVMS, sections 4.2, 4.6, 4.7.
+ *
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ */
+public class AccessFlags {
+ public static final int ACC_PUBLIC = 0x0001; // class, inner, field, method
+ public static final int ACC_PRIVATE = 0x0002; // inner, field, method
+ public static final int ACC_PROTECTED = 0x0004; // inner, field, method
+ public static final int ACC_STATIC = 0x0008; // inner, field, method
+ public static final int ACC_FINAL = 0x0010; // class, inner, field, method
+ public static final int ACC_SUPER = 0x0020; // class
+ public static final int ACC_SYNCHRONIZED = 0x0020; // method
+ public static final int ACC_VOLATILE = 0x0040; // field
+ public static final int ACC_BRIDGE = 0x0040; // method
+ public static final int ACC_TRANSIENT = 0x0080; // field
+ public static final int ACC_VARARGS = 0x0080; // method
+ public static final int ACC_NATIVE = 0x0100; // method
+ public static final int ACC_INTERFACE = 0x0200; // class, inner
+ public static final int ACC_ABSTRACT = 0x0400; // class, inner, method
+ public static final int ACC_STRICT = 0x0800; // method
+ public static final int ACC_SYNTHETIC = 0x1000; // class, inner, field, method
+ public static final int ACC_ANNOTATION = 0x2000; // class, inner
+ public static final int ACC_ENUM = 0x4000; // class, inner, field
+ public static final int ACC_MANDATED = 0x8000; // class, inner, field, method
+
+ public static enum Kind { Class, InnerClass, Field, Method}
+
+ AccessFlags(ClassReader cr) throws IOException {
+ this(cr.readUnsignedShort());
+ }
+
+ public AccessFlags(int flags) {
+ this.flags = flags;
+ }
+
+ public AccessFlags ignore(int mask) {
+ return new AccessFlags(flags & ~mask);
+ }
+
+ public boolean is(int mask) {
+ return (flags & mask) != 0;
+ }
+
+ public int byteLength() {
+ return 2;
+ }
+
+ private static final int[] classModifiers = {
+ ACC_PUBLIC, ACC_FINAL, ACC_ABSTRACT
+ };
+
+ private static final int[] classFlags = {
+ ACC_PUBLIC, ACC_FINAL, ACC_SUPER, ACC_INTERFACE, ACC_ABSTRACT,
+ ACC_SYNTHETIC, ACC_ANNOTATION, ACC_ENUM
+ };
+
+ public Set getClassModifiers() {
+ int f = ((flags & ACC_INTERFACE) != 0 ? flags & ~ACC_ABSTRACT : flags);
+ return getModifiers(f, classModifiers, Kind.Class);
+ }
+
+ public Set getClassFlags() {
+ return getFlags(classFlags, Kind.Class);
+ }
+
+ private static final int[] innerClassModifiers = {
+ ACC_PUBLIC, ACC_PRIVATE, ACC_PROTECTED, ACC_STATIC, ACC_FINAL,
+ ACC_ABSTRACT
+ };
+
+ private static final int[] innerClassFlags = {
+ ACC_PUBLIC, ACC_PRIVATE, ACC_PROTECTED, ACC_STATIC, ACC_FINAL, ACC_SUPER,
+ ACC_INTERFACE, ACC_ABSTRACT, ACC_SYNTHETIC, ACC_ANNOTATION, ACC_ENUM
+ };
+
+ public Set getInnerClassModifiers() {
+ int f = ((flags & ACC_INTERFACE) != 0 ? flags & ~ACC_ABSTRACT : flags);
+ return getModifiers(f, innerClassModifiers, Kind.InnerClass);
+ }
+
+ public Set getInnerClassFlags() {
+ return getFlags(innerClassFlags, Kind.InnerClass);
+ }
+
+ private static final int[] fieldModifiers = {
+ ACC_PUBLIC, ACC_PRIVATE, ACC_PROTECTED, ACC_STATIC, ACC_FINAL,
+ ACC_VOLATILE, ACC_TRANSIENT
+ };
+
+ private static final int[] fieldFlags = {
+ ACC_PUBLIC, ACC_PRIVATE, ACC_PROTECTED, ACC_STATIC, ACC_FINAL,
+ ACC_VOLATILE, ACC_TRANSIENT, ACC_SYNTHETIC, ACC_ENUM
+ };
+
+ public Set getFieldModifiers() {
+ return getModifiers(fieldModifiers, Kind.Field);
+ }
+
+ public Set getFieldFlags() {
+ return getFlags(fieldFlags, Kind.Field);
+ }
+
+ private static final int[] methodModifiers = {
+ ACC_PUBLIC, ACC_PRIVATE, ACC_PROTECTED, ACC_STATIC, ACC_FINAL,
+ ACC_SYNCHRONIZED, ACC_NATIVE, ACC_ABSTRACT, ACC_STRICT
+ };
+
+ private static final int[] methodFlags = {
+ ACC_PUBLIC, ACC_PRIVATE, ACC_PROTECTED, ACC_STATIC, ACC_FINAL,
+ ACC_SYNCHRONIZED, ACC_BRIDGE, ACC_VARARGS, ACC_NATIVE, ACC_ABSTRACT,
+ ACC_STRICT, ACC_SYNTHETIC
+ };
+
+ public Set getMethodModifiers() {
+ return getModifiers(methodModifiers, Kind.Method);
+ }
+
+ public Set getMethodFlags() {
+ return getFlags(methodFlags, Kind.Method);
+ }
+
+ private Set getModifiers(int[] modifierFlags, Kind t) {
+ return getModifiers(flags, modifierFlags, t);
+ }
+
+ private static Set getModifiers(int flags, int[] modifierFlags, Kind t) {
+ Set s = new LinkedHashSet<>();
+ for (int m: modifierFlags) {
+ if ((flags & m) != 0)
+ s.add(flagToModifier(m, t));
+ }
+ return s;
+ }
+
+ private Set getFlags(int[] expectedFlags, Kind t) {
+ Set s = new LinkedHashSet<>();
+ int f = flags;
+ for (int e: expectedFlags) {
+ if ((f & e) != 0) {
+ s.add(flagToName(e, t));
+ f = f & ~e;
+ }
+ }
+ while (f != 0) {
+ int bit = Integer.highestOneBit(f);
+ s.add("0x" + Integer.toHexString(bit));
+ f = f & ~bit;
+ }
+ return s;
+ }
+
+ private static String flagToModifier(int flag, Kind t) {
+ switch (flag) {
+ case ACC_PUBLIC:
+ return "public";
+ case ACC_PRIVATE:
+ return "private";
+ case ACC_PROTECTED:
+ return "protected";
+ case ACC_STATIC:
+ return "static";
+ case ACC_FINAL:
+ return "final";
+ case ACC_SYNCHRONIZED:
+ return "synchronized";
+ case 0x80:
+ return (t == Kind.Field ? "transient" : null);
+ case ACC_VOLATILE:
+ return "volatile";
+ case ACC_NATIVE:
+ return "native";
+ case ACC_ABSTRACT:
+ return "abstract";
+ case ACC_STRICT:
+ return "strictfp";
+ case ACC_MANDATED:
+ return "mandated";
+ default:
+ return null;
+ }
+ }
+
+ private static String flagToName(int flag, Kind t) {
+ switch (flag) {
+ case ACC_PUBLIC:
+ return "ACC_PUBLIC";
+ case ACC_PRIVATE:
+ return "ACC_PRIVATE";
+ case ACC_PROTECTED:
+ return "ACC_PROTECTED";
+ case ACC_STATIC:
+ return "ACC_STATIC";
+ case ACC_FINAL:
+ return "ACC_FINAL";
+ case 0x20:
+ return (t == Kind.Class ? "ACC_SUPER" : "ACC_SYNCHRONIZED");
+ case 0x40:
+ return (t == Kind.Field ? "ACC_VOLATILE" : "ACC_BRIDGE");
+ case 0x80:
+ return (t == Kind.Field ? "ACC_TRANSIENT" : "ACC_VARARGS");
+ case ACC_NATIVE:
+ return "ACC_NATIVE";
+ case ACC_INTERFACE:
+ return "ACC_INTERFACE";
+ case ACC_ABSTRACT:
+ return "ACC_ABSTRACT";
+ case ACC_STRICT:
+ return "ACC_STRICT";
+ case ACC_SYNTHETIC:
+ return "ACC_SYNTHETIC";
+ case ACC_ANNOTATION:
+ return "ACC_ANNOTATION";
+ case ACC_ENUM:
+ return "ACC_ENUM";
+ case ACC_MANDATED:
+ return "ACC_MANDATED";
+ default:
+ return null;
+ }
+ }
+
+ public final int flags;
+}
--- old/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Annotation.java 2015-05-26 21:42:15.451832764 -0700
+++ /dev/null 2015-04-26 22:05:36.465433038 -0700
@@ -1,244 +0,0 @@
-/*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.classfile;
-
-import java.io.IOException;
-
-/**
- * See JVMS, section 4.8.16.
- *
- * This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own risk.
- * This code and its internal interfaces are subject to change or
- * deletion without notice.
- */
-public class Annotation {
- static class InvalidAnnotation extends AttributeException {
- private static final long serialVersionUID = -4620480740735772708L;
- InvalidAnnotation(String msg) {
- super(msg);
- }
- }
-
- Annotation(ClassReader cr) throws IOException, InvalidAnnotation {
- type_index = cr.readUnsignedShort();
- num_element_value_pairs = cr.readUnsignedShort();
- element_value_pairs = new element_value_pair[num_element_value_pairs];
- for (int i = 0; i < element_value_pairs.length; i++)
- element_value_pairs[i] = new element_value_pair(cr);
- }
-
- public Annotation(ConstantPool constant_pool,
- int type_index,
- element_value_pair[] element_value_pairs) {
- this.type_index = type_index;
- num_element_value_pairs = element_value_pairs.length;
- this.element_value_pairs = element_value_pairs;
- }
-
- public int length() {
- int n = 2 /*type_index*/ + 2 /*num_element_value_pairs*/;
- for (element_value_pair pair: element_value_pairs)
- n += pair.length();
- return n;
- }
-
- public final int type_index;
- public final int num_element_value_pairs;
- public final element_value_pair element_value_pairs[];
-
- /**
- * See JVMS, section 4.8.16.1.
- */
- public static abstract class element_value {
- public static element_value read(ClassReader cr)
- throws IOException, InvalidAnnotation {
- int tag = cr.readUnsignedByte();
- switch (tag) {
- case 'B':
- case 'C':
- case 'D':
- case 'F':
- case 'I':
- case 'J':
- case 'S':
- case 'Z':
- case 's':
- return new Primitive_element_value(cr, tag);
-
- case 'e':
- return new Enum_element_value(cr, tag);
-
- case 'c':
- return new Class_element_value(cr, tag);
-
- case '@':
- return new Annotation_element_value(cr, tag);
-
- case '[':
- return new Array_element_value(cr, tag);
-
- default:
- throw new InvalidAnnotation("unrecognized tag: " + tag);
- }
- }
-
- protected element_value(int tag) {
- this.tag = tag;
- }
-
- public abstract int length();
-
- public abstract R accept(Visitor visitor, P p);
-
- public interface Visitor {
- R visitPrimitive(Primitive_element_value ev, P p);
- R visitEnum(Enum_element_value ev, P p);
- R visitClass(Class_element_value ev, P p);
- R visitAnnotation(Annotation_element_value ev, P p);
- R visitArray(Array_element_value ev, P p);
- }
-
- public final int tag;
- }
-
- public static class Primitive_element_value extends element_value {
- Primitive_element_value(ClassReader cr, int tag) throws IOException {
- super(tag);
- const_value_index = cr.readUnsignedShort();
- }
-
- @Override
- public int length() {
- return 2;
- }
-
- public R accept(Visitor visitor, P p) {
- return visitor.visitPrimitive(this, p);
- }
-
- public final int const_value_index;
-
- }
-
- public static class Enum_element_value extends element_value {
- Enum_element_value(ClassReader cr, int tag) throws IOException {
- super(tag);
- type_name_index = cr.readUnsignedShort();
- const_name_index = cr.readUnsignedShort();
- }
-
- @Override
- public int length() {
- return 4;
- }
-
- public R accept(Visitor visitor, P p) {
- return visitor.visitEnum(this, p);
- }
-
- public final int type_name_index;
- public final int const_name_index;
- }
-
- public static class Class_element_value extends element_value {
- Class_element_value(ClassReader cr, int tag) throws IOException {
- super(tag);
- class_info_index = cr.readUnsignedShort();
- }
-
- @Override
- public int length() {
- return 2;
- }
-
- public R accept(Visitor visitor, P p) {
- return visitor.visitClass(this, p);
- }
-
- public final int class_info_index;
- }
-
- public static class Annotation_element_value extends element_value {
- Annotation_element_value(ClassReader cr, int tag)
- throws IOException, InvalidAnnotation {
- super(tag);
- annotation_value = new Annotation(cr);
- }
-
- @Override
- public int length() {
- return annotation_value.length();
- }
-
- public R accept(Visitor visitor, P p) {
- return visitor.visitAnnotation(this, p);
- }
-
- public final Annotation annotation_value;
- }
-
- public static class Array_element_value extends element_value {
- Array_element_value(ClassReader cr, int tag)
- throws IOException, InvalidAnnotation {
- super(tag);
- num_values = cr.readUnsignedShort();
- values = new element_value[num_values];
- for (int i = 0; i < values.length; i++)
- values[i] = element_value.read(cr);
- }
-
- @Override
- public int length() {
- int n = 2;
- for (int i = 0; i < values.length; i++)
- n += values[i].length();
- return n;
- }
-
- public R accept(Visitor visitor, P p) {
- return visitor.visitArray(this, p);
- }
-
- public final int num_values;
- public final element_value[] values;
- }
-
- public static class element_value_pair {
- element_value_pair(ClassReader cr)
- throws IOException, InvalidAnnotation {
- element_name_index = cr.readUnsignedShort();
- value = element_value.read(cr);
- }
-
- public int length() {
- return 2 + value.length();
- }
-
- public final int element_name_index;
- public final element_value value;
- }
-}
--- /dev/null 2015-04-26 22:05:36.465433038 -0700
+++ new/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Annotation.java 2015-05-26 21:42:15.279832762 -0700
@@ -0,0 +1,244 @@
+/*
+ * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.classfile;
+
+import java.io.IOException;
+
+/**
+ * See JVMS, section 4.8.16.
+ *
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ */
+public class Annotation {
+ static class InvalidAnnotation extends AttributeException {
+ private static final long serialVersionUID = -4620480740735772708L;
+ InvalidAnnotation(String msg) {
+ super(msg);
+ }
+ }
+
+ Annotation(ClassReader cr) throws IOException, InvalidAnnotation {
+ type_index = cr.readUnsignedShort();
+ num_element_value_pairs = cr.readUnsignedShort();
+ element_value_pairs = new element_value_pair[num_element_value_pairs];
+ for (int i = 0; i < element_value_pairs.length; i++)
+ element_value_pairs[i] = new element_value_pair(cr);
+ }
+
+ public Annotation(ConstantPool constant_pool,
+ int type_index,
+ element_value_pair[] element_value_pairs) {
+ this.type_index = type_index;
+ num_element_value_pairs = element_value_pairs.length;
+ this.element_value_pairs = element_value_pairs;
+ }
+
+ public int length() {
+ int n = 2 /*type_index*/ + 2 /*num_element_value_pairs*/;
+ for (element_value_pair pair: element_value_pairs)
+ n += pair.length();
+ return n;
+ }
+
+ public final int type_index;
+ public final int num_element_value_pairs;
+ public final element_value_pair element_value_pairs[];
+
+ /**
+ * See JVMS, section 4.8.16.1.
+ */
+ public static abstract class element_value {
+ public static element_value read(ClassReader cr)
+ throws IOException, InvalidAnnotation {
+ int tag = cr.readUnsignedByte();
+ switch (tag) {
+ case 'B':
+ case 'C':
+ case 'D':
+ case 'F':
+ case 'I':
+ case 'J':
+ case 'S':
+ case 'Z':
+ case 's':
+ return new Primitive_element_value(cr, tag);
+
+ case 'e':
+ return new Enum_element_value(cr, tag);
+
+ case 'c':
+ return new Class_element_value(cr, tag);
+
+ case '@':
+ return new Annotation_element_value(cr, tag);
+
+ case '[':
+ return new Array_element_value(cr, tag);
+
+ default:
+ throw new InvalidAnnotation("unrecognized tag: " + tag);
+ }
+ }
+
+ protected element_value(int tag) {
+ this.tag = tag;
+ }
+
+ public abstract int length();
+
+ public abstract R accept(Visitor visitor, P p);
+
+ public interface Visitor {
+ R visitPrimitive(Primitive_element_value ev, P p);
+ R visitEnum(Enum_element_value ev, P p);
+ R visitClass(Class_element_value ev, P p);
+ R visitAnnotation(Annotation_element_value ev, P p);
+ R visitArray(Array_element_value ev, P p);
+ }
+
+ public final int tag;
+ }
+
+ public static class Primitive_element_value extends element_value {
+ Primitive_element_value(ClassReader cr, int tag) throws IOException {
+ super(tag);
+ const_value_index = cr.readUnsignedShort();
+ }
+
+ @Override
+ public int length() {
+ return 2;
+ }
+
+ public R accept(Visitor visitor, P p) {
+ return visitor.visitPrimitive(this, p);
+ }
+
+ public final int const_value_index;
+
+ }
+
+ public static class Enum_element_value extends element_value {
+ Enum_element_value(ClassReader cr, int tag) throws IOException {
+ super(tag);
+ type_name_index = cr.readUnsignedShort();
+ const_name_index = cr.readUnsignedShort();
+ }
+
+ @Override
+ public int length() {
+ return 4;
+ }
+
+ public R accept(Visitor visitor, P p) {
+ return visitor.visitEnum(this, p);
+ }
+
+ public final int type_name_index;
+ public final int const_name_index;
+ }
+
+ public static class Class_element_value extends element_value {
+ Class_element_value(ClassReader cr, int tag) throws IOException {
+ super(tag);
+ class_info_index = cr.readUnsignedShort();
+ }
+
+ @Override
+ public int length() {
+ return 2;
+ }
+
+ public R accept(Visitor visitor, P p) {
+ return visitor.visitClass(this, p);
+ }
+
+ public final int class_info_index;
+ }
+
+ public static class Annotation_element_value extends element_value {
+ Annotation_element_value(ClassReader cr, int tag)
+ throws IOException, InvalidAnnotation {
+ super(tag);
+ annotation_value = new Annotation(cr);
+ }
+
+ @Override
+ public int length() {
+ return annotation_value.length();
+ }
+
+ public R accept(Visitor visitor, P p) {
+ return visitor.visitAnnotation(this, p);
+ }
+
+ public final Annotation annotation_value;
+ }
+
+ public static class Array_element_value extends element_value {
+ Array_element_value(ClassReader cr, int tag)
+ throws IOException, InvalidAnnotation {
+ super(tag);
+ num_values = cr.readUnsignedShort();
+ values = new element_value[num_values];
+ for (int i = 0; i < values.length; i++)
+ values[i] = element_value.read(cr);
+ }
+
+ @Override
+ public int length() {
+ int n = 2;
+ for (int i = 0; i < values.length; i++)
+ n += values[i].length();
+ return n;
+ }
+
+ public R accept(Visitor visitor, P p) {
+ return visitor.visitArray(this, p);
+ }
+
+ public final int num_values;
+ public final element_value[] values;
+ }
+
+ public static class element_value_pair {
+ element_value_pair(ClassReader cr)
+ throws IOException, InvalidAnnotation {
+ element_name_index = cr.readUnsignedShort();
+ value = element_value.read(cr);
+ }
+
+ public int length() {
+ return 2 + value.length();
+ }
+
+ public final int element_name_index;
+ public final element_value value;
+ }
+}
--- old/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/AnnotationDefault_attribute.java 2015-05-26 21:42:15.767832769 -0700
+++ /dev/null 2015-04-26 22:05:36.465433038 -0700
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.classfile;
-
-import java.io.IOException;
-
-/**
- * See JVMS, section 4.8.15.
- *
- * This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own risk.
- * This code and its internal interfaces are subject to change or
- * deletion without notice.
- */
-public class AnnotationDefault_attribute extends Attribute {
- AnnotationDefault_attribute(ClassReader cr, int name_index, int length)
- throws IOException, Annotation.InvalidAnnotation {
- super(name_index, length);
- default_value = Annotation.element_value.read(cr);
- }
-
- public AnnotationDefault_attribute(ConstantPool constant_pool, Annotation.element_value default_value)
- throws ConstantPoolException {
- this(constant_pool.getUTF8Index(Attribute.AnnotationDefault), default_value);
- }
-
- public AnnotationDefault_attribute(int name_index, Annotation.element_value default_value) {
- super(name_index, default_value.length());
- this.default_value = default_value;
- }
-
- public R accept(Visitor visitor, D data) {
- return visitor.visitAnnotationDefault(this, data);
- }
-
- public final Annotation.element_value default_value;
-}
-
--- /dev/null 2015-04-26 22:05:36.465433038 -0700
+++ new/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/AnnotationDefault_attribute.java 2015-05-26 21:42:15.587832766 -0700
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.classfile;
+
+import java.io.IOException;
+
+/**
+ * See JVMS, section 4.8.15.
+ *
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ */
+public class AnnotationDefault_attribute extends Attribute {
+ AnnotationDefault_attribute(ClassReader cr, int name_index, int length)
+ throws IOException, Annotation.InvalidAnnotation {
+ super(name_index, length);
+ default_value = Annotation.element_value.read(cr);
+ }
+
+ public AnnotationDefault_attribute(ConstantPool constant_pool, Annotation.element_value default_value)
+ throws ConstantPoolException {
+ this(constant_pool.getUTF8Index(Attribute.AnnotationDefault), default_value);
+ }
+
+ public AnnotationDefault_attribute(int name_index, Annotation.element_value default_value) {
+ super(name_index, default_value.length());
+ this.default_value = default_value;
+ }
+
+ public R accept(Visitor visitor, D data) {
+ return visitor.visitAnnotationDefault(this, data);
+ }
+
+ public final Annotation.element_value default_value;
+}
+
--- old/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Attribute.java 2015-05-26 21:42:16.079832773 -0700
+++ /dev/null 2015-04-26 22:05:36.465433038 -0700
@@ -1,192 +0,0 @@
-/*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.classfile;
-
-import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own risk.
- * This code and its internal interfaces are subject to change or
- * deletion without notice.
- */
-
-public abstract class Attribute {
- public static final String AnnotationDefault = "AnnotationDefault";
- public static final String BootstrapMethods = "BootstrapMethods";
- public static final String CharacterRangeTable = "CharacterRangeTable";
- public static final String Code = "Code";
- public static final String ConstantValue = "ConstantValue";
- public static final String CompilationID = "CompilationID";
- public static final String Deprecated = "Deprecated";
- public static final String EnclosingMethod = "EnclosingMethod";
- public static final String Exceptions = "Exceptions";
- public static final String InnerClasses = "InnerClasses";
- public static final String LineNumberTable = "LineNumberTable";
- public static final String LocalVariableTable = "LocalVariableTable";
- public static final String LocalVariableTypeTable = "LocalVariableTypeTable";
- public static final String MethodParameters = "MethodParameters";
- public static final String RuntimeVisibleAnnotations = "RuntimeVisibleAnnotations";
- public static final String RuntimeInvisibleAnnotations = "RuntimeInvisibleAnnotations";
- public static final String RuntimeVisibleParameterAnnotations = "RuntimeVisibleParameterAnnotations";
- public static final String RuntimeInvisibleParameterAnnotations = "RuntimeInvisibleParameterAnnotations";
- public static final String RuntimeVisibleTypeAnnotations = "RuntimeVisibleTypeAnnotations";
- public static final String RuntimeInvisibleTypeAnnotations = "RuntimeInvisibleTypeAnnotations";
- public static final String Signature = "Signature";
- public static final String SourceDebugExtension = "SourceDebugExtension";
- public static final String SourceFile = "SourceFile";
- public static final String SourceID = "SourceID";
- public static final String StackMap = "StackMap";
- public static final String StackMapTable = "StackMapTable";
- public static final String Synthetic = "Synthetic";
-
- public static class Factory {
- public Factory() {
- // defer init of standardAttributeClasses until after options set up
- }
-
- public Attribute createAttribute(ClassReader cr, int name_index, byte[] data)
- throws IOException {
- if (standardAttributes == null) {
- init();
- }
-
- ConstantPool cp = cr.getConstantPool();
- String reasonForDefaultAttr;
- try {
- String name = cp.getUTF8Value(name_index);
- Class attrClass = standardAttributes.get(name);
- if (attrClass != null) {
- try {
- Class[] constrArgTypes = {ClassReader.class, int.class, int.class};
- Constructor constr = attrClass.getDeclaredConstructor(constrArgTypes);
- return constr.newInstance(cr, name_index, data.length);
- } catch (Throwable t) {
- reasonForDefaultAttr = t.toString();
- // fall through and use DefaultAttribute
- // t.printStackTrace();
- }
- } else {
- reasonForDefaultAttr = "unknown attribute";
- }
- } catch (ConstantPoolException e) {
- reasonForDefaultAttr = e.toString();
- // fall through and use DefaultAttribute
- }
- return new DefaultAttribute(cr, name_index, data, reasonForDefaultAttr);
- }
-
- protected void init() {
- standardAttributes = new HashMap<>();
- standardAttributes.put(AnnotationDefault, AnnotationDefault_attribute.class);
- standardAttributes.put(BootstrapMethods, BootstrapMethods_attribute.class);
- standardAttributes.put(CharacterRangeTable, CharacterRangeTable_attribute.class);
- standardAttributes.put(Code, Code_attribute.class);
- standardAttributes.put(CompilationID, CompilationID_attribute.class);
- standardAttributes.put(ConstantValue, ConstantValue_attribute.class);
- standardAttributes.put(Deprecated, Deprecated_attribute.class);
- standardAttributes.put(EnclosingMethod, EnclosingMethod_attribute.class);
- standardAttributes.put(Exceptions, Exceptions_attribute.class);
- standardAttributes.put(InnerClasses, InnerClasses_attribute.class);
- standardAttributes.put(LineNumberTable, LineNumberTable_attribute.class);
- standardAttributes.put(LocalVariableTable, LocalVariableTable_attribute.class);
- standardAttributes.put(LocalVariableTypeTable, LocalVariableTypeTable_attribute.class);
- standardAttributes.put(MethodParameters, MethodParameters_attribute.class);
- standardAttributes.put(RuntimeInvisibleAnnotations, RuntimeInvisibleAnnotations_attribute.class);
- standardAttributes.put(RuntimeInvisibleParameterAnnotations, RuntimeInvisibleParameterAnnotations_attribute.class);
- standardAttributes.put(RuntimeVisibleAnnotations, RuntimeVisibleAnnotations_attribute.class);
- standardAttributes.put(RuntimeVisibleParameterAnnotations, RuntimeVisibleParameterAnnotations_attribute.class);
- standardAttributes.put(RuntimeVisibleTypeAnnotations, RuntimeVisibleTypeAnnotations_attribute.class);
- standardAttributes.put(RuntimeInvisibleTypeAnnotations, RuntimeInvisibleTypeAnnotations_attribute.class);
- standardAttributes.put(Signature, Signature_attribute.class);
- standardAttributes.put(SourceDebugExtension, SourceDebugExtension_attribute.class);
- standardAttributes.put(SourceFile, SourceFile_attribute.class);
- standardAttributes.put(SourceID, SourceID_attribute.class);
- standardAttributes.put(StackMap, StackMap_attribute.class);
- standardAttributes.put(StackMapTable, StackMapTable_attribute.class);
- standardAttributes.put(Synthetic, Synthetic_attribute.class);
- }
-
- private Map> standardAttributes;
- }
-
- public static Attribute read(ClassReader cr) throws IOException {
- return cr.readAttribute();
- }
-
- protected Attribute(int name_index, int length) {
- attribute_name_index = name_index;
- attribute_length = length;
- }
-
- public String getName(ConstantPool constant_pool) throws ConstantPoolException {
- return constant_pool.getUTF8Value(attribute_name_index);
- }
-
- public abstract R accept(Attribute.Visitor visitor, D data);
-
- public int byteLength() {
- return 6 + attribute_length;
- }
-
- public final int attribute_name_index;
- public final int attribute_length;
-
-
- public interface Visitor {
- R visitBootstrapMethods(BootstrapMethods_attribute attr, P p);
- R visitDefault(DefaultAttribute attr, P p);
- R visitAnnotationDefault(AnnotationDefault_attribute attr, P p);
- R visitCharacterRangeTable(CharacterRangeTable_attribute attr, P p);
- R visitCode(Code_attribute attr, P p);
- R visitCompilationID(CompilationID_attribute attr, P p);
- R visitConstantValue(ConstantValue_attribute attr, P p);
- R visitDeprecated(Deprecated_attribute attr, P p);
- R visitEnclosingMethod(EnclosingMethod_attribute attr, P p);
- R visitExceptions(Exceptions_attribute attr, P p);
- R visitInnerClasses(InnerClasses_attribute attr, P p);
- R visitLineNumberTable(LineNumberTable_attribute attr, P p);
- R visitLocalVariableTable(LocalVariableTable_attribute attr, P p);
- R visitLocalVariableTypeTable(LocalVariableTypeTable_attribute attr, P p);
- R visitMethodParameters(MethodParameters_attribute attr, P p);
- R visitRuntimeVisibleAnnotations(RuntimeVisibleAnnotations_attribute attr, P p);
- R visitRuntimeInvisibleAnnotations(RuntimeInvisibleAnnotations_attribute attr, P p);
- R visitRuntimeVisibleParameterAnnotations(RuntimeVisibleParameterAnnotations_attribute attr, P p);
- R visitRuntimeInvisibleParameterAnnotations(RuntimeInvisibleParameterAnnotations_attribute attr, P p);
- R visitRuntimeVisibleTypeAnnotations(RuntimeVisibleTypeAnnotations_attribute attr, P p);
- R visitRuntimeInvisibleTypeAnnotations(RuntimeInvisibleTypeAnnotations_attribute attr, P p);
- R visitSignature(Signature_attribute attr, P p);
- R visitSourceDebugExtension(SourceDebugExtension_attribute attr, P p);
- R visitSourceFile(SourceFile_attribute attr, P p);
- R visitSourceID(SourceID_attribute attr, P p);
- R visitStackMap(StackMap_attribute attr, P p);
- R visitStackMapTable(StackMapTable_attribute attr, P p);
- R visitSynthetic(Synthetic_attribute attr, P p);
- }
-}
--- /dev/null 2015-04-26 22:05:36.465433038 -0700
+++ new/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Attribute.java 2015-05-26 21:42:15.903832771 -0700
@@ -0,0 +1,192 @@
+/*
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.classfile;
+
+import java.io.IOException;
+import java.lang.reflect.Constructor;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ */
+
+public abstract class Attribute {
+ public static final String AnnotationDefault = "AnnotationDefault";
+ public static final String BootstrapMethods = "BootstrapMethods";
+ public static final String CharacterRangeTable = "CharacterRangeTable";
+ public static final String Code = "Code";
+ public static final String ConstantValue = "ConstantValue";
+ public static final String CompilationID = "CompilationID";
+ public static final String Deprecated = "Deprecated";
+ public static final String EnclosingMethod = "EnclosingMethod";
+ public static final String Exceptions = "Exceptions";
+ public static final String InnerClasses = "InnerClasses";
+ public static final String LineNumberTable = "LineNumberTable";
+ public static final String LocalVariableTable = "LocalVariableTable";
+ public static final String LocalVariableTypeTable = "LocalVariableTypeTable";
+ public static final String MethodParameters = "MethodParameters";
+ public static final String RuntimeVisibleAnnotations = "RuntimeVisibleAnnotations";
+ public static final String RuntimeInvisibleAnnotations = "RuntimeInvisibleAnnotations";
+ public static final String RuntimeVisibleParameterAnnotations = "RuntimeVisibleParameterAnnotations";
+ public static final String RuntimeInvisibleParameterAnnotations = "RuntimeInvisibleParameterAnnotations";
+ public static final String RuntimeVisibleTypeAnnotations = "RuntimeVisibleTypeAnnotations";
+ public static final String RuntimeInvisibleTypeAnnotations = "RuntimeInvisibleTypeAnnotations";
+ public static final String Signature = "Signature";
+ public static final String SourceDebugExtension = "SourceDebugExtension";
+ public static final String SourceFile = "SourceFile";
+ public static final String SourceID = "SourceID";
+ public static final String StackMap = "StackMap";
+ public static final String StackMapTable = "StackMapTable";
+ public static final String Synthetic = "Synthetic";
+
+ public static class Factory {
+ public Factory() {
+ // defer init of standardAttributeClasses until after options set up
+ }
+
+ public Attribute createAttribute(ClassReader cr, int name_index, byte[] data)
+ throws IOException {
+ if (standardAttributes == null) {
+ init();
+ }
+
+ ConstantPool cp = cr.getConstantPool();
+ String reasonForDefaultAttr;
+ try {
+ String name = cp.getUTF8Value(name_index);
+ Class attrClass = standardAttributes.get(name);
+ if (attrClass != null) {
+ try {
+ Class[] constrArgTypes = {ClassReader.class, int.class, int.class};
+ Constructor constr = attrClass.getDeclaredConstructor(constrArgTypes);
+ return constr.newInstance(cr, name_index, data.length);
+ } catch (Throwable t) {
+ reasonForDefaultAttr = t.toString();
+ // fall through and use DefaultAttribute
+ // t.printStackTrace();
+ }
+ } else {
+ reasonForDefaultAttr = "unknown attribute";
+ }
+ } catch (ConstantPoolException e) {
+ reasonForDefaultAttr = e.toString();
+ // fall through and use DefaultAttribute
+ }
+ return new DefaultAttribute(cr, name_index, data, reasonForDefaultAttr);
+ }
+
+ protected void init() {
+ standardAttributes = new HashMap<>();
+ standardAttributes.put(AnnotationDefault, AnnotationDefault_attribute.class);
+ standardAttributes.put(BootstrapMethods, BootstrapMethods_attribute.class);
+ standardAttributes.put(CharacterRangeTable, CharacterRangeTable_attribute.class);
+ standardAttributes.put(Code, Code_attribute.class);
+ standardAttributes.put(CompilationID, CompilationID_attribute.class);
+ standardAttributes.put(ConstantValue, ConstantValue_attribute.class);
+ standardAttributes.put(Deprecated, Deprecated_attribute.class);
+ standardAttributes.put(EnclosingMethod, EnclosingMethod_attribute.class);
+ standardAttributes.put(Exceptions, Exceptions_attribute.class);
+ standardAttributes.put(InnerClasses, InnerClasses_attribute.class);
+ standardAttributes.put(LineNumberTable, LineNumberTable_attribute.class);
+ standardAttributes.put(LocalVariableTable, LocalVariableTable_attribute.class);
+ standardAttributes.put(LocalVariableTypeTable, LocalVariableTypeTable_attribute.class);
+ standardAttributes.put(MethodParameters, MethodParameters_attribute.class);
+ standardAttributes.put(RuntimeInvisibleAnnotations, RuntimeInvisibleAnnotations_attribute.class);
+ standardAttributes.put(RuntimeInvisibleParameterAnnotations, RuntimeInvisibleParameterAnnotations_attribute.class);
+ standardAttributes.put(RuntimeVisibleAnnotations, RuntimeVisibleAnnotations_attribute.class);
+ standardAttributes.put(RuntimeVisibleParameterAnnotations, RuntimeVisibleParameterAnnotations_attribute.class);
+ standardAttributes.put(RuntimeVisibleTypeAnnotations, RuntimeVisibleTypeAnnotations_attribute.class);
+ standardAttributes.put(RuntimeInvisibleTypeAnnotations, RuntimeInvisibleTypeAnnotations_attribute.class);
+ standardAttributes.put(Signature, Signature_attribute.class);
+ standardAttributes.put(SourceDebugExtension, SourceDebugExtension_attribute.class);
+ standardAttributes.put(SourceFile, SourceFile_attribute.class);
+ standardAttributes.put(SourceID, SourceID_attribute.class);
+ standardAttributes.put(StackMap, StackMap_attribute.class);
+ standardAttributes.put(StackMapTable, StackMapTable_attribute.class);
+ standardAttributes.put(Synthetic, Synthetic_attribute.class);
+ }
+
+ private Map> standardAttributes;
+ }
+
+ public static Attribute read(ClassReader cr) throws IOException {
+ return cr.readAttribute();
+ }
+
+ protected Attribute(int name_index, int length) {
+ attribute_name_index = name_index;
+ attribute_length = length;
+ }
+
+ public String getName(ConstantPool constant_pool) throws ConstantPoolException {
+ return constant_pool.getUTF8Value(attribute_name_index);
+ }
+
+ public abstract R accept(Attribute.Visitor visitor, D data);
+
+ public int byteLength() {
+ return 6 + attribute_length;
+ }
+
+ public final int attribute_name_index;
+ public final int attribute_length;
+
+
+ public interface Visitor {
+ R visitBootstrapMethods(BootstrapMethods_attribute attr, P p);
+ R visitDefault(DefaultAttribute attr, P p);
+ R visitAnnotationDefault(AnnotationDefault_attribute attr, P p);
+ R visitCharacterRangeTable(CharacterRangeTable_attribute attr, P p);
+ R visitCode(Code_attribute attr, P p);
+ R visitCompilationID(CompilationID_attribute attr, P p);
+ R visitConstantValue(ConstantValue_attribute attr, P p);
+ R visitDeprecated(Deprecated_attribute attr, P p);
+ R visitEnclosingMethod(EnclosingMethod_attribute attr, P p);
+ R visitExceptions(Exceptions_attribute attr, P p);
+ R visitInnerClasses(InnerClasses_attribute attr, P p);
+ R visitLineNumberTable(LineNumberTable_attribute attr, P p);
+ R visitLocalVariableTable(LocalVariableTable_attribute attr, P p);
+ R visitLocalVariableTypeTable(LocalVariableTypeTable_attribute attr, P p);
+ R visitMethodParameters(MethodParameters_attribute attr, P p);
+ R visitRuntimeVisibleAnnotations(RuntimeVisibleAnnotations_attribute attr, P p);
+ R visitRuntimeInvisibleAnnotations(RuntimeInvisibleAnnotations_attribute attr, P p);
+ R visitRuntimeVisibleParameterAnnotations(RuntimeVisibleParameterAnnotations_attribute attr, P p);
+ R visitRuntimeInvisibleParameterAnnotations(RuntimeInvisibleParameterAnnotations_attribute attr, P p);
+ R visitRuntimeVisibleTypeAnnotations(RuntimeVisibleTypeAnnotations_attribute attr, P p);
+ R visitRuntimeInvisibleTypeAnnotations(RuntimeInvisibleTypeAnnotations_attribute attr, P p);
+ R visitSignature(Signature_attribute attr, P p);
+ R visitSourceDebugExtension(SourceDebugExtension_attribute attr, P p);
+ R visitSourceFile(SourceFile_attribute attr, P p);
+ R visitSourceID(SourceID_attribute attr, P p);
+ R visitStackMap(StackMap_attribute attr, P p);
+ R visitStackMapTable(StackMapTable_attribute attr, P p);
+ R visitSynthetic(Synthetic_attribute attr, P p);
+ }
+}
--- old/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/AttributeException.java 2015-05-26 21:42:16.387832778 -0700
+++ /dev/null 2015-04-26 22:05:36.465433038 -0700
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.classfile;
-
-/*
- * This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own risk.
- * This code and its internal interfaces are subject to change or
- * deletion without notice.
- */
-public class AttributeException extends Exception {
- private static final long serialVersionUID = -4231486387714867770L;
- AttributeException() { }
-
- AttributeException(String msg) {
- super(msg);
- }
-}
--- /dev/null 2015-04-26 22:05:36.465433038 -0700
+++ new/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/AttributeException.java 2015-05-26 21:42:16.215832776 -0700
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.classfile;
+
+/*
+ *
This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ */
+public class AttributeException extends Exception {
+ private static final long serialVersionUID = -4231486387714867770L;
+ AttributeException() { }
+
+ AttributeException(String msg) {
+ super(msg);
+ }
+}
--- old/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Attributes.java 2015-05-26 21:42:16.703832783 -0700
+++ /dev/null 2015-04-26 22:05:36.465433038 -0700
@@ -1,107 +0,0 @@
-/*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.classfile;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-/*
- *
This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own risk.
- * This code and its internal interfaces are subject to change or
- * deletion without notice.
- */
-public class Attributes implements Iterable {
-
- public final Attribute[] attrs;
- public final Map map;
-
- Attributes(ClassReader cr) throws IOException {
- map = new HashMap<>();
- int attrs_count = cr.readUnsignedShort();
- attrs = new Attribute[attrs_count];
- for (int i = 0; i < attrs_count; i++) {
- Attribute attr = Attribute.read(cr);
- attrs[i] = attr;
- try {
- map.put(attr.getName(cr.getConstantPool()), attr);
- } catch (ConstantPoolException e) {
- // don't enter invalid names in map
- }
- }
- }
-
- public Attributes(ConstantPool constant_pool, Attribute[] attrs) {
- this.attrs = attrs;
- map = new HashMap<>();
- for (Attribute attr : attrs) {
- try {
- map.put(attr.getName(constant_pool), attr);
- } catch (ConstantPoolException e) {
- // don't enter invalid names in map
- }
- }
- }
-
- public Iterator iterator() {
- return Arrays.asList(attrs).iterator();
- }
-
- public Attribute get(int index) {
- return attrs[index];
- }
-
- public Attribute get(String name) {
- return map.get(name);
- }
-
- public int getIndex(ConstantPool constant_pool, String name) {
- for (int i = 0; i < attrs.length; i++) {
- Attribute attr = attrs[i];
- try {
- if (attr != null && attr.getName(constant_pool).equals(name))
- return i;
- } catch (ConstantPoolException e) {
- // ignore invalid entries
- }
- }
- return -1;
- }
-
- public int size() {
- return attrs.length;
- }
-
- public int byteLength() {
- int length = 2;
- for (Attribute a: attrs)
- length += a.byteLength();
- return length;
- }
-}
--- /dev/null 2015-04-26 22:05:36.465433038 -0700
+++ new/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Attributes.java 2015-05-26 21:42:16.523832780 -0700
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.classfile;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+/*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ */
+public class Attributes implements Iterable {
+
+ public final Attribute[] attrs;
+ public final Map map;
+
+ Attributes(ClassReader cr) throws IOException {
+ map = new HashMap<>();
+ int attrs_count = cr.readUnsignedShort();
+ attrs = new Attribute[attrs_count];
+ for (int i = 0; i < attrs_count; i++) {
+ Attribute attr = Attribute.read(cr);
+ attrs[i] = attr;
+ try {
+ map.put(attr.getName(cr.getConstantPool()), attr);
+ } catch (ConstantPoolException e) {
+ // don't enter invalid names in map
+ }
+ }
+ }
+
+ public Attributes(ConstantPool constant_pool, Attribute[] attrs) {
+ this.attrs = attrs;
+ map = new HashMap<>();
+ for (Attribute attr : attrs) {
+ try {
+ map.put(attr.getName(constant_pool), attr);
+ } catch (ConstantPoolException e) {
+ // don't enter invalid names in map
+ }
+ }
+ }
+
+ public Iterator iterator() {
+ return Arrays.asList(attrs).iterator();
+ }
+
+ public Attribute get(int index) {
+ return attrs[index];
+ }
+
+ public Attribute get(String name) {
+ return map.get(name);
+ }
+
+ public int getIndex(ConstantPool constant_pool, String name) {
+ for (int i = 0; i < attrs.length; i++) {
+ Attribute attr = attrs[i];
+ try {
+ if (attr != null && attr.getName(constant_pool).equals(name))
+ return i;
+ } catch (ConstantPoolException e) {
+ // ignore invalid entries
+ }
+ }
+ return -1;
+ }
+
+ public int size() {
+ return attrs.length;
+ }
+
+ public int byteLength() {
+ int length = 2;
+ for (Attribute a: attrs)
+ length += a.byteLength();
+ return length;
+ }
+}
--- old/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java 2015-05-26 21:42:17.011832787 -0700
+++ /dev/null 2015-04-26 22:05:36.465433038 -0700
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.classfile;
-
-import java.io.IOException;
-
-/**
- * See JVMS 4.7.21
- * http://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.7.21
- *
- * This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own risk.
- * This code and its internal interfaces are subject to change or
- * deletion without notice.
- */
-public class BootstrapMethods_attribute extends Attribute {
- public final BootstrapMethodSpecifier[] bootstrap_method_specifiers;
-
- BootstrapMethods_attribute(ClassReader cr, int name_index, int length)
- throws IOException, AttributeException {
- super(name_index, length);
- int bootstrap_method_count = cr.readUnsignedShort();
- bootstrap_method_specifiers = new BootstrapMethodSpecifier[bootstrap_method_count];
- for (int i = 0; i < bootstrap_method_specifiers.length; i++)
- bootstrap_method_specifiers[i] = new BootstrapMethodSpecifier(cr);
- }
-
- public BootstrapMethods_attribute(int name_index, BootstrapMethodSpecifier[] bootstrap_method_specifiers) {
- super(name_index, length(bootstrap_method_specifiers));
- this.bootstrap_method_specifiers = bootstrap_method_specifiers;
- }
-
- public static int length(BootstrapMethodSpecifier[] bootstrap_method_specifiers) {
- int n = 2;
- for (BootstrapMethodSpecifier b : bootstrap_method_specifiers)
- n += b.length();
- return n;
- }
-
- @Override
- public R accept(Visitor visitor, P p) {
- return visitor.visitBootstrapMethods(this, p);
- }
-
- public static class BootstrapMethodSpecifier {
- public int bootstrap_method_ref;
- public int[] bootstrap_arguments;
-
- public BootstrapMethodSpecifier(int bootstrap_method_ref, int[] bootstrap_arguments) {
- this.bootstrap_method_ref = bootstrap_method_ref;
- this.bootstrap_arguments = bootstrap_arguments;
- }
- BootstrapMethodSpecifier(ClassReader cr) throws IOException {
- bootstrap_method_ref = cr.readUnsignedShort();
- int method_count = cr.readUnsignedShort();
- bootstrap_arguments = new int[method_count];
- for (int i = 0; i < bootstrap_arguments.length; i++) {
- bootstrap_arguments[i] = cr.readUnsignedShort();
- }
- }
-
- int length() {
- // u2 (method_ref) + u2 (argc) + u2 * argc
- return 2 + 2 + (bootstrap_arguments.length * 2);
- }
- }
-}
--- /dev/null 2015-04-26 22:05:36.465433038 -0700
+++ new/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java 2015-05-26 21:42:16.839832785 -0700
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.classfile;
+
+import java.io.IOException;
+
+/**
+ * See JVMS 4.7.21
+ * http://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.7.21
+ *
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ */
+public class BootstrapMethods_attribute extends Attribute {
+ public final BootstrapMethodSpecifier[] bootstrap_method_specifiers;
+
+ BootstrapMethods_attribute(ClassReader cr, int name_index, int length)
+ throws IOException, AttributeException {
+ super(name_index, length);
+ int bootstrap_method_count = cr.readUnsignedShort();
+ bootstrap_method_specifiers = new BootstrapMethodSpecifier[bootstrap_method_count];
+ for (int i = 0; i < bootstrap_method_specifiers.length; i++)
+ bootstrap_method_specifiers[i] = new BootstrapMethodSpecifier(cr);
+ }
+
+ public BootstrapMethods_attribute(int name_index, BootstrapMethodSpecifier[] bootstrap_method_specifiers) {
+ super(name_index, length(bootstrap_method_specifiers));
+ this.bootstrap_method_specifiers = bootstrap_method_specifiers;
+ }
+
+ public static int length(BootstrapMethodSpecifier[] bootstrap_method_specifiers) {
+ int n = 2;
+ for (BootstrapMethodSpecifier b : bootstrap_method_specifiers)
+ n += b.length();
+ return n;
+ }
+
+ @Override
+ public R accept(Visitor visitor, P p) {
+ return visitor.visitBootstrapMethods(this, p);
+ }
+
+ public static class BootstrapMethodSpecifier {
+ public int bootstrap_method_ref;
+ public int[] bootstrap_arguments;
+
+ public BootstrapMethodSpecifier(int bootstrap_method_ref, int[] bootstrap_arguments) {
+ this.bootstrap_method_ref = bootstrap_method_ref;
+ this.bootstrap_arguments = bootstrap_arguments;
+ }
+ BootstrapMethodSpecifier(ClassReader cr) throws IOException {
+ bootstrap_method_ref = cr.readUnsignedShort();
+ int method_count = cr.readUnsignedShort();
+ bootstrap_arguments = new int[method_count];
+ for (int i = 0; i < bootstrap_arguments.length; i++) {
+ bootstrap_arguments[i] = cr.readUnsignedShort();
+ }
+ }
+
+ int length() {
+ // u2 (method_ref) + u2 (argc) + u2 * argc
+ return 2 + 2 + (bootstrap_arguments.length * 2);
+ }
+ }
+}
--- old/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/CharacterRangeTable_attribute.java 2015-05-26 21:42:17.323832792 -0700
+++ /dev/null 2015-04-26 22:05:36.465433038 -0700
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.classfile;
-
-import java.io.IOException;
-
-/**
- * This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own risk.
- * This code and its internal interfaces are subject to change or
- * deletion without notice.
- */
-public class CharacterRangeTable_attribute extends Attribute {
- public static final int CRT_STATEMENT = 0x0001;
- public static final int CRT_BLOCK = 0x0002;
- public static final int CRT_ASSIGNMENT = 0x0004;
- public static final int CRT_FLOW_CONTROLLER = 0x0008;
- public static final int CRT_FLOW_TARGET = 0x0010;
- public static final int CRT_INVOKE = 0x0020;
- public static final int CRT_CREATE = 0x0040;
- public static final int CRT_BRANCH_TRUE = 0x0080;
- public static final int CRT_BRANCH_FALSE = 0x0100;
-
- CharacterRangeTable_attribute(ClassReader cr, int name_index, int length) throws IOException {
- super(name_index, length);
- int character_range_table_length = cr.readUnsignedShort();
- character_range_table = new Entry[character_range_table_length];
- for (int i = 0; i < character_range_table_length; i++)
- character_range_table[i] = new Entry(cr);
- }
-
- public CharacterRangeTable_attribute(ConstantPool constant_pool, Entry[] character_range_table)
- throws ConstantPoolException {
- this(constant_pool.getUTF8Index(Attribute.CharacterRangeTable), character_range_table);
- }
-
- public CharacterRangeTable_attribute(int name_index, Entry[] character_range_table) {
- super(name_index, 2 + character_range_table.length * Entry.length());
- this.character_range_table = character_range_table;
- }
-
- public R accept(Visitor visitor, D data) {
- return visitor.visitCharacterRangeTable(this, data);
- }
-
- public final Entry[] character_range_table;
-
- public static class Entry {
- Entry(ClassReader cr) throws IOException {
- start_pc = cr.readUnsignedShort();
- end_pc = cr.readUnsignedShort();
- character_range_start = cr.readInt();
- character_range_end = cr.readInt();
- flags = cr.readUnsignedShort();
- }
-
- public static int length() {
- return 14;
- }
-
- public final int start_pc;
- public final int end_pc;
- public final int character_range_start;
- public final int character_range_end;
- public final int flags;
- }
-}
--- /dev/null 2015-04-26 22:05:36.465433038 -0700
+++ new/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/CharacterRangeTable_attribute.java 2015-05-26 21:42:17.143832789 -0700
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.classfile;
+
+import java.io.IOException;
+
+/**
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ */
+public class CharacterRangeTable_attribute extends Attribute {
+ public static final int CRT_STATEMENT = 0x0001;
+ public static final int CRT_BLOCK = 0x0002;
+ public static final int CRT_ASSIGNMENT = 0x0004;
+ public static final int CRT_FLOW_CONTROLLER = 0x0008;
+ public static final int CRT_FLOW_TARGET = 0x0010;
+ public static final int CRT_INVOKE = 0x0020;
+ public static final int CRT_CREATE = 0x0040;
+ public static final int CRT_BRANCH_TRUE = 0x0080;
+ public static final int CRT_BRANCH_FALSE = 0x0100;
+
+ CharacterRangeTable_attribute(ClassReader cr, int name_index, int length) throws IOException {
+ super(name_index, length);
+ int character_range_table_length = cr.readUnsignedShort();
+ character_range_table = new Entry[character_range_table_length];
+ for (int i = 0; i < character_range_table_length; i++)
+ character_range_table[i] = new Entry(cr);
+ }
+
+ public CharacterRangeTable_attribute(ConstantPool constant_pool, Entry[] character_range_table)
+ throws ConstantPoolException {
+ this(constant_pool.getUTF8Index(Attribute.CharacterRangeTable), character_range_table);
+ }
+
+ public CharacterRangeTable_attribute(int name_index, Entry[] character_range_table) {
+ super(name_index, 2 + character_range_table.length * Entry.length());
+ this.character_range_table = character_range_table;
+ }
+
+ public R accept(Visitor visitor, D data) {
+ return visitor.visitCharacterRangeTable(this, data);
+ }
+
+ public final Entry[] character_range_table;
+
+ public static class Entry {
+ Entry(ClassReader cr) throws IOException {
+ start_pc = cr.readUnsignedShort();
+ end_pc = cr.readUnsignedShort();
+ character_range_start = cr.readInt();
+ character_range_end = cr.readInt();
+ flags = cr.readUnsignedShort();
+ }
+
+ public static int length() {
+ return 14;
+ }
+
+ public final int start_pc;
+ public final int end_pc;
+ public final int character_range_start;
+ public final int character_range_end;
+ public final int flags;
+ }
+}
--- old/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/ClassFile.java 2015-05-26 21:42:17.631832796 -0700
+++ /dev/null 2015-04-26 22:05:36.465433038 -0700
@@ -1,189 +0,0 @@
-/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.classfile;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-import static com.sun.tools.classfile.AccessFlags.*;
-
-/**
- * See JVMS, section 4.2.
- *
- * This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own risk.
- * This code and its internal interfaces are subject to change or
- * deletion without notice.
- */
-public class ClassFile {
- public static ClassFile read(File file)
- throws IOException, ConstantPoolException {
- return read(file.toPath(), new Attribute.Factory());
- }
-
- public static ClassFile read(Path input)
- throws IOException, ConstantPoolException {
- return read(input, new Attribute.Factory());
- }
-
- public static ClassFile read(Path input, Attribute.Factory attributeFactory)
- throws IOException, ConstantPoolException {
- try (InputStream in = Files.newInputStream(input)) {
- return new ClassFile(in, attributeFactory);
- }
- }
-
- public static ClassFile read(File file, Attribute.Factory attributeFactory)
- throws IOException, ConstantPoolException {
- return read(file.toPath(), attributeFactory);
- }
-
- public static ClassFile read(InputStream in)
- throws IOException, ConstantPoolException {
- return new ClassFile(in, new Attribute.Factory());
- }
-
- public static ClassFile read(InputStream in, Attribute.Factory attributeFactory)
- throws IOException, ConstantPoolException {
- return new ClassFile(in, attributeFactory);
- }
-
- ClassFile(InputStream in, Attribute.Factory attributeFactory) throws IOException, ConstantPoolException {
- ClassReader cr = new ClassReader(this, in, attributeFactory);
- magic = cr.readInt();
- minor_version = cr.readUnsignedShort();
- major_version = cr.readUnsignedShort();
- constant_pool = new ConstantPool(cr);
- access_flags = new AccessFlags(cr);
- this_class = cr.readUnsignedShort();
- super_class = cr.readUnsignedShort();
-
- int interfaces_count = cr.readUnsignedShort();
- interfaces = new int[interfaces_count];
- for (int i = 0; i < interfaces_count; i++)
- interfaces[i] = cr.readUnsignedShort();
-
- int fields_count = cr.readUnsignedShort();
- fields = new Field[fields_count];
- for (int i = 0; i < fields_count; i++)
- fields[i] = new Field(cr);
-
- int methods_count = cr.readUnsignedShort();
- methods = new Method[methods_count];
- for (int i = 0; i < methods_count; i++)
- methods[i] = new Method(cr);
-
- attributes = new Attributes(cr);
- }
-
- public ClassFile(int magic, int minor_version, int major_version,
- ConstantPool constant_pool, AccessFlags access_flags,
- int this_class, int super_class, int[] interfaces,
- Field[] fields, Method[] methods, Attributes attributes) {
- this.magic = magic;
- this.minor_version = minor_version;
- this.major_version = major_version;
- this.constant_pool = constant_pool;
- this.access_flags = access_flags;
- this.this_class = this_class;
- this.super_class = super_class;
- this.interfaces = interfaces;
- this.fields = fields;
- this.methods = methods;
- this.attributes = attributes;
- }
-
- public String getName() throws ConstantPoolException {
- return constant_pool.getClassInfo(this_class).getName();
- }
-
- public String getSuperclassName() throws ConstantPoolException {
- return constant_pool.getClassInfo(super_class).getName();
- }
-
- public String getInterfaceName(int i) throws ConstantPoolException {
- return constant_pool.getClassInfo(interfaces[i]).getName();
- }
-
- public Attribute getAttribute(String name) {
- return attributes.get(name);
- }
-
- public boolean isClass() {
- return !isInterface();
- }
-
- public boolean isInterface() {
- return access_flags.is(ACC_INTERFACE);
- }
-
- public int byteLength() {
- return 4 + // magic
- 2 + // minor
- 2 + // major
- constant_pool.byteLength() +
- 2 + // access flags
- 2 + // this_class
- 2 + // super_class
- byteLength(interfaces) +
- byteLength(fields) +
- byteLength(methods) +
- attributes.byteLength();
- }
-
- private int byteLength(int[] indices) {
- return 2 + 2 * indices.length;
- }
-
- private int byteLength(Field[] fields) {
- int length = 2;
- for (Field f: fields)
- length += f.byteLength();
- return length;
- }
-
- private int byteLength(Method[] methods) {
- int length = 2;
- for (Method m: methods)
- length += m.byteLength();
- return length;
- }
-
- public final int magic;
- public final int minor_version;
- public final int major_version;
- public final ConstantPool constant_pool;
- public final AccessFlags access_flags;
- public final int this_class;
- public final int super_class;
- public final int[] interfaces;
- public final Field[] fields;
- public final Method[] methods;
- public final Attributes attributes;
-}
--- /dev/null 2015-04-26 22:05:36.465433038 -0700
+++ new/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassFile.java 2015-05-26 21:42:17.455832794 -0700
@@ -0,0 +1,189 @@
+/*
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.classfile;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import static com.sun.tools.classfile.AccessFlags.*;
+
+/**
+ * See JVMS, section 4.2.
+ *
+ *
This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ */
+public class ClassFile {
+ public static ClassFile read(File file)
+ throws IOException, ConstantPoolException {
+ return read(file.toPath(), new Attribute.Factory());
+ }
+
+ public static ClassFile read(Path input)
+ throws IOException, ConstantPoolException {
+ return read(input, new Attribute.Factory());
+ }
+
+ public static ClassFile read(Path input, Attribute.Factory attributeFactory)
+ throws IOException, ConstantPoolException {
+ try (InputStream in = Files.newInputStream(input)) {
+ return new ClassFile(in, attributeFactory);
+ }
+ }
+
+ public static ClassFile read(File file, Attribute.Factory attributeFactory)
+ throws IOException, ConstantPoolException {
+ return read(file.toPath(), attributeFactory);
+ }
+
+ public static ClassFile read(InputStream in)
+ throws IOException, ConstantPoolException {
+ return new ClassFile(in, new Attribute.Factory());
+ }
+
+ public static ClassFile read(InputStream in, Attribute.Factory attributeFactory)
+ throws IOException, ConstantPoolException {
+ return new ClassFile(in, attributeFactory);
+ }
+
+ ClassFile(InputStream in, Attribute.Factory attributeFactory) throws IOException, ConstantPoolException {
+ ClassReader cr = new ClassReader(this, in, attributeFactory);
+ magic = cr.readInt();
+ minor_version = cr.readUnsignedShort();
+ major_version = cr.readUnsignedShort();
+ constant_pool = new ConstantPool(cr);
+ access_flags = new AccessFlags(cr);
+ this_class = cr.readUnsignedShort();
+ super_class = cr.readUnsignedShort();
+
+ int interfaces_count = cr.readUnsignedShort();
+ interfaces = new int[interfaces_count];
+ for (int i = 0; i < interfaces_count; i++)
+ interfaces[i] = cr.readUnsignedShort();
+
+ int fields_count = cr.readUnsignedShort();
+ fields = new Field[fields_count];
+ for (int i = 0; i < fields_count; i++)
+ fields[i] = new Field(cr);
+
+ int methods_count = cr.readUnsignedShort();
+ methods = new Method[methods_count];
+ for (int i = 0; i < methods_count; i++)
+ methods[i] = new Method(cr);
+
+ attributes = new Attributes(cr);
+ }
+
+ public ClassFile(int magic, int minor_version, int major_version,
+ ConstantPool constant_pool, AccessFlags access_flags,
+ int this_class, int super_class, int[] interfaces,
+ Field[] fields, Method[] methods, Attributes attributes) {
+ this.magic = magic;
+ this.minor_version = minor_version;
+ this.major_version = major_version;
+ this.constant_pool = constant_pool;
+ this.access_flags = access_flags;
+ this.this_class = this_class;
+ this.super_class = super_class;
+ this.interfaces = interfaces;
+ this.fields = fields;
+ this.methods = methods;
+ this.attributes = attributes;
+ }
+
+ public String getName() throws ConstantPoolException {
+ return constant_pool.getClassInfo(this_class).getName();
+ }
+
+ public String getSuperclassName() throws ConstantPoolException {
+ return constant_pool.getClassInfo(super_class).getName();
+ }
+
+ public String getInterfaceName(int i) throws ConstantPoolException {
+ return constant_pool.getClassInfo(interfaces[i]).getName();
+ }
+
+ public Attribute getAttribute(String name) {
+ return attributes.get(name);
+ }
+
+ public boolean isClass() {
+ return !isInterface();
+ }
+
+ public boolean isInterface() {
+ return access_flags.is(ACC_INTERFACE);
+ }
+
+ public int byteLength() {
+ return 4 + // magic
+ 2 + // minor
+ 2 + // major
+ constant_pool.byteLength() +
+ 2 + // access flags
+ 2 + // this_class
+ 2 + // super_class
+ byteLength(interfaces) +
+ byteLength(fields) +
+ byteLength(methods) +
+ attributes.byteLength();
+ }
+
+ private int byteLength(int[] indices) {
+ return 2 + 2 * indices.length;
+ }
+
+ private int byteLength(Field[] fields) {
+ int length = 2;
+ for (Field f: fields)
+ length += f.byteLength();
+ return length;
+ }
+
+ private int byteLength(Method[] methods) {
+ int length = 2;
+ for (Method m: methods)
+ length += m.byteLength();
+ return length;
+ }
+
+ public final int magic;
+ public final int minor_version;
+ public final int major_version;
+ public final ConstantPool constant_pool;
+ public final AccessFlags access_flags;
+ public final int this_class;
+ public final int super_class;
+ public final int[] interfaces;
+ public final Field[] fields;
+ public final Method[] methods;
+ public final Attributes attributes;
+}
--- old/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/ClassReader.java 2015-05-26 21:42:17.943832801 -0700
+++ /dev/null 2015-04-26 22:05:36.465433038 -0700
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.classfile;
-
-import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Objects;
-
-/**
- *
This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own risk.
- * This code and its internal interfaces are subject to change or
- * deletion without notice.
- */
-public class ClassReader {
- ClassReader(ClassFile classFile, InputStream in, Attribute.Factory attributeFactory) throws IOException {
- this.classFile = Objects.requireNonNull(classFile);
- this.attributeFactory = Objects.requireNonNull(attributeFactory);
- this.in = new DataInputStream(new BufferedInputStream(in));
- }
-
- ClassFile getClassFile() {
- return classFile;
- }
-
- ConstantPool getConstantPool() {
- return classFile.constant_pool;
- }
-
- public Attribute readAttribute() throws IOException {
- int name_index = readUnsignedShort();
- int length = readInt();
- byte[] data = new byte[length];
- readFully(data);
-
- DataInputStream prev = in;
- in = new DataInputStream(new ByteArrayInputStream(data));
- try {
- return attributeFactory.createAttribute(this, name_index, data);
- } finally {
- in = prev;
- }
- }
-
- public void readFully(byte[] b) throws IOException {
- in.readFully(b);
- }
-
- public int readUnsignedByte() throws IOException {
- return in.readUnsignedByte();
- }
-
- public int readUnsignedShort() throws IOException {
- return in.readUnsignedShort();
- }
-
- public int readInt() throws IOException {
- return in.readInt();
- }
-
- public long readLong() throws IOException {
- return in.readLong();
- }
-
- public float readFloat() throws IOException {
- return in.readFloat();
- }
-
- public double readDouble() throws IOException {
- return in.readDouble();
- }
-
- public String readUTF() throws IOException {
- return in.readUTF();
- }
-
- private DataInputStream in;
- private ClassFile classFile;
- private Attribute.Factory attributeFactory;
-}
--- /dev/null 2015-04-26 22:05:36.465433038 -0700
+++ new/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassReader.java 2015-05-26 21:42:17.767832799 -0700
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.classfile;
+
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Objects;
+
+/**
+ *
This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ */
+public class ClassReader {
+ ClassReader(ClassFile classFile, InputStream in, Attribute.Factory attributeFactory) throws IOException {
+ this.classFile = Objects.requireNonNull(classFile);
+ this.attributeFactory = Objects.requireNonNull(attributeFactory);
+ this.in = new DataInputStream(new BufferedInputStream(in));
+ }
+
+ ClassFile getClassFile() {
+ return classFile;
+ }
+
+ ConstantPool getConstantPool() {
+ return classFile.constant_pool;
+ }
+
+ public Attribute readAttribute() throws IOException {
+ int name_index = readUnsignedShort();
+ int length = readInt();
+ byte[] data = new byte[length];
+ readFully(data);
+
+ DataInputStream prev = in;
+ in = new DataInputStream(new ByteArrayInputStream(data));
+ try {
+ return attributeFactory.createAttribute(this, name_index, data);
+ } finally {
+ in = prev;
+ }
+ }
+
+ public void readFully(byte[] b) throws IOException {
+ in.readFully(b);
+ }
+
+ public int readUnsignedByte() throws IOException {
+ return in.readUnsignedByte();
+ }
+
+ public int readUnsignedShort() throws IOException {
+ return in.readUnsignedShort();
+ }
+
+ public int readInt() throws IOException {
+ return in.readInt();
+ }
+
+ public long readLong() throws IOException {
+ return in.readLong();
+ }
+
+ public float readFloat() throws IOException {
+ return in.readFloat();
+ }
+
+ public double readDouble() throws IOException {
+ return in.readDouble();
+ }
+
+ public String readUTF() throws IOException {
+ return in.readUTF();
+ }
+
+ private DataInputStream in;
+ private ClassFile classFile;
+ private Attribute.Factory attributeFactory;
+}
--- old/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/ClassTranslator.java 2015-05-26 21:42:18.259832806 -0700
+++ /dev/null 2015-04-26 22:05:36.465433038 -0700
@@ -1,410 +0,0 @@
-/*
- * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.classfile;
-
-import java.util.Map;
-
-import com.sun.tools.classfile.ConstantPool.CONSTANT_Class_info;
-import com.sun.tools.classfile.ConstantPool.CONSTANT_Double_info;
-import com.sun.tools.classfile.ConstantPool.CONSTANT_Fieldref_info;
-import com.sun.tools.classfile.ConstantPool.CONSTANT_Float_info;
-import com.sun.tools.classfile.ConstantPool.CONSTANT_Integer_info;
-import com.sun.tools.classfile.ConstantPool.CONSTANT_InterfaceMethodref_info;
-import com.sun.tools.classfile.ConstantPool.CONSTANT_InvokeDynamic_info;
-import com.sun.tools.classfile.ConstantPool.CONSTANT_Long_info;
-import com.sun.tools.classfile.ConstantPool.CONSTANT_MethodHandle_info;
-import com.sun.tools.classfile.ConstantPool.CONSTANT_MethodType_info;
-import com.sun.tools.classfile.ConstantPool.CONSTANT_Methodref_info;
-import com.sun.tools.classfile.ConstantPool.CONSTANT_NameAndType_info;
-import com.sun.tools.classfile.ConstantPool.CONSTANT_String_info;
-import com.sun.tools.classfile.ConstantPool.CONSTANT_Utf8_info;
-import com.sun.tools.classfile.ConstantPool.CPInfo;
-
-/**
- * Rewrites a class file using a map of translations.
- *
- *
This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own risk.
- * This code and its internal interfaces are subject to change or
- * deletion without notice.
- */
-public class ClassTranslator
- implements ConstantPool.Visitor> {
- /**
- * Create a new ClassFile from {@code cf}, such that for all entries
- * {@code k -\> v} in {@code translations},
- * each occurrence of {@code k} in {@code cf} will be replaced by {@code v}.
- * in
- * @param cf the class file to be processed
- * @param translations the set of translations to be applied
- * @return a copy of {@code} with the values in {@code translations} substituted
- */
- public ClassFile translate(ClassFile cf, Map translations) {
- ClassFile cf2 = (ClassFile) translations.get(cf);
- if (cf2 == null) {
- ConstantPool constant_pool2 = translate(cf.constant_pool, translations);
- Field[] fields2 = translate(cf.fields, cf.constant_pool, translations);
- Method[] methods2 = translateMethods(cf.methods, cf.constant_pool, translations);
- Attributes attributes2 = translateAttributes(cf.attributes, cf.constant_pool,
- translations);
-
- if (constant_pool2 == cf.constant_pool &&
- fields2 == cf.fields &&
- methods2 == cf.methods &&
- attributes2 == cf.attributes)
- cf2 = cf;
- else
- cf2 = new ClassFile(
- cf.magic,
- cf.minor_version,
- cf.major_version,
- constant_pool2,
- cf.access_flags,
- cf.this_class,
- cf.super_class,
- cf.interfaces,
- fields2,
- methods2,
- attributes2);
- translations.put(cf, cf2);
- }
- return cf2;
- }
-
- ConstantPool translate(ConstantPool cp, Map translations) {
- ConstantPool cp2 = (ConstantPool) translations.get(cp);
- if (cp2 == null) {
- ConstantPool.CPInfo[] pool2 = new ConstantPool.CPInfo[cp.size()];
- boolean eq = true;
- for (int i = 0; i < cp.size(); ) {
- ConstantPool.CPInfo cpInfo;
- try {
- cpInfo = cp.get(i);
- } catch (ConstantPool.InvalidIndex e) {
- throw new IllegalStateException(e);
- }
- ConstantPool.CPInfo cpInfo2 = translate(cpInfo, translations);
- eq &= (cpInfo == cpInfo2);
- pool2[i] = cpInfo2;
- if (cpInfo.getTag() != cpInfo2.getTag())
- throw new IllegalStateException();
- i += cpInfo.size();
- }
-
- if (eq)
- cp2 = cp;
- else
- cp2 = new ConstantPool(pool2);
-
- translations.put(cp, cp2);
- }
- return cp2;
- }
-
- ConstantPool.CPInfo translate(ConstantPool.CPInfo cpInfo, Map translations) {
- ConstantPool.CPInfo cpInfo2 = (ConstantPool.CPInfo) translations.get(cpInfo);
- if (cpInfo2 == null) {
- cpInfo2 = cpInfo.accept(this, translations);
- translations.put(cpInfo, cpInfo2);
- }
- return cpInfo2;
- }
-
- Field[] translate(Field[] fields, ConstantPool constant_pool, Map translations) {
- Field[] fields2 = (Field[]) translations.get(fields);
- if (fields2 == null) {
- fields2 = new Field[fields.length];
- for (int i = 0; i < fields.length; i++)
- fields2[i] = translate(fields[i], constant_pool, translations);
- if (equal(fields, fields2))
- fields2 = fields;
- translations.put(fields, fields2);
- }
- return fields2;
- }
-
- Field translate(Field field, ConstantPool constant_pool, Map translations) {
- Field field2 = (Field) translations.get(field);
- if (field2 == null) {
- Attributes attributes2 = translateAttributes(field.attributes, constant_pool,
- translations);
-
- if (attributes2 == field.attributes)
- field2 = field;
- else
- field2 = new Field(
- field.access_flags,
- field.name_index,
- field.descriptor,
- attributes2);
- translations.put(field, field2);
- }
- return field2;
- }
-
- Method[] translateMethods(Method[] methods, ConstantPool constant_pool, Map translations) {
- Method[] methods2 = (Method[]) translations.get(methods);
- if (methods2 == null) {
- methods2 = new Method[methods.length];
- for (int i = 0; i < methods.length; i++)
- methods2[i] = translate(methods[i], constant_pool, translations);
- if (equal(methods, methods2))
- methods2 = methods;
- translations.put(methods, methods2);
- }
- return methods2;
- }
-
- Method translate(Method method, ConstantPool constant_pool, Map translations) {
- Method method2 = (Method) translations.get(method);
- if (method2 == null) {
- Attributes attributes2 = translateAttributes(method.attributes, constant_pool,
- translations);
-
- if (attributes2 == method.attributes)
- method2 = method;
- else
- method2 = new Method(
- method.access_flags,
- method.name_index,
- method.descriptor,
- attributes2);
- translations.put(method, method2);
- }
- return method2;
- }
-
- Attributes translateAttributes(Attributes attributes,
- ConstantPool constant_pool, Map translations) {
- Attributes attributes2 = (Attributes) translations.get(attributes);
- if (attributes2 == null) {
- Attribute[] attrArray2 = new Attribute[attributes.size()];
- ConstantPool constant_pool2 = translate(constant_pool, translations);
- boolean attrsEqual = true;
- for (int i = 0; i < attributes.size(); i++) {
- Attribute attr = attributes.get(i);
- Attribute attr2 = translate(attr, translations);
- if (attr2 != attr)
- attrsEqual = false;
- attrArray2[i] = attr2;
- }
- if ((constant_pool2 == constant_pool) && attrsEqual)
- attributes2 = attributes;
- else
- attributes2 = new Attributes(constant_pool2, attrArray2);
- translations.put(attributes, attributes2);
- }
- return attributes2;
- }
-
- Attribute translate(Attribute attribute, Map translations) {
- Attribute attribute2 = (Attribute) translations.get(attribute);
- if (attribute2 == null) {
- attribute2 = attribute; // don't support translation within attributes yet
- // (what about Code attribute)
- translations.put(attribute, attribute2);
- }
- return attribute2;
- }
-
- private static boolean equal(T[] a1, T[] a2) {
- if (a1 == null || a2 == null)
- return (a1 == a2);
- if (a1.length != a2.length)
- return false;
- for (int i = 0; i < a1.length; i++) {
- if (a1[i] != a2[i])
- return false;
- }
- return true;
- }
-
- public CPInfo visitClass(CONSTANT_Class_info info, Map translations) {
- CONSTANT_Class_info info2 = (CONSTANT_Class_info) translations.get(info);
- if (info2 == null) {
- ConstantPool cp2 = translate(info.cp, translations);
- if (cp2 == info.cp)
- info2 = info;
- else
- info2 = new CONSTANT_Class_info(cp2, info.name_index);
- translations.put(info, info2);
- }
- return info;
- }
-
- public CPInfo visitDouble(CONSTANT_Double_info info, Map translations) {
- CONSTANT_Double_info info2 = (CONSTANT_Double_info) translations.get(info);
- if (info2 == null) {
- info2 = info;
- translations.put(info, info2);
- }
- return info;
- }
-
- public CPInfo visitFieldref(CONSTANT_Fieldref_info info, Map translations) {
- CONSTANT_Fieldref_info info2 = (CONSTANT_Fieldref_info) translations.get(info);
- if (info2 == null) {
- ConstantPool cp2 = translate(info.cp, translations);
- if (cp2 == info.cp)
- info2 = info;
- else
- info2 = new CONSTANT_Fieldref_info(cp2, info.class_index, info.name_and_type_index);
- translations.put(info, info2);
- }
- return info;
- }
-
- public CPInfo visitFloat(CONSTANT_Float_info info, Map translations) {
- CONSTANT_Float_info info2 = (CONSTANT_Float_info) translations.get(info);
- if (info2 == null) {
- info2 = info;
- translations.put(info, info2);
- }
- return info;
- }
-
- public CPInfo visitInteger(CONSTANT_Integer_info info, Map translations) {
- CONSTANT_Integer_info info2 = (CONSTANT_Integer_info) translations.get(info);
- if (info2 == null) {
- info2 = info;
- translations.put(info, info2);
- }
- return info;
- }
-
- public CPInfo visitInterfaceMethodref(CONSTANT_InterfaceMethodref_info info, Map translations) {
- CONSTANT_InterfaceMethodref_info info2 = (CONSTANT_InterfaceMethodref_info) translations.get(info);
- if (info2 == null) {
- ConstantPool cp2 = translate(info.cp, translations);
- if (cp2 == info.cp)
- info2 = info;
- else
- info2 = new CONSTANT_InterfaceMethodref_info(cp2, info.class_index, info.name_and_type_index);
- translations.put(info, info2);
- }
- return info;
- }
-
- public CPInfo visitInvokeDynamic(CONSTANT_InvokeDynamic_info info, Map translations) {
- CONSTANT_InvokeDynamic_info info2 = (CONSTANT_InvokeDynamic_info) translations.get(info);
- if (info2 == null) {
- ConstantPool cp2 = translate(info.cp, translations);
- if (cp2 == info.cp) {
- info2 = info;
- } else {
- info2 = new CONSTANT_InvokeDynamic_info(cp2, info.bootstrap_method_attr_index, info.name_and_type_index);
- }
- translations.put(info, info2);
- }
- return info;
- }
-
- public CPInfo visitLong(CONSTANT_Long_info info, Map translations) {
- CONSTANT_Long_info info2 = (CONSTANT_Long_info) translations.get(info);
- if (info2 == null) {
- info2 = info;
- translations.put(info, info2);
- }
- return info;
- }
-
- public CPInfo visitNameAndType(CONSTANT_NameAndType_info info, Map translations) {
- CONSTANT_NameAndType_info info2 = (CONSTANT_NameAndType_info) translations.get(info);
- if (info2 == null) {
- ConstantPool cp2 = translate(info.cp, translations);
- if (cp2 == info.cp)
- info2 = info;
- else
- info2 = new CONSTANT_NameAndType_info(cp2, info.name_index, info.type_index);
- translations.put(info, info2);
- }
- return info;
- }
-
- public CPInfo visitMethodref(CONSTANT_Methodref_info info, Map translations) {
- CONSTANT_Methodref_info info2 = (CONSTANT_Methodref_info) translations.get(info);
- if (info2 == null) {
- ConstantPool cp2 = translate(info.cp, translations);
- if (cp2 == info.cp)
- info2 = info;
- else
- info2 = new CONSTANT_Methodref_info(cp2, info.class_index, info.name_and_type_index);
- translations.put(info, info2);
- }
- return info;
- }
-
- public CPInfo visitMethodHandle(CONSTANT_MethodHandle_info info, Map translations) {
- CONSTANT_MethodHandle_info info2 = (CONSTANT_MethodHandle_info) translations.get(info);
- if (info2 == null) {
- ConstantPool cp2 = translate(info.cp, translations);
- if (cp2 == info.cp) {
- info2 = info;
- } else {
- info2 = new CONSTANT_MethodHandle_info(cp2, info.reference_kind, info.reference_index);
- }
- translations.put(info, info2);
- }
- return info;
- }
-
- public CPInfo visitMethodType(CONSTANT_MethodType_info info, Map translations) {
- CONSTANT_MethodType_info info2 = (CONSTANT_MethodType_info) translations.get(info);
- if (info2 == null) {
- ConstantPool cp2 = translate(info.cp, translations);
- if (cp2 == info.cp) {
- info2 = info;
- } else {
- info2 = new CONSTANT_MethodType_info(cp2, info.descriptor_index);
- }
- translations.put(info, info2);
- }
- return info;
- }
-
- public CPInfo visitString(CONSTANT_String_info info, Map translations) {
- CONSTANT_String_info info2 = (CONSTANT_String_info) translations.get(info);
- if (info2 == null) {
- ConstantPool cp2 = translate(info.cp, translations);
- if (cp2 == info.cp)
- info2 = info;
- else
- info2 = new CONSTANT_String_info(cp2, info.string_index);
- translations.put(info, info2);
- }
- return info;
- }
-
- public CPInfo visitUtf8(CONSTANT_Utf8_info info, Map translations) {
- CONSTANT_Utf8_info info2 = (CONSTANT_Utf8_info) translations.get(info);
- if (info2 == null) {
- info2 = info;
- translations.put(info, info2);
- }
- return info;
- }
-
-}
--- /dev/null 2015-04-26 22:05:36.465433038 -0700
+++ new/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassTranslator.java 2015-05-26 21:42:18.079832803 -0700
@@ -0,0 +1,410 @@
+/*
+ * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.classfile;
+
+import java.util.Map;
+
+import com.sun.tools.classfile.ConstantPool.CONSTANT_Class_info;
+import com.sun.tools.classfile.ConstantPool.CONSTANT_Double_info;
+import com.sun.tools.classfile.ConstantPool.CONSTANT_Fieldref_info;
+import com.sun.tools.classfile.ConstantPool.CONSTANT_Float_info;
+import com.sun.tools.classfile.ConstantPool.CONSTANT_Integer_info;
+import com.sun.tools.classfile.ConstantPool.CONSTANT_InterfaceMethodref_info;
+import com.sun.tools.classfile.ConstantPool.CONSTANT_InvokeDynamic_info;
+import com.sun.tools.classfile.ConstantPool.CONSTANT_Long_info;
+import com.sun.tools.classfile.ConstantPool.CONSTANT_MethodHandle_info;
+import com.sun.tools.classfile.ConstantPool.CONSTANT_MethodType_info;
+import com.sun.tools.classfile.ConstantPool.CONSTANT_Methodref_info;
+import com.sun.tools.classfile.ConstantPool.CONSTANT_NameAndType_info;
+import com.sun.tools.classfile.ConstantPool.CONSTANT_String_info;
+import com.sun.tools.classfile.ConstantPool.CONSTANT_Utf8_info;
+import com.sun.tools.classfile.ConstantPool.CPInfo;
+
+/**
+ * Rewrites a class file using a map of translations.
+ *
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ */
+public class ClassTranslator
+ implements ConstantPool.Visitor> {
+ /**
+ * Create a new ClassFile from {@code cf}, such that for all entries
+ * {@code k -\> v} in {@code translations},
+ * each occurrence of {@code k} in {@code cf} will be replaced by {@code v}.
+ * in
+ * @param cf the class file to be processed
+ * @param translations the set of translations to be applied
+ * @return a copy of {@code} with the values in {@code translations} substituted
+ */
+ public ClassFile translate(ClassFile cf, Map translations) {
+ ClassFile cf2 = (ClassFile) translations.get(cf);
+ if (cf2 == null) {
+ ConstantPool constant_pool2 = translate(cf.constant_pool, translations);
+ Field[] fields2 = translate(cf.fields, cf.constant_pool, translations);
+ Method[] methods2 = translateMethods(cf.methods, cf.constant_pool, translations);
+ Attributes attributes2 = translateAttributes(cf.attributes, cf.constant_pool,
+ translations);
+
+ if (constant_pool2 == cf.constant_pool &&
+ fields2 == cf.fields &&
+ methods2 == cf.methods &&
+ attributes2 == cf.attributes)
+ cf2 = cf;
+ else
+ cf2 = new ClassFile(
+ cf.magic,
+ cf.minor_version,
+ cf.major_version,
+ constant_pool2,
+ cf.access_flags,
+ cf.this_class,
+ cf.super_class,
+ cf.interfaces,
+ fields2,
+ methods2,
+ attributes2);
+ translations.put(cf, cf2);
+ }
+ return cf2;
+ }
+
+ ConstantPool translate(ConstantPool cp, Map translations) {
+ ConstantPool cp2 = (ConstantPool) translations.get(cp);
+ if (cp2 == null) {
+ ConstantPool.CPInfo[] pool2 = new ConstantPool.CPInfo[cp.size()];
+ boolean eq = true;
+ for (int i = 0; i < cp.size(); ) {
+ ConstantPool.CPInfo cpInfo;
+ try {
+ cpInfo = cp.get(i);
+ } catch (ConstantPool.InvalidIndex e) {
+ throw new IllegalStateException(e);
+ }
+ ConstantPool.CPInfo cpInfo2 = translate(cpInfo, translations);
+ eq &= (cpInfo == cpInfo2);
+ pool2[i] = cpInfo2;
+ if (cpInfo.getTag() != cpInfo2.getTag())
+ throw new IllegalStateException();
+ i += cpInfo.size();
+ }
+
+ if (eq)
+ cp2 = cp;
+ else
+ cp2 = new ConstantPool(pool2);
+
+ translations.put(cp, cp2);
+ }
+ return cp2;
+ }
+
+ ConstantPool.CPInfo translate(ConstantPool.CPInfo cpInfo, Map translations) {
+ ConstantPool.CPInfo cpInfo2 = (ConstantPool.CPInfo) translations.get(cpInfo);
+ if (cpInfo2 == null) {
+ cpInfo2 = cpInfo.accept(this, translations);
+ translations.put(cpInfo, cpInfo2);
+ }
+ return cpInfo2;
+ }
+
+ Field[] translate(Field[] fields, ConstantPool constant_pool, Map translations) {
+ Field[] fields2 = (Field[]) translations.get(fields);
+ if (fields2 == null) {
+ fields2 = new Field[fields.length];
+ for (int i = 0; i < fields.length; i++)
+ fields2[i] = translate(fields[i], constant_pool, translations);
+ if (equal(fields, fields2))
+ fields2 = fields;
+ translations.put(fields, fields2);
+ }
+ return fields2;
+ }
+
+ Field translate(Field field, ConstantPool constant_pool, Map translations) {
+ Field field2 = (Field) translations.get(field);
+ if (field2 == null) {
+ Attributes attributes2 = translateAttributes(field.attributes, constant_pool,
+ translations);
+
+ if (attributes2 == field.attributes)
+ field2 = field;
+ else
+ field2 = new Field(
+ field.access_flags,
+ field.name_index,
+ field.descriptor,
+ attributes2);
+ translations.put(field, field2);
+ }
+ return field2;
+ }
+
+ Method[] translateMethods(Method[] methods, ConstantPool constant_pool, Map translations) {
+ Method[] methods2 = (Method[]) translations.get(methods);
+ if (methods2 == null) {
+ methods2 = new Method[methods.length];
+ for (int i = 0; i < methods.length; i++)
+ methods2[i] = translate(methods[i], constant_pool, translations);
+ if (equal(methods, methods2))
+ methods2 = methods;
+ translations.put(methods, methods2);
+ }
+ return methods2;
+ }
+
+ Method translate(Method method, ConstantPool constant_pool, Map translations) {
+ Method method2 = (Method) translations.get(method);
+ if (method2 == null) {
+ Attributes attributes2 = translateAttributes(method.attributes, constant_pool,
+ translations);
+
+ if (attributes2 == method.attributes)
+ method2 = method;
+ else
+ method2 = new Method(
+ method.access_flags,
+ method.name_index,
+ method.descriptor,
+ attributes2);
+ translations.put(method, method2);
+ }
+ return method2;
+ }
+
+ Attributes translateAttributes(Attributes attributes,
+ ConstantPool constant_pool, Map translations) {
+ Attributes attributes2 = (Attributes) translations.get(attributes);
+ if (attributes2 == null) {
+ Attribute[] attrArray2 = new Attribute[attributes.size()];
+ ConstantPool constant_pool2 = translate(constant_pool, translations);
+ boolean attrsEqual = true;
+ for (int i = 0; i < attributes.size(); i++) {
+ Attribute attr = attributes.get(i);
+ Attribute attr2 = translate(attr, translations);
+ if (attr2 != attr)
+ attrsEqual = false;
+ attrArray2[i] = attr2;
+ }
+ if ((constant_pool2 == constant_pool) && attrsEqual)
+ attributes2 = attributes;
+ else
+ attributes2 = new Attributes(constant_pool2, attrArray2);
+ translations.put(attributes, attributes2);
+ }
+ return attributes2;
+ }
+
+ Attribute translate(Attribute attribute, Map translations) {
+ Attribute attribute2 = (Attribute) translations.get(attribute);
+ if (attribute2 == null) {
+ attribute2 = attribute; // don't support translation within attributes yet
+ // (what about Code attribute)
+ translations.put(attribute, attribute2);
+ }
+ return attribute2;
+ }
+
+ private static boolean equal(T[] a1, T[] a2) {
+ if (a1 == null || a2 == null)
+ return (a1 == a2);
+ if (a1.length != a2.length)
+ return false;
+ for (int i = 0; i < a1.length; i++) {
+ if (a1[i] != a2[i])
+ return false;
+ }
+ return true;
+ }
+
+ public CPInfo visitClass(CONSTANT_Class_info info, Map translations) {
+ CONSTANT_Class_info info2 = (CONSTANT_Class_info) translations.get(info);
+ if (info2 == null) {
+ ConstantPool cp2 = translate(info.cp, translations);
+ if (cp2 == info.cp)
+ info2 = info;
+ else
+ info2 = new CONSTANT_Class_info(cp2, info.name_index);
+ translations.put(info, info2);
+ }
+ return info;
+ }
+
+ public CPInfo visitDouble(CONSTANT_Double_info info, Map translations) {
+ CONSTANT_Double_info info2 = (CONSTANT_Double_info) translations.get(info);
+ if (info2 == null) {
+ info2 = info;
+ translations.put(info, info2);
+ }
+ return info;
+ }
+
+ public CPInfo visitFieldref(CONSTANT_Fieldref_info info, Map translations) {
+ CONSTANT_Fieldref_info info2 = (CONSTANT_Fieldref_info) translations.get(info);
+ if (info2 == null) {
+ ConstantPool cp2 = translate(info.cp, translations);
+ if (cp2 == info.cp)
+ info2 = info;
+ else
+ info2 = new CONSTANT_Fieldref_info(cp2, info.class_index, info.name_and_type_index);
+ translations.put(info, info2);
+ }
+ return info;
+ }
+
+ public CPInfo visitFloat(CONSTANT_Float_info info, Map translations) {
+ CONSTANT_Float_info info2 = (CONSTANT_Float_info) translations.get(info);
+ if (info2 == null) {
+ info2 = info;
+ translations.put(info, info2);
+ }
+ return info;
+ }
+
+ public CPInfo visitInteger(CONSTANT_Integer_info info, Map translations) {
+ CONSTANT_Integer_info info2 = (CONSTANT_Integer_info) translations.get(info);
+ if (info2 == null) {
+ info2 = info;
+ translations.put(info, info2);
+ }
+ return info;
+ }
+
+ public CPInfo visitInterfaceMethodref(CONSTANT_InterfaceMethodref_info info, Map translations) {
+ CONSTANT_InterfaceMethodref_info info2 = (CONSTANT_InterfaceMethodref_info) translations.get(info);
+ if (info2 == null) {
+ ConstantPool cp2 = translate(info.cp, translations);
+ if (cp2 == info.cp)
+ info2 = info;
+ else
+ info2 = new CONSTANT_InterfaceMethodref_info(cp2, info.class_index, info.name_and_type_index);
+ translations.put(info, info2);
+ }
+ return info;
+ }
+
+ public CPInfo visitInvokeDynamic(CONSTANT_InvokeDynamic_info info, Map translations) {
+ CONSTANT_InvokeDynamic_info info2 = (CONSTANT_InvokeDynamic_info) translations.get(info);
+ if (info2 == null) {
+ ConstantPool cp2 = translate(info.cp, translations);
+ if (cp2 == info.cp) {
+ info2 = info;
+ } else {
+ info2 = new CONSTANT_InvokeDynamic_info(cp2, info.bootstrap_method_attr_index, info.name_and_type_index);
+ }
+ translations.put(info, info2);
+ }
+ return info;
+ }
+
+ public CPInfo visitLong(CONSTANT_Long_info info, Map translations) {
+ CONSTANT_Long_info info2 = (CONSTANT_Long_info) translations.get(info);
+ if (info2 == null) {
+ info2 = info;
+ translations.put(info, info2);
+ }
+ return info;
+ }
+
+ public CPInfo visitNameAndType(CONSTANT_NameAndType_info info, Map translations) {
+ CONSTANT_NameAndType_info info2 = (CONSTANT_NameAndType_info) translations.get(info);
+ if (info2 == null) {
+ ConstantPool cp2 = translate(info.cp, translations);
+ if (cp2 == info.cp)
+ info2 = info;
+ else
+ info2 = new CONSTANT_NameAndType_info(cp2, info.name_index, info.type_index);
+ translations.put(info, info2);
+ }
+ return info;
+ }
+
+ public CPInfo visitMethodref(CONSTANT_Methodref_info info, Map translations) {
+ CONSTANT_Methodref_info info2 = (CONSTANT_Methodref_info) translations.get(info);
+ if (info2 == null) {
+ ConstantPool cp2 = translate(info.cp, translations);
+ if (cp2 == info.cp)
+ info2 = info;
+ else
+ info2 = new CONSTANT_Methodref_info(cp2, info.class_index, info.name_and_type_index);
+ translations.put(info, info2);
+ }
+ return info;
+ }
+
+ public CPInfo visitMethodHandle(CONSTANT_MethodHandle_info info, Map translations) {
+ CONSTANT_MethodHandle_info info2 = (CONSTANT_MethodHandle_info) translations.get(info);
+ if (info2 == null) {
+ ConstantPool cp2 = translate(info.cp, translations);
+ if (cp2 == info.cp) {
+ info2 = info;
+ } else {
+ info2 = new CONSTANT_MethodHandle_info(cp2, info.reference_kind, info.reference_index);
+ }
+ translations.put(info, info2);
+ }
+ return info;
+ }
+
+ public CPInfo visitMethodType(CONSTANT_MethodType_info info, Map translations) {
+ CONSTANT_MethodType_info info2 = (CONSTANT_MethodType_info) translations.get(info);
+ if (info2 == null) {
+ ConstantPool cp2 = translate(info.cp, translations);
+ if (cp2 == info.cp) {
+ info2 = info;
+ } else {
+ info2 = new CONSTANT_MethodType_info(cp2, info.descriptor_index);
+ }
+ translations.put(info, info2);
+ }
+ return info;
+ }
+
+ public CPInfo visitString(CONSTANT_String_info info, Map translations) {
+ CONSTANT_String_info info2 = (CONSTANT_String_info) translations.get(info);
+ if (info2 == null) {
+ ConstantPool cp2 = translate(info.cp, translations);
+ if (cp2 == info.cp)
+ info2 = info;
+ else
+ info2 = new CONSTANT_String_info(cp2, info.string_index);
+ translations.put(info, info2);
+ }
+ return info;
+ }
+
+ public CPInfo visitUtf8(CONSTANT_Utf8_info info, Map translations) {
+ CONSTANT_Utf8_info info2 = (CONSTANT_Utf8_info) translations.get(info);
+ if (info2 == null) {
+ info2 = info;
+ translations.put(info, info2);
+ }
+ return info;
+ }
+
+}
--- old/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/ClassWriter.java 2015-05-26 21:42:18.583832811 -0700
+++ /dev/null 2015-04-26 22:05:36.465433038 -0700
@@ -1,808 +0,0 @@
-
-/*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.classfile;
-
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-import static com.sun.tools.classfile.Annotation.*;
-import static com.sun.tools.classfile.ConstantPool.*;
-import static com.sun.tools.classfile.StackMapTable_attribute.*;
-import static com.sun.tools.classfile.StackMapTable_attribute.verification_type_info.*;
-
-/**
- * Write a ClassFile data structure to a file or stream.
- *
- * This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own risk.
- * This code and its internal interfaces are subject to change or
- * deletion without notice.
- */
-public class ClassWriter {
- public ClassWriter() {
- attributeWriter = new AttributeWriter();
- constantPoolWriter = new ConstantPoolWriter();
- out = new ClassOutputStream();
- }
-
- /**
- * Write a ClassFile data structure to a file.
- */
- public void write(ClassFile classFile, File f) throws IOException {
- try (FileOutputStream f_out = new FileOutputStream(f)) {
- write(classFile, f_out);
- }
- }
-
- /**
- * Write a ClassFile data structure to a stream.
- */
- public void write(ClassFile classFile, OutputStream s) throws IOException {
- this.classFile = classFile;
- out.reset();
- write();
- out.writeTo(s);
- }
-
- protected void write() throws IOException {
- writeHeader();
- writeConstantPool();
- writeAccessFlags(classFile.access_flags);
- writeClassInfo();
- writeFields();
- writeMethods();
- writeAttributes(classFile.attributes);
- }
-
- protected void writeHeader() {
- out.writeInt(classFile.magic);
- out.writeShort(classFile.minor_version);
- out.writeShort(classFile.major_version);
- }
-
- protected void writeAccessFlags(AccessFlags flags) {
- out.writeShort(flags.flags);
- }
-
- protected void writeAttributes(Attributes attributes) {
- int size = attributes.size();
- out.writeShort(size);
- for (Attribute attr: attributes)
- attributeWriter.write(attr, out);
- }
-
- protected void writeClassInfo() {
- out.writeShort(classFile.this_class);
- out.writeShort(classFile.super_class);
- int[] interfaces = classFile.interfaces;
- out.writeShort(interfaces.length);
- for (int i: interfaces)
- out.writeShort(i);
- }
-
- protected void writeDescriptor(Descriptor d) {
- out.writeShort(d.index);
- }
-
- protected void writeConstantPool() {
- ConstantPool pool = classFile.constant_pool;
- int size = pool.size();
- out.writeShort(size);
- for (CPInfo cpInfo: pool.entries())
- constantPoolWriter.write(cpInfo, out);
- }
-
- protected void writeFields() throws IOException {
- Field[] fields = classFile.fields;
- out.writeShort(fields.length);
- for (Field f: fields)
- writeField(f);
- }
-
- protected void writeField(Field f) throws IOException {
- writeAccessFlags(f.access_flags);
- out.writeShort(f.name_index);
- writeDescriptor(f.descriptor);
- writeAttributes(f.attributes);
- }
-
- protected void writeMethods() throws IOException {
- Method[] methods = classFile.methods;
- out.writeShort(methods.length);
- for (Method m: methods) {
- writeMethod(m);
- }
- }
-
- protected void writeMethod(Method m) throws IOException {
- writeAccessFlags(m.access_flags);
- out.writeShort(m.name_index);
- writeDescriptor(m.descriptor);
- writeAttributes(m.attributes);
- }
-
- protected ClassFile classFile;
- protected ClassOutputStream out;
- protected AttributeWriter attributeWriter;
- protected ConstantPoolWriter constantPoolWriter;
-
- /**
- * Subtype of ByteArrayOutputStream with the convenience methods of
- * a DataOutputStream. Since ByteArrayOutputStream does not throw
- * IOException, there are no exceptions from the additional
- * convenience methods either,
- */
- protected static class ClassOutputStream extends ByteArrayOutputStream {
- public ClassOutputStream() {
- d = new DataOutputStream(this);
- }
-
- public void writeByte(int value) {
- try {
- d.writeByte(value);
- } catch (IOException ignore) {
- }
- }
-
- public void writeShort(int value) {
- try {
- d.writeShort(value);
- } catch (IOException ignore) {
- }
- }
-
- public void writeInt(int value) {
- try {
- d.writeInt(value);
- } catch (IOException ignore) {
- }
- }
-
- public void writeLong(long value) {
- try {
- d.writeLong(value);
- } catch (IOException ignore) {
- }
- }
-
- public void writeFloat(float value) {
- try {
- d.writeFloat(value);
- } catch (IOException ignore) {
- }
- }
-
- public void writeDouble(double value) {
- try {
- d.writeDouble(value);
- } catch (IOException ignore) {
- }
- }
-
- public void writeUTF(String value) {
- try {
- d.writeUTF(value);
- } catch (IOException ignore) {
- }
- }
-
- public void writeTo(ClassOutputStream s) {
- try {
- super.writeTo(s);
- } catch (IOException ignore) {
- }
- }
-
- private DataOutputStream d;
- }
-
- /**
- * Writer for the entries in the constant pool.
- */
- protected static class ConstantPoolWriter
- implements ConstantPool.Visitor {
- protected int write(CPInfo info, ClassOutputStream out) {
- out.writeByte(info.getTag());
- return info.accept(this, out);
- }
-
- public Integer visitClass(CONSTANT_Class_info info, ClassOutputStream out) {
- out.writeShort(info.name_index);
- return 1;
- }
-
- public Integer visitDouble(CONSTANT_Double_info info, ClassOutputStream out) {
- out.writeDouble(info.value);
- return 2;
- }
-
- public Integer visitFieldref(CONSTANT_Fieldref_info info, ClassOutputStream out) {
- writeRef(info, out);
- return 1;
- }
-
- public Integer visitFloat(CONSTANT_Float_info info, ClassOutputStream out) {
- out.writeFloat(info.value);
- return 1;
- }
-
- public Integer visitInteger(CONSTANT_Integer_info info, ClassOutputStream out) {
- out.writeInt(info.value);
- return 1;
- }
-
- public Integer visitInterfaceMethodref(CONSTANT_InterfaceMethodref_info info, ClassOutputStream out) {
- writeRef(info, out);
- return 1;
- }
-
- public Integer visitInvokeDynamic(CONSTANT_InvokeDynamic_info info, ClassOutputStream out) {
- out.writeShort(info.bootstrap_method_attr_index);
- out.writeShort(info.name_and_type_index);
- return 1;
- }
-
- public Integer visitLong(CONSTANT_Long_info info, ClassOutputStream out) {
- out.writeLong(info.value);
- return 2;
- }
-
- public Integer visitNameAndType(CONSTANT_NameAndType_info info, ClassOutputStream out) {
- out.writeShort(info.name_index);
- out.writeShort(info.type_index);
- return 1;
- }
-
- public Integer visitMethodHandle(CONSTANT_MethodHandle_info info, ClassOutputStream out) {
- out.writeByte(info.reference_kind.tag);
- out.writeShort(info.reference_index);
- return 1;
- }
-
- public Integer visitMethodType(CONSTANT_MethodType_info info, ClassOutputStream out) {
- out.writeShort(info.descriptor_index);
- return 1;
- }
-
- public Integer visitMethodref(CONSTANT_Methodref_info info, ClassOutputStream out) {
- return writeRef(info, out);
- }
-
- public Integer visitString(CONSTANT_String_info info, ClassOutputStream out) {
- out.writeShort(info.string_index);
- return 1;
- }
-
- public Integer visitUtf8(CONSTANT_Utf8_info info, ClassOutputStream out) {
- out.writeUTF(info.value);
- return 1;
- }
-
- protected Integer writeRef(CPRefInfo info, ClassOutputStream out) {
- out.writeShort(info.class_index);
- out.writeShort(info.name_and_type_index);
- return 1;
- }
- }
-
- /**
- * Writer for the different types of attribute.
- */
- protected static class AttributeWriter implements Attribute.Visitor {
- public void write(Attributes attributes, ClassOutputStream out) {
- int size = attributes.size();
- out.writeShort(size);
- for (Attribute a: attributes)
- write(a, out);
- }
-
- // Note: due to the use of shared resources, this method is not reentrant.
- public void write(Attribute attr, ClassOutputStream out) {
- out.writeShort(attr.attribute_name_index);
- sharedOut.reset();
- attr.accept(this, sharedOut);
- out.writeInt(sharedOut.size());
- sharedOut.writeTo(out);
- }
-
- protected ClassOutputStream sharedOut = new ClassOutputStream();
- protected AnnotationWriter annotationWriter = new AnnotationWriter();
-
- public Void visitDefault(DefaultAttribute attr, ClassOutputStream out) {
- out.write(attr.info, 0, attr.info.length);
- return null;
- }
-
- public Void visitAnnotationDefault(AnnotationDefault_attribute attr, ClassOutputStream out) {
- annotationWriter.write(attr.default_value, out);
- return null;
- }
-
- public Void visitBootstrapMethods(BootstrapMethods_attribute attr, ClassOutputStream out) {
- out.writeShort(attr.bootstrap_method_specifiers.length);
- for (BootstrapMethods_attribute.BootstrapMethodSpecifier bsm : attr.bootstrap_method_specifiers) {
- out.writeShort(bsm.bootstrap_method_ref);
- int bsm_args_count = bsm.bootstrap_arguments.length;
- out.writeShort(bsm_args_count);
- for (int i : bsm.bootstrap_arguments) {
- out.writeShort(i);
- }
- }
- return null;
- }
-
- public Void visitCharacterRangeTable(CharacterRangeTable_attribute attr, ClassOutputStream out) {
- out.writeShort(attr.character_range_table.length);
- for (CharacterRangeTable_attribute.Entry e: attr.character_range_table)
- writeCharacterRangeTableEntry(e, out);
- return null;
- }
-
- protected void writeCharacterRangeTableEntry(CharacterRangeTable_attribute.Entry entry, ClassOutputStream out) {
- out.writeShort(entry.start_pc);
- out.writeShort(entry.end_pc);
- out.writeInt(entry.character_range_start);
- out.writeInt(entry.character_range_end);
- out.writeShort(entry.flags);
- }
-
- public Void visitCode(Code_attribute attr, ClassOutputStream out) {
- out.writeShort(attr.max_stack);
- out.writeShort(attr.max_locals);
- out.writeInt(attr.code.length);
- out.write(attr.code, 0, attr.code.length);
- out.writeShort(attr.exception_table.length);
- for (Code_attribute.Exception_data e: attr.exception_table)
- writeExceptionTableEntry(e, out);
- new AttributeWriter().write(attr.attributes, out);
- return null;
- }
-
- protected void writeExceptionTableEntry(Code_attribute.Exception_data exception_data, ClassOutputStream out) {
- out.writeShort(exception_data.start_pc);
- out.writeShort(exception_data.end_pc);
- out.writeShort(exception_data.handler_pc);
- out.writeShort(exception_data.catch_type);
- }
-
- public Void visitCompilationID(CompilationID_attribute attr, ClassOutputStream out) {
- out.writeShort(attr.compilationID_index);
- return null;
- }
-
- public Void visitConstantValue(ConstantValue_attribute attr, ClassOutputStream out) {
- out.writeShort(attr.constantvalue_index);
- return null;
- }
-
- public Void visitDeprecated(Deprecated_attribute attr, ClassOutputStream out) {
- return null;
- }
-
- public Void visitEnclosingMethod(EnclosingMethod_attribute attr, ClassOutputStream out) {
- out.writeShort(attr.class_index);
- out.writeShort(attr.method_index);
- return null;
- }
-
- public Void visitExceptions(Exceptions_attribute attr, ClassOutputStream out) {
- out.writeShort(attr.exception_index_table.length);
- for (int i: attr.exception_index_table)
- out.writeShort(i);
- return null;
- }
-
- public Void visitInnerClasses(InnerClasses_attribute attr, ClassOutputStream out) {
- out.writeShort(attr.classes.length);
- for (InnerClasses_attribute.Info info: attr.classes)
- writeInnerClassesInfo(info, out);
- return null;
- }
-
- protected void writeInnerClassesInfo(InnerClasses_attribute.Info info, ClassOutputStream out) {
- out.writeShort(info.inner_class_info_index);
- out.writeShort(info.outer_class_info_index);
- out.writeShort(info.inner_name_index);
- writeAccessFlags(info.inner_class_access_flags, out);
- }
-
- public Void visitLineNumberTable(LineNumberTable_attribute attr, ClassOutputStream out) {
- out.writeShort(attr.line_number_table.length);
- for (LineNumberTable_attribute.Entry e: attr.line_number_table)
- writeLineNumberTableEntry(e, out);
- return null;
- }
-
- protected void writeLineNumberTableEntry(LineNumberTable_attribute.Entry entry, ClassOutputStream out) {
- out.writeShort(entry.start_pc);
- out.writeShort(entry.line_number);
- }
-
- public Void visitLocalVariableTable(LocalVariableTable_attribute attr, ClassOutputStream out) {
- out.writeShort(attr.local_variable_table.length);
- for (LocalVariableTable_attribute.Entry e: attr.local_variable_table)
- writeLocalVariableTableEntry(e, out);
- return null;
- }
-
- protected void writeLocalVariableTableEntry(LocalVariableTable_attribute.Entry entry, ClassOutputStream out) {
- out.writeShort(entry.start_pc);
- out.writeShort(entry.length);
- out.writeShort(entry.name_index);
- out.writeShort(entry.descriptor_index);
- out.writeShort(entry.index);
- }
-
- public Void visitLocalVariableTypeTable(LocalVariableTypeTable_attribute attr, ClassOutputStream out) {
- out.writeShort(attr.local_variable_table.length);
- for (LocalVariableTypeTable_attribute.Entry e: attr.local_variable_table)
- writeLocalVariableTypeTableEntry(e, out);
- return null;
- }
-
- protected void writeLocalVariableTypeTableEntry(LocalVariableTypeTable_attribute.Entry entry, ClassOutputStream out) {
- out.writeShort(entry.start_pc);
- out.writeShort(entry.length);
- out.writeShort(entry.name_index);
- out.writeShort(entry.signature_index);
- out.writeShort(entry.index);
- }
-
- public Void visitMethodParameters(MethodParameters_attribute attr, ClassOutputStream out) {
- out.writeByte(attr.method_parameter_table.length);
- for (MethodParameters_attribute.Entry e : attr.method_parameter_table) {
- out.writeShort(e.name_index);
- out.writeShort(e.flags);
- }
- return null;
- }
-
- public Void visitRuntimeVisibleAnnotations(RuntimeVisibleAnnotations_attribute attr, ClassOutputStream out) {
- annotationWriter.write(attr.annotations, out);
- return null;
- }
-
- public Void visitRuntimeInvisibleAnnotations(RuntimeInvisibleAnnotations_attribute attr, ClassOutputStream out) {
- annotationWriter.write(attr.annotations, out);
- return null;
- }
-
- public Void visitRuntimeVisibleTypeAnnotations(RuntimeVisibleTypeAnnotations_attribute attr, ClassOutputStream out) {
- annotationWriter.write(attr.annotations, out);
- return null;
- }
-
- public Void visitRuntimeInvisibleTypeAnnotations(RuntimeInvisibleTypeAnnotations_attribute attr, ClassOutputStream out) {
- annotationWriter.write(attr.annotations, out);
- return null;
- }
-
- public Void visitRuntimeVisibleParameterAnnotations(RuntimeVisibleParameterAnnotations_attribute attr, ClassOutputStream out) {
- out.writeByte(attr.parameter_annotations.length);
- for (Annotation[] annos: attr.parameter_annotations)
- annotationWriter.write(annos, out);
- return null;
- }
-
- public Void visitRuntimeInvisibleParameterAnnotations(RuntimeInvisibleParameterAnnotations_attribute attr, ClassOutputStream out) {
- out.writeByte(attr.parameter_annotations.length);
- for (Annotation[] annos: attr.parameter_annotations)
- annotationWriter.write(annos, out);
- return null;
- }
-
- public Void visitSignature(Signature_attribute attr, ClassOutputStream out) {
- out.writeShort(attr.signature_index);
- return null;
- }
-
- public Void visitSourceDebugExtension(SourceDebugExtension_attribute attr, ClassOutputStream out) {
- out.write(attr.debug_extension, 0, attr.debug_extension.length);
- return null;
- }
-
- public Void visitSourceFile(SourceFile_attribute attr, ClassOutputStream out) {
- out.writeShort(attr.sourcefile_index);
- return null;
- }
-
- public Void visitSourceID(SourceID_attribute attr, ClassOutputStream out) {
- out.writeShort(attr.sourceID_index);
- return null;
- }
-
- public Void visitStackMap(StackMap_attribute attr, ClassOutputStream out) {
- if (stackMapWriter == null)
- stackMapWriter = new StackMapTableWriter();
-
- out.writeShort(attr.entries.length);
- for (stack_map_frame f: attr.entries)
- stackMapWriter.write(f, out);
- return null;
- }
-
- public Void visitStackMapTable(StackMapTable_attribute attr, ClassOutputStream out) {
- if (stackMapWriter == null)
- stackMapWriter = new StackMapTableWriter();
-
- out.writeShort(attr.entries.length);
- for (stack_map_frame f: attr.entries)
- stackMapWriter.write(f, out);
- return null;
- }
-
- public Void visitSynthetic(Synthetic_attribute attr, ClassOutputStream out) {
- return null;
- }
-
- protected void writeAccessFlags(AccessFlags flags, ClassOutputStream p) {
- sharedOut.writeShort(flags.flags);
- }
-
- protected StackMapTableWriter stackMapWriter;
- }
-
- /**
- * Writer for the frames of StackMap and StackMapTable attributes.
- */
- protected static class StackMapTableWriter
- implements stack_map_frame.Visitor {
-
- public void write(stack_map_frame frame, ClassOutputStream out) {
- out.write(frame.frame_type);
- frame.accept(this, out);
- }
-
- public Void visit_same_frame(same_frame frame, ClassOutputStream p) {
- return null;
- }
-
- public Void visit_same_locals_1_stack_item_frame(same_locals_1_stack_item_frame frame, ClassOutputStream out) {
- writeVerificationTypeInfo(frame.stack[0], out);
- return null;
- }
-
- public Void visit_same_locals_1_stack_item_frame_extended(same_locals_1_stack_item_frame_extended frame, ClassOutputStream out) {
- out.writeShort(frame.offset_delta);
- writeVerificationTypeInfo(frame.stack[0], out);
- return null;
- }
-
- public Void visit_chop_frame(chop_frame frame, ClassOutputStream out) {
- out.writeShort(frame.offset_delta);
- return null;
- }
-
- public Void visit_same_frame_extended(same_frame_extended frame, ClassOutputStream out) {
- out.writeShort(frame.offset_delta);
- return null;
- }
-
- public Void visit_append_frame(append_frame frame, ClassOutputStream out) {
- out.writeShort(frame.offset_delta);
- for (verification_type_info l: frame.locals)
- writeVerificationTypeInfo(l, out);
- return null;
- }
-
- public Void visit_full_frame(full_frame frame, ClassOutputStream out) {
- out.writeShort(frame.offset_delta);
- out.writeShort(frame.locals.length);
- for (verification_type_info l: frame.locals)
- writeVerificationTypeInfo(l, out);
- out.writeShort(frame.stack.length);
- for (verification_type_info s: frame.stack)
- writeVerificationTypeInfo(s, out);
- return null;
- }
-
- protected void writeVerificationTypeInfo(verification_type_info info,
- ClassOutputStream out) {
- out.write(info.tag);
- switch (info.tag) {
- case ITEM_Top:
- case ITEM_Integer:
- case ITEM_Float:
- case ITEM_Long:
- case ITEM_Double:
- case ITEM_Null:
- case ITEM_UninitializedThis:
- break;
-
- case ITEM_Object:
- Object_variable_info o = (Object_variable_info) info;
- out.writeShort(o.cpool_index);
- break;
-
- case ITEM_Uninitialized:
- Uninitialized_variable_info u = (Uninitialized_variable_info) info;
- out.writeShort(u.offset);
- break;
-
- default:
- throw new Error();
- }
- }
- }
-
- /**
- * Writer for annotations and the values they contain.
- */
- protected static class AnnotationWriter
- implements Annotation.element_value.Visitor {
- public void write(Annotation[] annos, ClassOutputStream out) {
- out.writeShort(annos.length);
- for (Annotation anno: annos)
- write(anno, out);
- }
-
- public void write(TypeAnnotation[] annos, ClassOutputStream out) {
- out.writeShort(annos.length);
- for (TypeAnnotation anno: annos)
- write(anno, out);
- }
-
- public void write(Annotation anno, ClassOutputStream out) {
- out.writeShort(anno.type_index);
- out.writeShort(anno.element_value_pairs.length);
- for (element_value_pair p: anno.element_value_pairs)
- write(p, out);
- }
-
- public void write(TypeAnnotation anno, ClassOutputStream out) {
- write(anno.position, out);
- write(anno.annotation, out);
- }
-
- public void write(element_value_pair pair, ClassOutputStream out) {
- out.writeShort(pair.element_name_index);
- write(pair.value, out);
- }
-
- public void write(element_value ev, ClassOutputStream out) {
- out.writeByte(ev.tag);
- ev.accept(this, out);
- }
-
- public Void visitPrimitive(Primitive_element_value ev, ClassOutputStream out) {
- out.writeShort(ev.const_value_index);
- return null;
- }
-
- public Void visitEnum(Enum_element_value ev, ClassOutputStream out) {
- out.writeShort(ev.type_name_index);
- out.writeShort(ev.const_name_index);
- return null;
- }
-
- public Void visitClass(Class_element_value ev, ClassOutputStream out) {
- out.writeShort(ev.class_info_index);
- return null;
- }
-
- public Void visitAnnotation(Annotation_element_value ev, ClassOutputStream out) {
- write(ev.annotation_value, out);
- return null;
- }
-
- public Void visitArray(Array_element_value ev, ClassOutputStream out) {
- out.writeShort(ev.num_values);
- for (element_value v: ev.values)
- write(v, out);
- return null;
- }
-
- // TODO: Move this to TypeAnnotation to be closer with similar logic?
- private void write(TypeAnnotation.Position p, ClassOutputStream out) {
- out.writeByte(p.type.targetTypeValue());
- switch (p.type) {
- // instanceof
- case INSTANCEOF:
- // new expression
- case NEW:
- // constructor/method reference receiver
- case CONSTRUCTOR_REFERENCE:
- case METHOD_REFERENCE:
- out.writeShort(p.offset);
- break;
- // local variable
- case LOCAL_VARIABLE:
- // resource variable
- case RESOURCE_VARIABLE:
- int table_length = p.lvarOffset.length;
- out.writeShort(table_length);
- for (int i = 0; i < table_length; ++i) {
- out.writeShort(1); // for table length
- out.writeShort(p.lvarOffset[i]);
- out.writeShort(p.lvarLength[i]);
- out.writeShort(p.lvarIndex[i]);
- }
- break;
- // exception parameter
- case EXCEPTION_PARAMETER:
- out.writeShort(p.exception_index);
- break;
- // method receiver
- case METHOD_RECEIVER:
- // Do nothing
- break;
- // type parameters
- case CLASS_TYPE_PARAMETER:
- case METHOD_TYPE_PARAMETER:
- out.writeByte(p.parameter_index);
- break;
- // type parameters bounds
- case CLASS_TYPE_PARAMETER_BOUND:
- case METHOD_TYPE_PARAMETER_BOUND:
- out.writeByte(p.parameter_index);
- out.writeByte(p.bound_index);
- break;
- // class extends or implements clause
- case CLASS_EXTENDS:
- out.writeShort(p.type_index);
- break;
- // throws
- case THROWS:
- out.writeShort(p.type_index);
- break;
- // method parameter
- case METHOD_FORMAL_PARAMETER:
- out.writeByte(p.parameter_index);
- break;
- // type cast
- case CAST:
- // method/constructor/reference type argument
- case CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT:
- case METHOD_INVOCATION_TYPE_ARGUMENT:
- case CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT:
- case METHOD_REFERENCE_TYPE_ARGUMENT:
- out.writeShort(p.offset);
- out.writeByte(p.type_index);
- break;
- // We don't need to worry about these
- case METHOD_RETURN:
- case FIELD:
- break;
- case UNKNOWN:
- throw new AssertionError("ClassWriter: UNKNOWN target type should never occur!");
- default:
- throw new AssertionError("ClassWriter: Unknown target type for position: " + p);
- }
-
- { // Append location data for generics/arrays.
- // TODO: check for overrun?
- out.writeByte((byte)p.location.size());
- for (int i : TypeAnnotation.Position.getBinaryFromTypePath(p.location))
- out.writeByte((byte)i);
- }
- }
- }
-}
--- /dev/null 2015-04-26 22:05:36.465433038 -0700
+++ new/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassWriter.java 2015-05-26 21:42:18.407832808 -0700
@@ -0,0 +1,808 @@
+
+/*
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.classfile;
+
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+import static com.sun.tools.classfile.Annotation.*;
+import static com.sun.tools.classfile.ConstantPool.*;
+import static com.sun.tools.classfile.StackMapTable_attribute.*;
+import static com.sun.tools.classfile.StackMapTable_attribute.verification_type_info.*;
+
+/**
+ * Write a ClassFile data structure to a file or stream.
+ *
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ */
+public class ClassWriter {
+ public ClassWriter() {
+ attributeWriter = new AttributeWriter();
+ constantPoolWriter = new ConstantPoolWriter();
+ out = new ClassOutputStream();
+ }
+
+ /**
+ * Write a ClassFile data structure to a file.
+ */
+ public void write(ClassFile classFile, File f) throws IOException {
+ try (FileOutputStream f_out = new FileOutputStream(f)) {
+ write(classFile, f_out);
+ }
+ }
+
+ /**
+ * Write a ClassFile data structure to a stream.
+ */
+ public void write(ClassFile classFile, OutputStream s) throws IOException {
+ this.classFile = classFile;
+ out.reset();
+ write();
+ out.writeTo(s);
+ }
+
+ protected void write() throws IOException {
+ writeHeader();
+ writeConstantPool();
+ writeAccessFlags(classFile.access_flags);
+ writeClassInfo();
+ writeFields();
+ writeMethods();
+ writeAttributes(classFile.attributes);
+ }
+
+ protected void writeHeader() {
+ out.writeInt(classFile.magic);
+ out.writeShort(classFile.minor_version);
+ out.writeShort(classFile.major_version);
+ }
+
+ protected void writeAccessFlags(AccessFlags flags) {
+ out.writeShort(flags.flags);
+ }
+
+ protected void writeAttributes(Attributes attributes) {
+ int size = attributes.size();
+ out.writeShort(size);
+ for (Attribute attr: attributes)
+ attributeWriter.write(attr, out);
+ }
+
+ protected void writeClassInfo() {
+ out.writeShort(classFile.this_class);
+ out.writeShort(classFile.super_class);
+ int[] interfaces = classFile.interfaces;
+ out.writeShort(interfaces.length);
+ for (int i: interfaces)
+ out.writeShort(i);
+ }
+
+ protected void writeDescriptor(Descriptor d) {
+ out.writeShort(d.index);
+ }
+
+ protected void writeConstantPool() {
+ ConstantPool pool = classFile.constant_pool;
+ int size = pool.size();
+ out.writeShort(size);
+ for (CPInfo cpInfo: pool.entries())
+ constantPoolWriter.write(cpInfo, out);
+ }
+
+ protected void writeFields() throws IOException {
+ Field[] fields = classFile.fields;
+ out.writeShort(fields.length);
+ for (Field f: fields)
+ writeField(f);
+ }
+
+ protected void writeField(Field f) throws IOException {
+ writeAccessFlags(f.access_flags);
+ out.writeShort(f.name_index);
+ writeDescriptor(f.descriptor);
+ writeAttributes(f.attributes);
+ }
+
+ protected void writeMethods() throws IOException {
+ Method[] methods = classFile.methods;
+ out.writeShort(methods.length);
+ for (Method m: methods) {
+ writeMethod(m);
+ }
+ }
+
+ protected void writeMethod(Method m) throws IOException {
+ writeAccessFlags(m.access_flags);
+ out.writeShort(m.name_index);
+ writeDescriptor(m.descriptor);
+ writeAttributes(m.attributes);
+ }
+
+ protected ClassFile classFile;
+ protected ClassOutputStream out;
+ protected AttributeWriter attributeWriter;
+ protected ConstantPoolWriter constantPoolWriter;
+
+ /**
+ * Subtype of ByteArrayOutputStream with the convenience methods of
+ * a DataOutputStream. Since ByteArrayOutputStream does not throw
+ * IOException, there are no exceptions from the additional
+ * convenience methods either,
+ */
+ protected static class ClassOutputStream extends ByteArrayOutputStream {
+ public ClassOutputStream() {
+ d = new DataOutputStream(this);
+ }
+
+ public void writeByte(int value) {
+ try {
+ d.writeByte(value);
+ } catch (IOException ignore) {
+ }
+ }
+
+ public void writeShort(int value) {
+ try {
+ d.writeShort(value);
+ } catch (IOException ignore) {
+ }
+ }
+
+ public void writeInt(int value) {
+ try {
+ d.writeInt(value);
+ } catch (IOException ignore) {
+ }
+ }
+
+ public void writeLong(long value) {
+ try {
+ d.writeLong(value);
+ } catch (IOException ignore) {
+ }
+ }
+
+ public void writeFloat(float value) {
+ try {
+ d.writeFloat(value);
+ } catch (IOException ignore) {
+ }
+ }
+
+ public void writeDouble(double value) {
+ try {
+ d.writeDouble(value);
+ } catch (IOException ignore) {
+ }
+ }
+
+ public void writeUTF(String value) {
+ try {
+ d.writeUTF(value);
+ } catch (IOException ignore) {
+ }
+ }
+
+ public void writeTo(ClassOutputStream s) {
+ try {
+ super.writeTo(s);
+ } catch (IOException ignore) {
+ }
+ }
+
+ private DataOutputStream d;
+ }
+
+ /**
+ * Writer for the entries in the constant pool.
+ */
+ protected static class ConstantPoolWriter
+ implements ConstantPool.Visitor {
+ protected int write(CPInfo info, ClassOutputStream out) {
+ out.writeByte(info.getTag());
+ return info.accept(this, out);
+ }
+
+ public Integer visitClass(CONSTANT_Class_info info, ClassOutputStream out) {
+ out.writeShort(info.name_index);
+ return 1;
+ }
+
+ public Integer visitDouble(CONSTANT_Double_info info, ClassOutputStream out) {
+ out.writeDouble(info.value);
+ return 2;
+ }
+
+ public Integer visitFieldref(CONSTANT_Fieldref_info info, ClassOutputStream out) {
+ writeRef(info, out);
+ return 1;
+ }
+
+ public Integer visitFloat(CONSTANT_Float_info info, ClassOutputStream out) {
+ out.writeFloat(info.value);
+ return 1;
+ }
+
+ public Integer visitInteger(CONSTANT_Integer_info info, ClassOutputStream out) {
+ out.writeInt(info.value);
+ return 1;
+ }
+
+ public Integer visitInterfaceMethodref(CONSTANT_InterfaceMethodref_info info, ClassOutputStream out) {
+ writeRef(info, out);
+ return 1;
+ }
+
+ public Integer visitInvokeDynamic(CONSTANT_InvokeDynamic_info info, ClassOutputStream out) {
+ out.writeShort(info.bootstrap_method_attr_index);
+ out.writeShort(info.name_and_type_index);
+ return 1;
+ }
+
+ public Integer visitLong(CONSTANT_Long_info info, ClassOutputStream out) {
+ out.writeLong(info.value);
+ return 2;
+ }
+
+ public Integer visitNameAndType(CONSTANT_NameAndType_info info, ClassOutputStream out) {
+ out.writeShort(info.name_index);
+ out.writeShort(info.type_index);
+ return 1;
+ }
+
+ public Integer visitMethodHandle(CONSTANT_MethodHandle_info info, ClassOutputStream out) {
+ out.writeByte(info.reference_kind.tag);
+ out.writeShort(info.reference_index);
+ return 1;
+ }
+
+ public Integer visitMethodType(CONSTANT_MethodType_info info, ClassOutputStream out) {
+ out.writeShort(info.descriptor_index);
+ return 1;
+ }
+
+ public Integer visitMethodref(CONSTANT_Methodref_info info, ClassOutputStream out) {
+ return writeRef(info, out);
+ }
+
+ public Integer visitString(CONSTANT_String_info info, ClassOutputStream out) {
+ out.writeShort(info.string_index);
+ return 1;
+ }
+
+ public Integer visitUtf8(CONSTANT_Utf8_info info, ClassOutputStream out) {
+ out.writeUTF(info.value);
+ return 1;
+ }
+
+ protected Integer writeRef(CPRefInfo info, ClassOutputStream out) {
+ out.writeShort(info.class_index);
+ out.writeShort(info.name_and_type_index);
+ return 1;
+ }
+ }
+
+ /**
+ * Writer for the different types of attribute.
+ */
+ protected static class AttributeWriter implements Attribute.Visitor {
+ public void write(Attributes attributes, ClassOutputStream out) {
+ int size = attributes.size();
+ out.writeShort(size);
+ for (Attribute a: attributes)
+ write(a, out);
+ }
+
+ // Note: due to the use of shared resources, this method is not reentrant.
+ public void write(Attribute attr, ClassOutputStream out) {
+ out.writeShort(attr.attribute_name_index);
+ sharedOut.reset();
+ attr.accept(this, sharedOut);
+ out.writeInt(sharedOut.size());
+ sharedOut.writeTo(out);
+ }
+
+ protected ClassOutputStream sharedOut = new ClassOutputStream();
+ protected AnnotationWriter annotationWriter = new AnnotationWriter();
+
+ public Void visitDefault(DefaultAttribute attr, ClassOutputStream out) {
+ out.write(attr.info, 0, attr.info.length);
+ return null;
+ }
+
+ public Void visitAnnotationDefault(AnnotationDefault_attribute attr, ClassOutputStream out) {
+ annotationWriter.write(attr.default_value, out);
+ return null;
+ }
+
+ public Void visitBootstrapMethods(BootstrapMethods_attribute attr, ClassOutputStream out) {
+ out.writeShort(attr.bootstrap_method_specifiers.length);
+ for (BootstrapMethods_attribute.BootstrapMethodSpecifier bsm : attr.bootstrap_method_specifiers) {
+ out.writeShort(bsm.bootstrap_method_ref);
+ int bsm_args_count = bsm.bootstrap_arguments.length;
+ out.writeShort(bsm_args_count);
+ for (int i : bsm.bootstrap_arguments) {
+ out.writeShort(i);
+ }
+ }
+ return null;
+ }
+
+ public Void visitCharacterRangeTable(CharacterRangeTable_attribute attr, ClassOutputStream out) {
+ out.writeShort(attr.character_range_table.length);
+ for (CharacterRangeTable_attribute.Entry e: attr.character_range_table)
+ writeCharacterRangeTableEntry(e, out);
+ return null;
+ }
+
+ protected void writeCharacterRangeTableEntry(CharacterRangeTable_attribute.Entry entry, ClassOutputStream out) {
+ out.writeShort(entry.start_pc);
+ out.writeShort(entry.end_pc);
+ out.writeInt(entry.character_range_start);
+ out.writeInt(entry.character_range_end);
+ out.writeShort(entry.flags);
+ }
+
+ public Void visitCode(Code_attribute attr, ClassOutputStream out) {
+ out.writeShort(attr.max_stack);
+ out.writeShort(attr.max_locals);
+ out.writeInt(attr.code.length);
+ out.write(attr.code, 0, attr.code.length);
+ out.writeShort(attr.exception_table.length);
+ for (Code_attribute.Exception_data e: attr.exception_table)
+ writeExceptionTableEntry(e, out);
+ new AttributeWriter().write(attr.attributes, out);
+ return null;
+ }
+
+ protected void writeExceptionTableEntry(Code_attribute.Exception_data exception_data, ClassOutputStream out) {
+ out.writeShort(exception_data.start_pc);
+ out.writeShort(exception_data.end_pc);
+ out.writeShort(exception_data.handler_pc);
+ out.writeShort(exception_data.catch_type);
+ }
+
+ public Void visitCompilationID(CompilationID_attribute attr, ClassOutputStream out) {
+ out.writeShort(attr.compilationID_index);
+ return null;
+ }
+
+ public Void visitConstantValue(ConstantValue_attribute attr, ClassOutputStream out) {
+ out.writeShort(attr.constantvalue_index);
+ return null;
+ }
+
+ public Void visitDeprecated(Deprecated_attribute attr, ClassOutputStream out) {
+ return null;
+ }
+
+ public Void visitEnclosingMethod(EnclosingMethod_attribute attr, ClassOutputStream out) {
+ out.writeShort(attr.class_index);
+ out.writeShort(attr.method_index);
+ return null;
+ }
+
+ public Void visitExceptions(Exceptions_attribute attr, ClassOutputStream out) {
+ out.writeShort(attr.exception_index_table.length);
+ for (int i: attr.exception_index_table)
+ out.writeShort(i);
+ return null;
+ }
+
+ public Void visitInnerClasses(InnerClasses_attribute attr, ClassOutputStream out) {
+ out.writeShort(attr.classes.length);
+ for (InnerClasses_attribute.Info info: attr.classes)
+ writeInnerClassesInfo(info, out);
+ return null;
+ }
+
+ protected void writeInnerClassesInfo(InnerClasses_attribute.Info info, ClassOutputStream out) {
+ out.writeShort(info.inner_class_info_index);
+ out.writeShort(info.outer_class_info_index);
+ out.writeShort(info.inner_name_index);
+ writeAccessFlags(info.inner_class_access_flags, out);
+ }
+
+ public Void visitLineNumberTable(LineNumberTable_attribute attr, ClassOutputStream out) {
+ out.writeShort(attr.line_number_table.length);
+ for (LineNumberTable_attribute.Entry e: attr.line_number_table)
+ writeLineNumberTableEntry(e, out);
+ return null;
+ }
+
+ protected void writeLineNumberTableEntry(LineNumberTable_attribute.Entry entry, ClassOutputStream out) {
+ out.writeShort(entry.start_pc);
+ out.writeShort(entry.line_number);
+ }
+
+ public Void visitLocalVariableTable(LocalVariableTable_attribute attr, ClassOutputStream out) {
+ out.writeShort(attr.local_variable_table.length);
+ for (LocalVariableTable_attribute.Entry e: attr.local_variable_table)
+ writeLocalVariableTableEntry(e, out);
+ return null;
+ }
+
+ protected void writeLocalVariableTableEntry(LocalVariableTable_attribute.Entry entry, ClassOutputStream out) {
+ out.writeShort(entry.start_pc);
+ out.writeShort(entry.length);
+ out.writeShort(entry.name_index);
+ out.writeShort(entry.descriptor_index);
+ out.writeShort(entry.index);
+ }
+
+ public Void visitLocalVariableTypeTable(LocalVariableTypeTable_attribute attr, ClassOutputStream out) {
+ out.writeShort(attr.local_variable_table.length);
+ for (LocalVariableTypeTable_attribute.Entry e: attr.local_variable_table)
+ writeLocalVariableTypeTableEntry(e, out);
+ return null;
+ }
+
+ protected void writeLocalVariableTypeTableEntry(LocalVariableTypeTable_attribute.Entry entry, ClassOutputStream out) {
+ out.writeShort(entry.start_pc);
+ out.writeShort(entry.length);
+ out.writeShort(entry.name_index);
+ out.writeShort(entry.signature_index);
+ out.writeShort(entry.index);
+ }
+
+ public Void visitMethodParameters(MethodParameters_attribute attr, ClassOutputStream out) {
+ out.writeByte(attr.method_parameter_table.length);
+ for (MethodParameters_attribute.Entry e : attr.method_parameter_table) {
+ out.writeShort(e.name_index);
+ out.writeShort(e.flags);
+ }
+ return null;
+ }
+
+ public Void visitRuntimeVisibleAnnotations(RuntimeVisibleAnnotations_attribute attr, ClassOutputStream out) {
+ annotationWriter.write(attr.annotations, out);
+ return null;
+ }
+
+ public Void visitRuntimeInvisibleAnnotations(RuntimeInvisibleAnnotations_attribute attr, ClassOutputStream out) {
+ annotationWriter.write(attr.annotations, out);
+ return null;
+ }
+
+ public Void visitRuntimeVisibleTypeAnnotations(RuntimeVisibleTypeAnnotations_attribute attr, ClassOutputStream out) {
+ annotationWriter.write(attr.annotations, out);
+ return null;
+ }
+
+ public Void visitRuntimeInvisibleTypeAnnotations(RuntimeInvisibleTypeAnnotations_attribute attr, ClassOutputStream out) {
+ annotationWriter.write(attr.annotations, out);
+ return null;
+ }
+
+ public Void visitRuntimeVisibleParameterAnnotations(RuntimeVisibleParameterAnnotations_attribute attr, ClassOutputStream out) {
+ out.writeByte(attr.parameter_annotations.length);
+ for (Annotation[] annos: attr.parameter_annotations)
+ annotationWriter.write(annos, out);
+ return null;
+ }
+
+ public Void visitRuntimeInvisibleParameterAnnotations(RuntimeInvisibleParameterAnnotations_attribute attr, ClassOutputStream out) {
+ out.writeByte(attr.parameter_annotations.length);
+ for (Annotation[] annos: attr.parameter_annotations)
+ annotationWriter.write(annos, out);
+ return null;
+ }
+
+ public Void visitSignature(Signature_attribute attr, ClassOutputStream out) {
+ out.writeShort(attr.signature_index);
+ return null;
+ }
+
+ public Void visitSourceDebugExtension(SourceDebugExtension_attribute attr, ClassOutputStream out) {
+ out.write(attr.debug_extension, 0, attr.debug_extension.length);
+ return null;
+ }
+
+ public Void visitSourceFile(SourceFile_attribute attr, ClassOutputStream out) {
+ out.writeShort(attr.sourcefile_index);
+ return null;
+ }
+
+ public Void visitSourceID(SourceID_attribute attr, ClassOutputStream out) {
+ out.writeShort(attr.sourceID_index);
+ return null;
+ }
+
+ public Void visitStackMap(StackMap_attribute attr, ClassOutputStream out) {
+ if (stackMapWriter == null)
+ stackMapWriter = new StackMapTableWriter();
+
+ out.writeShort(attr.entries.length);
+ for (stack_map_frame f: attr.entries)
+ stackMapWriter.write(f, out);
+ return null;
+ }
+
+ public Void visitStackMapTable(StackMapTable_attribute attr, ClassOutputStream out) {
+ if (stackMapWriter == null)
+ stackMapWriter = new StackMapTableWriter();
+
+ out.writeShort(attr.entries.length);
+ for (stack_map_frame f: attr.entries)
+ stackMapWriter.write(f, out);
+ return null;
+ }
+
+ public Void visitSynthetic(Synthetic_attribute attr, ClassOutputStream out) {
+ return null;
+ }
+
+ protected void writeAccessFlags(AccessFlags flags, ClassOutputStream p) {
+ sharedOut.writeShort(flags.flags);
+ }
+
+ protected StackMapTableWriter stackMapWriter;
+ }
+
+ /**
+ * Writer for the frames of StackMap and StackMapTable attributes.
+ */
+ protected static class StackMapTableWriter
+ implements stack_map_frame.Visitor {
+
+ public void write(stack_map_frame frame, ClassOutputStream out) {
+ out.write(frame.frame_type);
+ frame.accept(this, out);
+ }
+
+ public Void visit_same_frame(same_frame frame, ClassOutputStream p) {
+ return null;
+ }
+
+ public Void visit_same_locals_1_stack_item_frame(same_locals_1_stack_item_frame frame, ClassOutputStream out) {
+ writeVerificationTypeInfo(frame.stack[0], out);
+ return null;
+ }
+
+ public Void visit_same_locals_1_stack_item_frame_extended(same_locals_1_stack_item_frame_extended frame, ClassOutputStream out) {
+ out.writeShort(frame.offset_delta);
+ writeVerificationTypeInfo(frame.stack[0], out);
+ return null;
+ }
+
+ public Void visit_chop_frame(chop_frame frame, ClassOutputStream out) {
+ out.writeShort(frame.offset_delta);
+ return null;
+ }
+
+ public Void visit_same_frame_extended(same_frame_extended frame, ClassOutputStream out) {
+ out.writeShort(frame.offset_delta);
+ return null;
+ }
+
+ public Void visit_append_frame(append_frame frame, ClassOutputStream out) {
+ out.writeShort(frame.offset_delta);
+ for (verification_type_info l: frame.locals)
+ writeVerificationTypeInfo(l, out);
+ return null;
+ }
+
+ public Void visit_full_frame(full_frame frame, ClassOutputStream out) {
+ out.writeShort(frame.offset_delta);
+ out.writeShort(frame.locals.length);
+ for (verification_type_info l: frame.locals)
+ writeVerificationTypeInfo(l, out);
+ out.writeShort(frame.stack.length);
+ for (verification_type_info s: frame.stack)
+ writeVerificationTypeInfo(s, out);
+ return null;
+ }
+
+ protected void writeVerificationTypeInfo(verification_type_info info,
+ ClassOutputStream out) {
+ out.write(info.tag);
+ switch (info.tag) {
+ case ITEM_Top:
+ case ITEM_Integer:
+ case ITEM_Float:
+ case ITEM_Long:
+ case ITEM_Double:
+ case ITEM_Null:
+ case ITEM_UninitializedThis:
+ break;
+
+ case ITEM_Object:
+ Object_variable_info o = (Object_variable_info) info;
+ out.writeShort(o.cpool_index);
+ break;
+
+ case ITEM_Uninitialized:
+ Uninitialized_variable_info u = (Uninitialized_variable_info) info;
+ out.writeShort(u.offset);
+ break;
+
+ default:
+ throw new Error();
+ }
+ }
+ }
+
+ /**
+ * Writer for annotations and the values they contain.
+ */
+ protected static class AnnotationWriter
+ implements Annotation.element_value.Visitor {
+ public void write(Annotation[] annos, ClassOutputStream out) {
+ out.writeShort(annos.length);
+ for (Annotation anno: annos)
+ write(anno, out);
+ }
+
+ public void write(TypeAnnotation[] annos, ClassOutputStream out) {
+ out.writeShort(annos.length);
+ for (TypeAnnotation anno: annos)
+ write(anno, out);
+ }
+
+ public void write(Annotation anno, ClassOutputStream out) {
+ out.writeShort(anno.type_index);
+ out.writeShort(anno.element_value_pairs.length);
+ for (element_value_pair p: anno.element_value_pairs)
+ write(p, out);
+ }
+
+ public void write(TypeAnnotation anno, ClassOutputStream out) {
+ write(anno.position, out);
+ write(anno.annotation, out);
+ }
+
+ public void write(element_value_pair pair, ClassOutputStream out) {
+ out.writeShort(pair.element_name_index);
+ write(pair.value, out);
+ }
+
+ public void write(element_value ev, ClassOutputStream out) {
+ out.writeByte(ev.tag);
+ ev.accept(this, out);
+ }
+
+ public Void visitPrimitive(Primitive_element_value ev, ClassOutputStream out) {
+ out.writeShort(ev.const_value_index);
+ return null;
+ }
+
+ public Void visitEnum(Enum_element_value ev, ClassOutputStream out) {
+ out.writeShort(ev.type_name_index);
+ out.writeShort(ev.const_name_index);
+ return null;
+ }
+
+ public Void visitClass(Class_element_value ev, ClassOutputStream out) {
+ out.writeShort(ev.class_info_index);
+ return null;
+ }
+
+ public Void visitAnnotation(Annotation_element_value ev, ClassOutputStream out) {
+ write(ev.annotation_value, out);
+ return null;
+ }
+
+ public Void visitArray(Array_element_value ev, ClassOutputStream out) {
+ out.writeShort(ev.num_values);
+ for (element_value v: ev.values)
+ write(v, out);
+ return null;
+ }
+
+ // TODO: Move this to TypeAnnotation to be closer with similar logic?
+ private void write(TypeAnnotation.Position p, ClassOutputStream out) {
+ out.writeByte(p.type.targetTypeValue());
+ switch (p.type) {
+ // instanceof
+ case INSTANCEOF:
+ // new expression
+ case NEW:
+ // constructor/method reference receiver
+ case CONSTRUCTOR_REFERENCE:
+ case METHOD_REFERENCE:
+ out.writeShort(p.offset);
+ break;
+ // local variable
+ case LOCAL_VARIABLE:
+ // resource variable
+ case RESOURCE_VARIABLE:
+ int table_length = p.lvarOffset.length;
+ out.writeShort(table_length);
+ for (int i = 0; i < table_length; ++i) {
+ out.writeShort(1); // for table length
+ out.writeShort(p.lvarOffset[i]);
+ out.writeShort(p.lvarLength[i]);
+ out.writeShort(p.lvarIndex[i]);
+ }
+ break;
+ // exception parameter
+ case EXCEPTION_PARAMETER:
+ out.writeShort(p.exception_index);
+ break;
+ // method receiver
+ case METHOD_RECEIVER:
+ // Do nothing
+ break;
+ // type parameters
+ case CLASS_TYPE_PARAMETER:
+ case METHOD_TYPE_PARAMETER:
+ out.writeByte(p.parameter_index);
+ break;
+ // type parameters bounds
+ case CLASS_TYPE_PARAMETER_BOUND:
+ case METHOD_TYPE_PARAMETER_BOUND:
+ out.writeByte(p.parameter_index);
+ out.writeByte(p.bound_index);
+ break;
+ // class extends or implements clause
+ case CLASS_EXTENDS:
+ out.writeShort(p.type_index);
+ break;
+ // throws
+ case THROWS:
+ out.writeShort(p.type_index);
+ break;
+ // method parameter
+ case METHOD_FORMAL_PARAMETER:
+ out.writeByte(p.parameter_index);
+ break;
+ // type cast
+ case CAST:
+ // method/constructor/reference type argument
+ case CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT:
+ case METHOD_INVOCATION_TYPE_ARGUMENT:
+ case CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT:
+ case METHOD_REFERENCE_TYPE_ARGUMENT:
+ out.writeShort(p.offset);
+ out.writeByte(p.type_index);
+ break;
+ // We don't need to worry about these
+ case METHOD_RETURN:
+ case FIELD:
+ break;
+ case UNKNOWN:
+ throw new AssertionError("ClassWriter: UNKNOWN target type should never occur!");
+ default:
+ throw new AssertionError("ClassWriter: Unknown target type for position: " + p);
+ }
+
+ { // Append location data for generics/arrays.
+ // TODO: check for overrun?
+ out.writeByte((byte)p.location.size());
+ for (int i : TypeAnnotation.Position.getBinaryFromTypePath(p.location))
+ out.writeByte((byte)i);
+ }
+ }
+ }
+}
--- old/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Code_attribute.java 2015-05-26 21:42:18.895832815 -0700
+++ /dev/null 2015-04-26 22:05:36.465433038 -0700
@@ -1,159 +0,0 @@
-/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.classfile;
-
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-
-/**
- * See JVMS, section 4.8.3.
- *
- * This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own risk.
- * This code and its internal interfaces are subject to change or
- * deletion without notice.
- */
-public class Code_attribute extends Attribute {
- public static class InvalidIndex extends AttributeException {
- private static final long serialVersionUID = -8904527774589382802L;
- InvalidIndex(int index) {
- this.index = index;
- }
-
- @Override
- public String getMessage() {
- // i18n
- return "invalid index " + index + " in Code attribute";
- }
-
- public final int index;
- }
-
- Code_attribute(ClassReader cr, int name_index, int length)
- throws IOException, ConstantPoolException {
- super(name_index, length);
- max_stack = cr.readUnsignedShort();
- max_locals = cr.readUnsignedShort();
- code_length = cr.readInt();
- code = new byte[code_length];
- cr.readFully(code);
- exception_table_length = cr.readUnsignedShort();
- exception_table = new Exception_data[exception_table_length];
- for (int i = 0; i < exception_table_length; i++)
- exception_table[i] = new Exception_data(cr);
- attributes = new Attributes(cr);
- }
-
- public int getByte(int offset) throws InvalidIndex {
- if (offset < 0 || offset >= code.length)
- throw new InvalidIndex(offset);
- return code[offset];
- }
-
- public int getUnsignedByte(int offset) throws InvalidIndex {
- if (offset < 0 || offset >= code.length)
- throw new InvalidIndex(offset);
- return code[offset] & 0xff;
- }
-
- public int getShort(int offset) throws InvalidIndex {
- if (offset < 0 || offset + 1 >= code.length)
- throw new InvalidIndex(offset);
- return (code[offset] << 8) | (code[offset + 1] & 0xFF);
- }
-
- public int getUnsignedShort(int offset) throws InvalidIndex {
- if (offset < 0 || offset + 1 >= code.length)
- throw new InvalidIndex(offset);
- return ((code[offset] << 8) | (code[offset + 1] & 0xFF)) & 0xFFFF;
- }
-
- public int getInt(int offset) throws InvalidIndex {
- if (offset < 0 || offset + 3 >= code.length)
- throw new InvalidIndex(offset);
- return (getShort(offset) << 16) | (getShort(offset + 2) & 0xFFFF);
- }
-
- public R accept(Visitor visitor, D data) {
- return visitor.visitCode(this, data);
- }
-
- public Iterable getInstructions() {
- return new Iterable() {
- public Iterator iterator() {
- return new Iterator() {
-
- public boolean hasNext() {
- return (next != null);
- }
-
- public Instruction next() {
- if (next == null)
- throw new NoSuchElementException();
-
- current = next;
- pc += current.length();
- next = (pc < code.length ? new Instruction(code, pc) : null);
- return current;
- }
-
- public void remove() {
- throw new UnsupportedOperationException("Not supported.");
- }
-
- Instruction current = null;
- int pc = 0;
- Instruction next = new Instruction(code, pc);
-
- };
- }
-
- };
- }
-
- public final int max_stack;
- public final int max_locals;
- public final int code_length;
- public final byte[] code;
- public final int exception_table_length;
- public final Exception_data[] exception_table;
- public final Attributes attributes;
-
- public static class Exception_data {
- Exception_data(ClassReader cr) throws IOException {
- start_pc = cr.readUnsignedShort();
- end_pc = cr.readUnsignedShort();
- handler_pc = cr.readUnsignedShort();
- catch_type = cr.readUnsignedShort();
- }
-
- public final int start_pc;
- public final int end_pc;
- public final int handler_pc;
- public final int catch_type;
- }
-}
--- /dev/null 2015-04-26 22:05:36.465433038 -0700
+++ new/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Code_attribute.java 2015-05-26 21:42:18.719832813 -0700
@@ -0,0 +1,159 @@
+/*
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.classfile;
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+/**
+ * See JVMS, section 4.8.3.
+ *
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ */
+public class Code_attribute extends Attribute {
+ public static class InvalidIndex extends AttributeException {
+ private static final long serialVersionUID = -8904527774589382802L;
+ InvalidIndex(int index) {
+ this.index = index;
+ }
+
+ @Override
+ public String getMessage() {
+ // i18n
+ return "invalid index " + index + " in Code attribute";
+ }
+
+ public final int index;
+ }
+
+ Code_attribute(ClassReader cr, int name_index, int length)
+ throws IOException, ConstantPoolException {
+ super(name_index, length);
+ max_stack = cr.readUnsignedShort();
+ max_locals = cr.readUnsignedShort();
+ code_length = cr.readInt();
+ code = new byte[code_length];
+ cr.readFully(code);
+ exception_table_length = cr.readUnsignedShort();
+ exception_table = new Exception_data[exception_table_length];
+ for (int i = 0; i < exception_table_length; i++)
+ exception_table[i] = new Exception_data(cr);
+ attributes = new Attributes(cr);
+ }
+
+ public int getByte(int offset) throws InvalidIndex {
+ if (offset < 0 || offset >= code.length)
+ throw new InvalidIndex(offset);
+ return code[offset];
+ }
+
+ public int getUnsignedByte(int offset) throws InvalidIndex {
+ if (offset < 0 || offset >= code.length)
+ throw new InvalidIndex(offset);
+ return code[offset] & 0xff;
+ }
+
+ public int getShort(int offset) throws InvalidIndex {
+ if (offset < 0 || offset + 1 >= code.length)
+ throw new InvalidIndex(offset);
+ return (code[offset] << 8) | (code[offset + 1] & 0xFF);
+ }
+
+ public int getUnsignedShort(int offset) throws InvalidIndex {
+ if (offset < 0 || offset + 1 >= code.length)
+ throw new InvalidIndex(offset);
+ return ((code[offset] << 8) | (code[offset + 1] & 0xFF)) & 0xFFFF;
+ }
+
+ public int getInt(int offset) throws InvalidIndex {
+ if (offset < 0 || offset + 3 >= code.length)
+ throw new InvalidIndex(offset);
+ return (getShort(offset) << 16) | (getShort(offset + 2) & 0xFFFF);
+ }
+
+ public R accept(Visitor visitor, D data) {
+ return visitor.visitCode(this, data);
+ }
+
+ public Iterable getInstructions() {
+ return new Iterable() {
+ public Iterator iterator() {
+ return new Iterator() {
+
+ public boolean hasNext() {
+ return (next != null);
+ }
+
+ public Instruction next() {
+ if (next == null)
+ throw new NoSuchElementException();
+
+ current = next;
+ pc += current.length();
+ next = (pc < code.length ? new Instruction(code, pc) : null);
+ return current;
+ }
+
+ public void remove() {
+ throw new UnsupportedOperationException("Not supported.");
+ }
+
+ Instruction current = null;
+ int pc = 0;
+ Instruction next = new Instruction(code, pc);
+
+ };
+ }
+
+ };
+ }
+
+ public final int max_stack;
+ public final int max_locals;
+ public final int code_length;
+ public final byte[] code;
+ public final int exception_table_length;
+ public final Exception_data[] exception_table;
+ public final Attributes attributes;
+
+ public static class Exception_data {
+ Exception_data(ClassReader cr) throws IOException {
+ start_pc = cr.readUnsignedShort();
+ end_pc = cr.readUnsignedShort();
+ handler_pc = cr.readUnsignedShort();
+ catch_type = cr.readUnsignedShort();
+ }
+
+ public final int start_pc;
+ public final int end_pc;
+ public final int handler_pc;
+ public final int catch_type;
+ }
+}
--- old/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/CompilationID_attribute.java 2015-05-26 21:42:19.199832820 -0700
+++ /dev/null 2015-04-26 22:05:36.465433038 -0700
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.sun.tools.classfile;
-
-import java.io.IOException;
-
-/**
- * This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own risk.
- * This code and its internal interfaces are subject to change or
- * deletion without notice.
- */
-public class CompilationID_attribute extends Attribute {
-
- CompilationID_attribute(ClassReader cr, int name_index, int length) throws IOException {
- super(name_index, length);
- compilationID_index = cr.readUnsignedShort();
- }
-
- public CompilationID_attribute(ConstantPool constant_pool, int compilationID_index)
- throws ConstantPoolException {
- this(constant_pool.getUTF8Index(Attribute.CompilationID), compilationID_index);
- }
-
- public CompilationID_attribute(int name_index, int compilationID_index) {
- super(name_index, 2);
- this.compilationID_index = compilationID_index;
- }
-
- String getCompilationID(ConstantPool constant_pool)
- throws ConstantPoolException {
- return constant_pool.getUTF8Value(compilationID_index);
- }
-
- public R accept(Visitor visitor, D data) {
- return visitor.visitCompilationID(this, data);
- }
-
- public final int compilationID_index;
-}
--- /dev/null 2015-04-26 22:05:36.465433038 -0700
+++ new/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/CompilationID_attribute.java 2015-05-26 21:42:19.027832817 -0700
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.sun.tools.classfile;
+
+import java.io.IOException;
+
+/**
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ */
+public class CompilationID_attribute extends Attribute {
+
+ CompilationID_attribute(ClassReader cr, int name_index, int length) throws IOException {
+ super(name_index, length);
+ compilationID_index = cr.readUnsignedShort();
+ }
+
+ public CompilationID_attribute(ConstantPool constant_pool, int compilationID_index)
+ throws ConstantPoolException {
+ this(constant_pool.getUTF8Index(Attribute.CompilationID), compilationID_index);
+ }
+
+ public CompilationID_attribute(int name_index, int compilationID_index) {
+ super(name_index, 2);
+ this.compilationID_index = compilationID_index;
+ }
+
+ String getCompilationID(ConstantPool constant_pool)
+ throws ConstantPoolException {
+ return constant_pool.getUTF8Value(compilationID_index);
+ }
+
+ public R accept(Visitor visitor, D data) {
+ return visitor.visitCompilationID(this, data);
+ }
+
+ public final int compilationID_index;
+}
--- old/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/ConstantPool.java 2015-05-26 21:42:19.507832824 -0700
+++ /dev/null 2015-04-26 22:05:36.465433038 -0700
@@ -1,914 +0,0 @@
-/*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.classfile;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Iterator;
-
-/**
- * See JVMS, section 4.5.
- *
- * This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own risk.
- * This code and its internal interfaces are subject to change or
- * deletion without notice.
- */
-public class ConstantPool {
-
- public static class InvalidIndex extends ConstantPoolException {
- private static final long serialVersionUID = -4350294289300939730L;
- InvalidIndex(int index) {
- super(index);
- }
-
- @Override
- public String getMessage() {
- // i18n
- return "invalid index #" + index;
- }
- }
-
- public static class UnexpectedEntry extends ConstantPoolException {
- private static final long serialVersionUID = 6986335935377933211L;
- UnexpectedEntry(int index, int expected_tag, int found_tag) {
- super(index);
- this.expected_tag = expected_tag;
- this.found_tag = found_tag;
- }
-
- @Override
- public String getMessage() {
- // i18n?
- return "unexpected entry at #" + index + " -- expected tag " + expected_tag + ", found " + found_tag;
- }
-
- public final int expected_tag;
- public final int found_tag;
- }
-
- public static class InvalidEntry extends ConstantPoolException {
- private static final long serialVersionUID = 1000087545585204447L;
- InvalidEntry(int index, int tag) {
- super(index);
- this.tag = tag;
- }
-
- @Override
- public String getMessage() {
- // i18n?
- return "unexpected tag at #" + index + ": " + tag;
- }
-
- public final int tag;
- }
-
- public static class EntryNotFound extends ConstantPoolException {
- private static final long serialVersionUID = 2885537606468581850L;
- EntryNotFound(Object value) {
- super(-1);
- this.value = value;
- }
-
- @Override
- public String getMessage() {
- // i18n?
- return "value not found: " + value;
- }
-
- public final Object value;
- }
-
- public static final int CONSTANT_Utf8 = 1;
- public static final int CONSTANT_Integer = 3;
- public static final int CONSTANT_Float = 4;
- public static final int CONSTANT_Long = 5;
- public static final int CONSTANT_Double = 6;
- public static final int CONSTANT_Class = 7;
- public static final int CONSTANT_String = 8;
- public static final int CONSTANT_Fieldref = 9;
- public static final int CONSTANT_Methodref = 10;
- public static final int CONSTANT_InterfaceMethodref = 11;
- public static final int CONSTANT_NameAndType = 12;
- public static final int CONSTANT_MethodHandle = 15;
- public static final int CONSTANT_MethodType = 16;
- public static final int CONSTANT_InvokeDynamic = 18;
-
- public static enum RefKind {
- REF_getField(1, "getfield"),
- REF_getStatic(2, "getstatic"),
- REF_putField(3, "putfield"),
- REF_putStatic(4, "putstatic"),
- REF_invokeVirtual(5, "invokevirtual"),
- REF_invokeStatic(6, "invokestatic"),
- REF_invokeSpecial(7, "invokespecial"),
- REF_newInvokeSpecial(8, "newinvokespecial"),
- REF_invokeInterface(9, "invokeinterface");
-
- public final int tag;
- public final String name;
-
- RefKind(int tag, String name) {
- this.tag = tag;
- this.name = name;
- }
-
- static RefKind getRefkind(int tag) {
- switch(tag) {
- case 1:
- return REF_getField;
- case 2:
- return REF_getStatic;
- case 3:
- return REF_putField;
- case 4:
- return REF_putStatic;
- case 5:
- return REF_invokeVirtual;
- case 6:
- return REF_invokeStatic;
- case 7:
- return REF_invokeSpecial;
- case 8:
- return REF_newInvokeSpecial;
- case 9:
- return REF_invokeInterface;
- default:
- return null;
- }
- }
- }
-
- ConstantPool(ClassReader cr) throws IOException, InvalidEntry {
- int count = cr.readUnsignedShort();
- pool = new CPInfo[count];
- for (int i = 1; i < count; i++) {
- int tag = cr.readUnsignedByte();
- switch (tag) {
- case CONSTANT_Class:
- pool[i] = new CONSTANT_Class_info(this, cr);
- break;
-
- case CONSTANT_Double:
- pool[i] = new CONSTANT_Double_info(cr);
- i++;
- break;
-
- case CONSTANT_Fieldref:
- pool[i] = new CONSTANT_Fieldref_info(this, cr);
- break;
-
- case CONSTANT_Float:
- pool[i] = new CONSTANT_Float_info(cr);
- break;
-
- case CONSTANT_Integer:
- pool[i] = new CONSTANT_Integer_info(cr);
- break;
-
- case CONSTANT_InterfaceMethodref:
- pool[i] = new CONSTANT_InterfaceMethodref_info(this, cr);
- break;
-
- case CONSTANT_InvokeDynamic:
- pool[i] = new CONSTANT_InvokeDynamic_info(this, cr);
- break;
-
- case CONSTANT_Long:
- pool[i] = new CONSTANT_Long_info(cr);
- i++;
- break;
-
- case CONSTANT_MethodHandle:
- pool[i] = new CONSTANT_MethodHandle_info(this, cr);
- break;
-
- case CONSTANT_MethodType:
- pool[i] = new CONSTANT_MethodType_info(this, cr);
- break;
-
- case CONSTANT_Methodref:
- pool[i] = new CONSTANT_Methodref_info(this, cr);
- break;
-
- case CONSTANT_NameAndType:
- pool[i] = new CONSTANT_NameAndType_info(this, cr);
- break;
-
- case CONSTANT_String:
- pool[i] = new CONSTANT_String_info(this, cr);
- break;
-
- case CONSTANT_Utf8:
- pool[i] = new CONSTANT_Utf8_info(cr);
- break;
-
- default:
- throw new InvalidEntry(i, tag);
- }
- }
- }
-
- public ConstantPool(CPInfo[] pool) {
- this.pool = pool;
- }
-
- public int size() {
- return pool.length;
- }
-
- public int byteLength() {
- int length = 2;
- for (int i = 1; i < size(); ) {
- CPInfo cpInfo = pool[i];
- length += cpInfo.byteLength();
- i += cpInfo.size();
- }
- return length;
- }
-
- public CPInfo get(int index) throws InvalidIndex {
- if (index <= 0 || index >= pool.length)
- throw new InvalidIndex(index);
- CPInfo info = pool[index];
- if (info == null) {
- // this occurs for indices referencing the "second half" of an
- // 8 byte constant, such as CONSTANT_Double or CONSTANT_Long
- throw new InvalidIndex(index);
- }
- return pool[index];
- }
-
- private CPInfo get(int index, int expected_type) throws InvalidIndex, UnexpectedEntry {
- CPInfo info = get(index);
- if (info.getTag() != expected_type)
- throw new UnexpectedEntry(index, expected_type, info.getTag());
- return info;
- }
-
- public CONSTANT_Utf8_info getUTF8Info(int index) throws InvalidIndex, UnexpectedEntry {
- return ((CONSTANT_Utf8_info) get(index, CONSTANT_Utf8));
- }
-
- public CONSTANT_Class_info getClassInfo(int index) throws InvalidIndex, UnexpectedEntry {
- return ((CONSTANT_Class_info) get(index, CONSTANT_Class));
- }
-
- public CONSTANT_NameAndType_info getNameAndTypeInfo(int index) throws InvalidIndex, UnexpectedEntry {
- return ((CONSTANT_NameAndType_info) get(index, CONSTANT_NameAndType));
- }
-
- public String getUTF8Value(int index) throws InvalidIndex, UnexpectedEntry {
- return getUTF8Info(index).value;
- }
-
- public int getUTF8Index(String value) throws EntryNotFound {
- for (int i = 1; i < pool.length; i++) {
- CPInfo info = pool[i];
- if (info instanceof CONSTANT_Utf8_info &&
- ((CONSTANT_Utf8_info) info).value.equals(value))
- return i;
- }
- throw new EntryNotFound(value);
- }
-
- public Iterable entries() {
- return new Iterable() {
- public Iterator iterator() {
- return new Iterator() {
-
- public boolean hasNext() {
- return next < pool.length;
- }
-
- public CPInfo next() {
- current = pool[next];
- switch (current.getTag()) {
- case CONSTANT_Double:
- case CONSTANT_Long:
- next += 2;
- break;
- default:
- next += 1;
- }
- return current;
- }
-
- public void remove() {
- throw new UnsupportedOperationException();
- }
-
- private CPInfo current;
- private int next = 1;
-
- };
- }
- };
- }
-
- private CPInfo[] pool;
-
- public interface Visitor {
- R visitClass(CONSTANT_Class_info info, P p);
- R visitDouble(CONSTANT_Double_info info, P p);
- R visitFieldref(CONSTANT_Fieldref_info info, P p);
- R visitFloat(CONSTANT_Float_info info, P p);
- R visitInteger(CONSTANT_Integer_info info, P p);
- R visitInterfaceMethodref(CONSTANT_InterfaceMethodref_info info, P p);
- R visitInvokeDynamic(CONSTANT_InvokeDynamic_info info, P p);
- R visitLong(CONSTANT_Long_info info, P p);
- R visitNameAndType(CONSTANT_NameAndType_info info, P p);
- R visitMethodref(CONSTANT_Methodref_info info, P p);
- R visitMethodHandle(CONSTANT_MethodHandle_info info, P p);
- R visitMethodType(CONSTANT_MethodType_info info, P p);
- R visitString(CONSTANT_String_info info, P p);
- R visitUtf8(CONSTANT_Utf8_info info, P p);
- }
-
- public static abstract class CPInfo {
- CPInfo() {
- this.cp = null;
- }
-
- CPInfo(ConstantPool cp) {
- this.cp = cp;
- }
-
- public abstract int getTag();
-
- /** The number of slots in the constant pool used by this entry.
- * 2 for CONSTANT_Double and CONSTANT_Long; 1 for everything else. */
- public int size() {
- return 1;
- }
-
- public abstract int byteLength();
-
- public abstract R accept(Visitor visitor, D data);
-
- protected final ConstantPool cp;
- }
-
- public static abstract class CPRefInfo extends CPInfo {
- protected CPRefInfo(ConstantPool cp, ClassReader cr, int tag) throws IOException {
- super(cp);
- this.tag = tag;
- class_index = cr.readUnsignedShort();
- name_and_type_index = cr.readUnsignedShort();
- }
-
- protected CPRefInfo(ConstantPool cp, int tag, int class_index, int name_and_type_index) {
- super(cp);
- this.tag = tag;
- this.class_index = class_index;
- this.name_and_type_index = name_and_type_index;
- }
-
- public int getTag() {
- return tag;
- }
-
- public int byteLength() {
- return 5;
- }
-
- public CONSTANT_Class_info getClassInfo() throws ConstantPoolException {
- return cp.getClassInfo(class_index);
- }
-
- public String getClassName() throws ConstantPoolException {
- return cp.getClassInfo(class_index).getName();
- }
-
- public CONSTANT_NameAndType_info getNameAndTypeInfo() throws ConstantPoolException {
- return cp.getNameAndTypeInfo(name_and_type_index);
- }
-
- public final int tag;
- public final int class_index;
- public final int name_and_type_index;
- }
-
- public static class CONSTANT_Class_info extends CPInfo {
- CONSTANT_Class_info(ConstantPool cp, ClassReader cr) throws IOException {
- super(cp);
- name_index = cr.readUnsignedShort();
- }
-
- public CONSTANT_Class_info(ConstantPool cp, int name_index) {
- super(cp);
- this.name_index = name_index;
- }
-
- public int getTag() {
- return CONSTANT_Class;
- }
-
- public int byteLength() {
- return 3;
- }
-
- /**
- * Get the raw value of the class referenced by this constant pool entry.
- * This will either be the name of the class, in internal form, or a
- * descriptor for an array class.
- * @return the raw value of the class
- */
- public String getName() throws ConstantPoolException {
- return cp.getUTF8Value(name_index);
- }
-
- /**
- * If this constant pool entry identifies either a class or interface type,
- * or a possibly multi-dimensional array of a class of interface type,
- * return the name of the class or interface in internal form. Otherwise,
- * (i.e. if this is a possibly multi-dimensional array of a primitive type),
- * return null.
- * @return the base class or interface name
- */
- public String getBaseName() throws ConstantPoolException {
- String name = getName();
- if (name.startsWith("[")) {
- int index = name.indexOf("[L");
- if (index == -1)
- return null;
- return name.substring(index + 2, name.length() - 1);
- } else
- return name;
- }
-
- public int getDimensionCount() throws ConstantPoolException {
- String name = getName();
- int count = 0;
- while (name.charAt(count) == '[')
- count++;
- return count;
- }
-
- @Override
- public String toString() {
- return "CONSTANT_Class_info[name_index: " + name_index + "]";
- }
-
- public R accept(Visitor visitor, D data) {
- return visitor.visitClass(this, data);
- }
-
- public final int name_index;
- }
-
- public static class CONSTANT_Double_info extends CPInfo {
- CONSTANT_Double_info(ClassReader cr) throws IOException {
- value = cr.readDouble();
- }
-
- public CONSTANT_Double_info(double value) {
- this.value = value;
- }
-
- public int getTag() {
- return CONSTANT_Double;
- }
-
- public int byteLength() {
- return 9;
- }
-
- @Override
- public int size() {
- return 2;
- }
-
- @Override
- public String toString() {
- return "CONSTANT_Double_info[value: " + value + "]";
- }
-
- public R accept(Visitor visitor, D data) {
- return visitor.visitDouble(this, data);
- }
-
- public final double value;
- }
-
- public static class CONSTANT_Fieldref_info extends CPRefInfo {
- CONSTANT_Fieldref_info(ConstantPool cp, ClassReader cr) throws IOException {
- super(cp, cr, CONSTANT_Fieldref);
- }
-
- public CONSTANT_Fieldref_info(ConstantPool cp, int class_index, int name_and_type_index) {
- super(cp, CONSTANT_Fieldref, class_index, name_and_type_index);
- }
-
- @Override
- public String toString() {
- return "CONSTANT_Fieldref_info[class_index: " + class_index + ", name_and_type_index: " + name_and_type_index + "]";
- }
-
- public R accept(Visitor visitor, D data) {
- return visitor.visitFieldref(this, data);
- }
- }
-
- public static class CONSTANT_Float_info extends CPInfo {
- CONSTANT_Float_info(ClassReader cr) throws IOException {
- value = cr.readFloat();
- }
-
- public CONSTANT_Float_info(float value) {
- this.value = value;
- }
-
- public int getTag() {
- return CONSTANT_Float;
- }
-
- public int byteLength() {
- return 5;
- }
-
- @Override
- public String toString() {
- return "CONSTANT_Float_info[value: " + value + "]";
- }
-
- public R accept(Visitor visitor, D data) {
- return visitor.visitFloat(this, data);
- }
-
- public final float value;
- }
-
- public static class CONSTANT_Integer_info extends CPInfo {
- CONSTANT_Integer_info(ClassReader cr) throws IOException {
- value = cr.readInt();
- }
-
- public CONSTANT_Integer_info(int value) {
- this.value = value;
- }
-
- public int getTag() {
- return CONSTANT_Integer;
- }
-
- public int byteLength() {
- return 5;
- }
-
- @Override
- public String toString() {
- return "CONSTANT_Integer_info[value: " + value + "]";
- }
-
- public R accept(Visitor visitor, D data) {
- return visitor.visitInteger(this, data);
- }
-
- public final int value;
- }
-
- public static class CONSTANT_InterfaceMethodref_info extends CPRefInfo {
- CONSTANT_InterfaceMethodref_info(ConstantPool cp, ClassReader cr) throws IOException {
- super(cp, cr, CONSTANT_InterfaceMethodref);
- }
-
- public CONSTANT_InterfaceMethodref_info(ConstantPool cp, int class_index, int name_and_type_index) {
- super(cp, CONSTANT_InterfaceMethodref, class_index, name_and_type_index);
- }
-
- @Override
- public String toString() {
- return "CONSTANT_InterfaceMethodref_info[class_index: " + class_index + ", name_and_type_index: " + name_and_type_index + "]";
- }
-
- public R accept(Visitor visitor, D data) {
- return visitor.visitInterfaceMethodref(this, data);
- }
- }
-
- public static class CONSTANT_InvokeDynamic_info extends CPInfo {
- CONSTANT_InvokeDynamic_info(ConstantPool cp, ClassReader cr) throws IOException {
- super(cp);
- bootstrap_method_attr_index = cr.readUnsignedShort();
- name_and_type_index = cr.readUnsignedShort();
- }
-
- public CONSTANT_InvokeDynamic_info(ConstantPool cp, int bootstrap_method_index, int name_and_type_index) {
- super(cp);
- this.bootstrap_method_attr_index = bootstrap_method_index;
- this.name_and_type_index = name_and_type_index;
- }
-
- public int getTag() {
- return CONSTANT_InvokeDynamic;
- }
-
- public int byteLength() {
- return 5;
- }
-
- @Override
- public String toString() {
- return "CONSTANT_InvokeDynamic_info[bootstrap_method_index: " + bootstrap_method_attr_index + ", name_and_type_index: " + name_and_type_index + "]";
- }
-
- public R accept(Visitor visitor, D data) {
- return visitor.visitInvokeDynamic(this, data);
- }
-
- public CONSTANT_NameAndType_info getNameAndTypeInfo() throws ConstantPoolException {
- return cp.getNameAndTypeInfo(name_and_type_index);
- }
-
- public final int bootstrap_method_attr_index;
- public final int name_and_type_index;
- }
-
- public static class CONSTANT_Long_info extends CPInfo {
- CONSTANT_Long_info(ClassReader cr) throws IOException {
- value = cr.readLong();
- }
-
- public CONSTANT_Long_info(long value) {
- this.value = value;
- }
-
- public int getTag() {
- return CONSTANT_Long;
- }
-
- @Override
- public int size() {
- return 2;
- }
-
- public int byteLength() {
- return 9;
- }
-
- @Override
- public String toString() {
- return "CONSTANT_Long_info[value: " + value + "]";
- }
-
- public R accept(Visitor visitor, D data) {
- return visitor.visitLong(this, data);
- }
-
- public final long value;
- }
-
- public static class CONSTANT_MethodHandle_info extends CPInfo {
- CONSTANT_MethodHandle_info(ConstantPool cp, ClassReader cr) throws IOException {
- super(cp);
- reference_kind = RefKind.getRefkind(cr.readUnsignedByte());
- reference_index = cr.readUnsignedShort();
- }
-
- public CONSTANT_MethodHandle_info(ConstantPool cp, RefKind ref_kind, int member_index) {
- super(cp);
- this.reference_kind = ref_kind;
- this.reference_index = member_index;
- }
-
- public int getTag() {
- return CONSTANT_MethodHandle;
- }
-
- public int byteLength() {
- return 4;
- }
-
- @Override
- public String toString() {
- return "CONSTANT_MethodHandle_info[ref_kind: " + reference_kind + ", member_index: " + reference_index + "]";
- }
-
- public R accept(Visitor visitor, D data) {
- return visitor.visitMethodHandle(this, data);
- }
-
- public CPRefInfo getCPRefInfo() throws ConstantPoolException {
- int expected = CONSTANT_Methodref;
- int actual = cp.get(reference_index).getTag();
- // allow these tag types also:
- switch (actual) {
- case CONSTANT_Fieldref:
- case CONSTANT_InterfaceMethodref:
- expected = actual;
- }
- return (CPRefInfo) cp.get(reference_index, expected);
- }
-
- public final RefKind reference_kind;
- public final int reference_index;
- }
-
- public static class CONSTANT_MethodType_info extends CPInfo {
- CONSTANT_MethodType_info(ConstantPool cp, ClassReader cr) throws IOException {
- super(cp);
- descriptor_index = cr.readUnsignedShort();
- }
-
- public CONSTANT_MethodType_info(ConstantPool cp, int signature_index) {
- super(cp);
- this.descriptor_index = signature_index;
- }
-
- public int getTag() {
- return CONSTANT_MethodType;
- }
-
- public int byteLength() {
- return 3;
- }
-
- @Override
- public String toString() {
- return "CONSTANT_MethodType_info[signature_index: " + descriptor_index + "]";
- }
-
- public R accept(Visitor visitor, D data) {
- return visitor.visitMethodType(this, data);
- }
-
- public String getType() throws ConstantPoolException {
- return cp.getUTF8Value(descriptor_index);
- }
-
- public final int descriptor_index;
- }
-
- public static class CONSTANT_Methodref_info extends CPRefInfo {
- CONSTANT_Methodref_info(ConstantPool cp, ClassReader cr) throws IOException {
- super(cp, cr, CONSTANT_Methodref);
- }
-
- public CONSTANT_Methodref_info(ConstantPool cp, int class_index, int name_and_type_index) {
- super(cp, CONSTANT_Methodref, class_index, name_and_type_index);
- }
-
- @Override
- public String toString() {
- return "CONSTANT_Methodref_info[class_index: " + class_index + ", name_and_type_index: " + name_and_type_index + "]";
- }
-
- public R accept(Visitor visitor, D data) {
- return visitor.visitMethodref(this, data);
- }
- }
-
- public static class CONSTANT_NameAndType_info extends CPInfo {
- CONSTANT_NameAndType_info(ConstantPool cp, ClassReader cr) throws IOException {
- super(cp);
- name_index = cr.readUnsignedShort();
- type_index = cr.readUnsignedShort();
- }
-
- public CONSTANT_NameAndType_info(ConstantPool cp, int name_index, int type_index) {
- super(cp);
- this.name_index = name_index;
- this.type_index = type_index;
- }
-
- public int getTag() {
- return CONSTANT_NameAndType;
- }
-
- public int byteLength() {
- return 5;
- }
-
- public String getName() throws ConstantPoolException {
- return cp.getUTF8Value(name_index);
- }
-
- public String getType() throws ConstantPoolException {
- return cp.getUTF8Value(type_index);
- }
-
- public R accept(Visitor visitor, D data) {
- return visitor.visitNameAndType(this, data);
- }
-
- @Override
- public String toString() {
- return "CONSTANT_NameAndType_info[name_index: " + name_index + ", type_index: " + type_index + "]";
- }
-
- public final int name_index;
- public final int type_index;
- }
-
- public static class CONSTANT_String_info extends CPInfo {
- CONSTANT_String_info(ConstantPool cp, ClassReader cr) throws IOException {
- super(cp);
- string_index = cr.readUnsignedShort();
- }
-
- public CONSTANT_String_info(ConstantPool cp, int string_index) {
- super(cp);
- this.string_index = string_index;
- }
-
- public int getTag() {
- return CONSTANT_String;
- }
-
- public int byteLength() {
- return 3;
- }
-
- public String getString() throws ConstantPoolException {
- return cp.getUTF8Value(string_index);
- }
-
- public R accept(Visitor visitor, D data) {
- return visitor.visitString(this, data);
- }
-
- @Override
- public String toString() {
- return "CONSTANT_String_info[class_index: " + string_index + "]";
- }
-
- public final int string_index;
- }
-
- public static class CONSTANT_Utf8_info extends CPInfo {
- CONSTANT_Utf8_info(ClassReader cr) throws IOException {
- value = cr.readUTF();
- }
-
- public CONSTANT_Utf8_info(String value) {
- this.value = value;
- }
-
- public int getTag() {
- return CONSTANT_Utf8;
- }
-
- public int byteLength() {
- class SizeOutputStream extends OutputStream {
- @Override
- public void write(int b) {
- size++;
- }
- int size;
- }
- SizeOutputStream sizeOut = new SizeOutputStream();
- DataOutputStream out = new DataOutputStream(sizeOut);
- try { out.writeUTF(value); } catch (IOException ignore) { }
- return 1 + sizeOut.size;
- }
-
- @Override
- public String toString() {
- if (value.length() < 32 && isPrintableAscii(value))
- return "CONSTANT_Utf8_info[value: \"" + value + "\"]";
- else
- return "CONSTANT_Utf8_info[value: (" + value.length() + " chars)]";
- }
-
- static boolean isPrintableAscii(String s) {
- for (int i = 0; i < s.length(); i++) {
- char c = s.charAt(i);
- if (c < 32 || c >= 127)
- return false;
- }
- return true;
- }
-
- public R accept(Visitor visitor, D data) {
- return visitor.visitUtf8(this, data);
- }
-
- public final String value;
- }
-
-}
--- /dev/null 2015-04-26 22:05:36.465433038 -0700
+++ new/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ConstantPool.java 2015-05-26 21:42:19.331832822 -0700
@@ -0,0 +1,914 @@
+/*
+ * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.classfile;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Iterator;
+
+/**
+ * See JVMS, section 4.5.
+ *
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ */
+public class ConstantPool {
+
+ public static class InvalidIndex extends ConstantPoolException {
+ private static final long serialVersionUID = -4350294289300939730L;
+ InvalidIndex(int index) {
+ super(index);
+ }
+
+ @Override
+ public String getMessage() {
+ // i18n
+ return "invalid index #" + index;
+ }
+ }
+
+ public static class UnexpectedEntry extends ConstantPoolException {
+ private static final long serialVersionUID = 6986335935377933211L;
+ UnexpectedEntry(int index, int expected_tag, int found_tag) {
+ super(index);
+ this.expected_tag = expected_tag;
+ this.found_tag = found_tag;
+ }
+
+ @Override
+ public String getMessage() {
+ // i18n?
+ return "unexpected entry at #" + index + " -- expected tag " + expected_tag + ", found " + found_tag;
+ }
+
+ public final int expected_tag;
+ public final int found_tag;
+ }
+
+ public static class InvalidEntry extends ConstantPoolException {
+ private static final long serialVersionUID = 1000087545585204447L;
+ InvalidEntry(int index, int tag) {
+ super(index);
+ this.tag = tag;
+ }
+
+ @Override
+ public String getMessage() {
+ // i18n?
+ return "unexpected tag at #" + index + ": " + tag;
+ }
+
+ public final int tag;
+ }
+
+ public static class EntryNotFound extends ConstantPoolException {
+ private static final long serialVersionUID = 2885537606468581850L;
+ EntryNotFound(Object value) {
+ super(-1);
+ this.value = value;
+ }
+
+ @Override
+ public String getMessage() {
+ // i18n?
+ return "value not found: " + value;
+ }
+
+ public final Object value;
+ }
+
+ public static final int CONSTANT_Utf8 = 1;
+ public static final int CONSTANT_Integer = 3;
+ public static final int CONSTANT_Float = 4;
+ public static final int CONSTANT_Long = 5;
+ public static final int CONSTANT_Double = 6;
+ public static final int CONSTANT_Class = 7;
+ public static final int CONSTANT_String = 8;
+ public static final int CONSTANT_Fieldref = 9;
+ public static final int CONSTANT_Methodref = 10;
+ public static final int CONSTANT_InterfaceMethodref = 11;
+ public static final int CONSTANT_NameAndType = 12;
+ public static final int CONSTANT_MethodHandle = 15;
+ public static final int CONSTANT_MethodType = 16;
+ public static final int CONSTANT_InvokeDynamic = 18;
+
+ public static enum RefKind {
+ REF_getField(1, "getfield"),
+ REF_getStatic(2, "getstatic"),
+ REF_putField(3, "putfield"),
+ REF_putStatic(4, "putstatic"),
+ REF_invokeVirtual(5, "invokevirtual"),
+ REF_invokeStatic(6, "invokestatic"),
+ REF_invokeSpecial(7, "invokespecial"),
+ REF_newInvokeSpecial(8, "newinvokespecial"),
+ REF_invokeInterface(9, "invokeinterface");
+
+ public final int tag;
+ public final String name;
+
+ RefKind(int tag, String name) {
+ this.tag = tag;
+ this.name = name;
+ }
+
+ static RefKind getRefkind(int tag) {
+ switch(tag) {
+ case 1:
+ return REF_getField;
+ case 2:
+ return REF_getStatic;
+ case 3:
+ return REF_putField;
+ case 4:
+ return REF_putStatic;
+ case 5:
+ return REF_invokeVirtual;
+ case 6:
+ return REF_invokeStatic;
+ case 7:
+ return REF_invokeSpecial;
+ case 8:
+ return REF_newInvokeSpecial;
+ case 9:
+ return REF_invokeInterface;
+ default:
+ return null;
+ }
+ }
+ }
+
+ ConstantPool(ClassReader cr) throws IOException, InvalidEntry {
+ int count = cr.readUnsignedShort();
+ pool = new CPInfo[count];
+ for (int i = 1; i < count; i++) {
+ int tag = cr.readUnsignedByte();
+ switch (tag) {
+ case CONSTANT_Class:
+ pool[i] = new CONSTANT_Class_info(this, cr);
+ break;
+
+ case CONSTANT_Double:
+ pool[i] = new CONSTANT_Double_info(cr);
+ i++;
+ break;
+
+ case CONSTANT_Fieldref:
+ pool[i] = new CONSTANT_Fieldref_info(this, cr);
+ break;
+
+ case CONSTANT_Float:
+ pool[i] = new CONSTANT_Float_info(cr);
+ break;
+
+ case CONSTANT_Integer:
+ pool[i] = new CONSTANT_Integer_info(cr);
+ break;
+
+ case CONSTANT_InterfaceMethodref:
+ pool[i] = new CONSTANT_InterfaceMethodref_info(this, cr);
+ break;
+
+ case CONSTANT_InvokeDynamic:
+ pool[i] = new CONSTANT_InvokeDynamic_info(this, cr);
+ break;
+
+ case CONSTANT_Long:
+ pool[i] = new CONSTANT_Long_info(cr);
+ i++;
+ break;
+
+ case CONSTANT_MethodHandle:
+ pool[i] = new CONSTANT_MethodHandle_info(this, cr);
+ break;
+
+ case CONSTANT_MethodType:
+ pool[i] = new CONSTANT_MethodType_info(this, cr);
+ break;
+
+ case CONSTANT_Methodref:
+ pool[i] = new CONSTANT_Methodref_info(this, cr);
+ break;
+
+ case CONSTANT_NameAndType:
+ pool[i] = new CONSTANT_NameAndType_info(this, cr);
+ break;
+
+ case CONSTANT_String:
+ pool[i] = new CONSTANT_String_info(this, cr);
+ break;
+
+ case CONSTANT_Utf8:
+ pool[i] = new CONSTANT_Utf8_info(cr);
+ break;
+
+ default:
+ throw new InvalidEntry(i, tag);
+ }
+ }
+ }
+
+ public ConstantPool(CPInfo[] pool) {
+ this.pool = pool;
+ }
+
+ public int size() {
+ return pool.length;
+ }
+
+ public int byteLength() {
+ int length = 2;
+ for (int i = 1; i < size(); ) {
+ CPInfo cpInfo = pool[i];
+ length += cpInfo.byteLength();
+ i += cpInfo.size();
+ }
+ return length;
+ }
+
+ public CPInfo get(int index) throws InvalidIndex {
+ if (index <= 0 || index >= pool.length)
+ throw new InvalidIndex(index);
+ CPInfo info = pool[index];
+ if (info == null) {
+ // this occurs for indices referencing the "second half" of an
+ // 8 byte constant, such as CONSTANT_Double or CONSTANT_Long
+ throw new InvalidIndex(index);
+ }
+ return pool[index];
+ }
+
+ private CPInfo get(int index, int expected_type) throws InvalidIndex, UnexpectedEntry {
+ CPInfo info = get(index);
+ if (info.getTag() != expected_type)
+ throw new UnexpectedEntry(index, expected_type, info.getTag());
+ return info;
+ }
+
+ public CONSTANT_Utf8_info getUTF8Info(int index) throws InvalidIndex, UnexpectedEntry {
+ return ((CONSTANT_Utf8_info) get(index, CONSTANT_Utf8));
+ }
+
+ public CONSTANT_Class_info getClassInfo(int index) throws InvalidIndex, UnexpectedEntry {
+ return ((CONSTANT_Class_info) get(index, CONSTANT_Class));
+ }
+
+ public CONSTANT_NameAndType_info getNameAndTypeInfo(int index) throws InvalidIndex, UnexpectedEntry {
+ return ((CONSTANT_NameAndType_info) get(index, CONSTANT_NameAndType));
+ }
+
+ public String getUTF8Value(int index) throws InvalidIndex, UnexpectedEntry {
+ return getUTF8Info(index).value;
+ }
+
+ public int getUTF8Index(String value) throws EntryNotFound {
+ for (int i = 1; i < pool.length; i++) {
+ CPInfo info = pool[i];
+ if (info instanceof CONSTANT_Utf8_info &&
+ ((CONSTANT_Utf8_info) info).value.equals(value))
+ return i;
+ }
+ throw new EntryNotFound(value);
+ }
+
+ public Iterable entries() {
+ return new Iterable() {
+ public Iterator iterator() {
+ return new Iterator() {
+
+ public boolean hasNext() {
+ return next < pool.length;
+ }
+
+ public CPInfo next() {
+ current = pool[next];
+ switch (current.getTag()) {
+ case CONSTANT_Double:
+ case CONSTANT_Long:
+ next += 2;
+ break;
+ default:
+ next += 1;
+ }
+ return current;
+ }
+
+ public void remove() {
+ throw new UnsupportedOperationException();
+ }
+
+ private CPInfo current;
+ private int next = 1;
+
+ };
+ }
+ };
+ }
+
+ private CPInfo[] pool;
+
+ public interface Visitor {
+ R visitClass(CONSTANT_Class_info info, P p);
+ R visitDouble(CONSTANT_Double_info info, P p);
+ R visitFieldref(CONSTANT_Fieldref_info info, P p);
+ R visitFloat(CONSTANT_Float_info info, P p);
+ R visitInteger(CONSTANT_Integer_info info, P p);
+ R visitInterfaceMethodref(CONSTANT_InterfaceMethodref_info info, P p);
+ R visitInvokeDynamic(CONSTANT_InvokeDynamic_info info, P p);
+ R visitLong(CONSTANT_Long_info info, P p);
+ R visitNameAndType(CONSTANT_NameAndType_info info, P p);
+ R visitMethodref(CONSTANT_Methodref_info info, P p);
+ R visitMethodHandle(CONSTANT_MethodHandle_info info, P p);
+ R visitMethodType(CONSTANT_MethodType_info info, P p);
+ R visitString(CONSTANT_String_info info, P p);
+ R visitUtf8(CONSTANT_Utf8_info info, P p);
+ }
+
+ public static abstract class CPInfo {
+ CPInfo() {
+ this.cp = null;
+ }
+
+ CPInfo(ConstantPool cp) {
+ this.cp = cp;
+ }
+
+ public abstract int getTag();
+
+ /** The number of slots in the constant pool used by this entry.
+ * 2 for CONSTANT_Double and CONSTANT_Long; 1 for everything else. */
+ public int size() {
+ return 1;
+ }
+
+ public abstract int byteLength();
+
+ public abstract R accept(Visitor visitor, D data);
+
+ protected final ConstantPool cp;
+ }
+
+ public static abstract class CPRefInfo extends CPInfo {
+ protected CPRefInfo(ConstantPool cp, ClassReader cr, int tag) throws IOException {
+ super(cp);
+ this.tag = tag;
+ class_index = cr.readUnsignedShort();
+ name_and_type_index = cr.readUnsignedShort();
+ }
+
+ protected CPRefInfo(ConstantPool cp, int tag, int class_index, int name_and_type_index) {
+ super(cp);
+ this.tag = tag;
+ this.class_index = class_index;
+ this.name_and_type_index = name_and_type_index;
+ }
+
+ public int getTag() {
+ return tag;
+ }
+
+ public int byteLength() {
+ return 5;
+ }
+
+ public CONSTANT_Class_info getClassInfo() throws ConstantPoolException {
+ return cp.getClassInfo(class_index);
+ }
+
+ public String getClassName() throws ConstantPoolException {
+ return cp.getClassInfo(class_index).getName();
+ }
+
+ public CONSTANT_NameAndType_info getNameAndTypeInfo() throws ConstantPoolException {
+ return cp.getNameAndTypeInfo(name_and_type_index);
+ }
+
+ public final int tag;
+ public final int class_index;
+ public final int name_and_type_index;
+ }
+
+ public static class CONSTANT_Class_info extends CPInfo {
+ CONSTANT_Class_info(ConstantPool cp, ClassReader cr) throws IOException {
+ super(cp);
+ name_index = cr.readUnsignedShort();
+ }
+
+ public CONSTANT_Class_info(ConstantPool cp, int name_index) {
+ super(cp);
+ this.name_index = name_index;
+ }
+
+ public int getTag() {
+ return CONSTANT_Class;
+ }
+
+ public int byteLength() {
+ return 3;
+ }
+
+ /**
+ * Get the raw value of the class referenced by this constant pool entry.
+ * This will either be the name of the class, in internal form, or a
+ * descriptor for an array class.
+ * @return the raw value of the class
+ */
+ public String getName() throws ConstantPoolException {
+ return cp.getUTF8Value(name_index);
+ }
+
+ /**
+ * If this constant pool entry identifies either a class or interface type,
+ * or a possibly multi-dimensional array of a class of interface type,
+ * return the name of the class or interface in internal form. Otherwise,
+ * (i.e. if this is a possibly multi-dimensional array of a primitive type),
+ * return null.
+ * @return the base class or interface name
+ */
+ public String getBaseName() throws ConstantPoolException {
+ String name = getName();
+ if (name.startsWith("[")) {
+ int index = name.indexOf("[L");
+ if (index == -1)
+ return null;
+ return name.substring(index + 2, name.length() - 1);
+ } else
+ return name;
+ }
+
+ public int getDimensionCount() throws ConstantPoolException {
+ String name = getName();
+ int count = 0;
+ while (name.charAt(count) == '[')
+ count++;
+ return count;
+ }
+
+ @Override
+ public String toString() {
+ return "CONSTANT_Class_info[name_index: " + name_index + "]";
+ }
+
+ public R accept(Visitor visitor, D data) {
+ return visitor.visitClass(this, data);
+ }
+
+ public final int name_index;
+ }
+
+ public static class CONSTANT_Double_info extends CPInfo {
+ CONSTANT_Double_info(ClassReader cr) throws IOException {
+ value = cr.readDouble();
+ }
+
+ public CONSTANT_Double_info(double value) {
+ this.value = value;
+ }
+
+ public int getTag() {
+ return CONSTANT_Double;
+ }
+
+ public int byteLength() {
+ return 9;
+ }
+
+ @Override
+ public int size() {
+ return 2;
+ }
+
+ @Override
+ public String toString() {
+ return "CONSTANT_Double_info[value: " + value + "]";
+ }
+
+ public R accept(Visitor visitor, D data) {
+ return visitor.visitDouble(this, data);
+ }
+
+ public final double value;
+ }
+
+ public static class CONSTANT_Fieldref_info extends CPRefInfo {
+ CONSTANT_Fieldref_info(ConstantPool cp, ClassReader cr) throws IOException {
+ super(cp, cr, CONSTANT_Fieldref);
+ }
+
+ public CONSTANT_Fieldref_info(ConstantPool cp, int class_index, int name_and_type_index) {
+ super(cp, CONSTANT_Fieldref, class_index, name_and_type_index);
+ }
+
+ @Override
+ public String toString() {
+ return "CONSTANT_Fieldref_info[class_index: " + class_index + ", name_and_type_index: " + name_and_type_index + "]";
+ }
+
+ public R accept(Visitor visitor, D data) {
+ return visitor.visitFieldref(this, data);
+ }
+ }
+
+ public static class CONSTANT_Float_info extends CPInfo {
+ CONSTANT_Float_info(ClassReader cr) throws IOException {
+ value = cr.readFloat();
+ }
+
+ public CONSTANT_Float_info(float value) {
+ this.value = value;
+ }
+
+ public int getTag() {
+ return CONSTANT_Float;
+ }
+
+ public int byteLength() {
+ return 5;
+ }
+
+ @Override
+ public String toString() {
+ return "CONSTANT_Float_info[value: " + value + "]";
+ }
+
+ public R accept(Visitor visitor, D data) {
+ return visitor.visitFloat(this, data);
+ }
+
+ public final float value;
+ }
+
+ public static class CONSTANT_Integer_info extends CPInfo {
+ CONSTANT_Integer_info(ClassReader cr) throws IOException {
+ value = cr.readInt();
+ }
+
+ public CONSTANT_Integer_info(int value) {
+ this.value = value;
+ }
+
+ public int getTag() {
+ return CONSTANT_Integer;
+ }
+
+ public int byteLength() {
+ return 5;
+ }
+
+ @Override
+ public String toString() {
+ return "CONSTANT_Integer_info[value: " + value + "]";
+ }
+
+ public R accept(Visitor visitor, D data) {
+ return visitor.visitInteger(this, data);
+ }
+
+ public final int value;
+ }
+
+ public static class CONSTANT_InterfaceMethodref_info extends CPRefInfo {
+ CONSTANT_InterfaceMethodref_info(ConstantPool cp, ClassReader cr) throws IOException {
+ super(cp, cr, CONSTANT_InterfaceMethodref);
+ }
+
+ public CONSTANT_InterfaceMethodref_info(ConstantPool cp, int class_index, int name_and_type_index) {
+ super(cp, CONSTANT_InterfaceMethodref, class_index, name_and_type_index);
+ }
+
+ @Override
+ public String toString() {
+ return "CONSTANT_InterfaceMethodref_info[class_index: " + class_index + ", name_and_type_index: " + name_and_type_index + "]";
+ }
+
+ public R accept(Visitor visitor, D data) {
+ return visitor.visitInterfaceMethodref(this, data);
+ }
+ }
+
+ public static class CONSTANT_InvokeDynamic_info extends CPInfo {
+ CONSTANT_InvokeDynamic_info(ConstantPool cp, ClassReader cr) throws IOException {
+ super(cp);
+ bootstrap_method_attr_index = cr.readUnsignedShort();
+ name_and_type_index = cr.readUnsignedShort();
+ }
+
+ public CONSTANT_InvokeDynamic_info(ConstantPool cp, int bootstrap_method_index, int name_and_type_index) {
+ super(cp);
+ this.bootstrap_method_attr_index = bootstrap_method_index;
+ this.name_and_type_index = name_and_type_index;
+ }
+
+ public int getTag() {
+ return CONSTANT_InvokeDynamic;
+ }
+
+ public int byteLength() {
+ return 5;
+ }
+
+ @Override
+ public String toString() {
+ return "CONSTANT_InvokeDynamic_info[bootstrap_method_index: " + bootstrap_method_attr_index + ", name_and_type_index: " + name_and_type_index + "]";
+ }
+
+ public R accept(Visitor visitor, D data) {
+ return visitor.visitInvokeDynamic(this, data);
+ }
+
+ public CONSTANT_NameAndType_info getNameAndTypeInfo() throws ConstantPoolException {
+ return cp.getNameAndTypeInfo(name_and_type_index);
+ }
+
+ public final int bootstrap_method_attr_index;
+ public final int name_and_type_index;
+ }
+
+ public static class CONSTANT_Long_info extends CPInfo {
+ CONSTANT_Long_info(ClassReader cr) throws IOException {
+ value = cr.readLong();
+ }
+
+ public CONSTANT_Long_info(long value) {
+ this.value = value;
+ }
+
+ public int getTag() {
+ return CONSTANT_Long;
+ }
+
+ @Override
+ public int size() {
+ return 2;
+ }
+
+ public int byteLength() {
+ return 9;
+ }
+
+ @Override
+ public String toString() {
+ return "CONSTANT_Long_info[value: " + value + "]";
+ }
+
+ public R accept(Visitor visitor, D data) {
+ return visitor.visitLong(this, data);
+ }
+
+ public final long value;
+ }
+
+ public static class CONSTANT_MethodHandle_info extends CPInfo {
+ CONSTANT_MethodHandle_info(ConstantPool cp, ClassReader cr) throws IOException {
+ super(cp);
+ reference_kind = RefKind.getRefkind(cr.readUnsignedByte());
+ reference_index = cr.readUnsignedShort();
+ }
+
+ public CONSTANT_MethodHandle_info(ConstantPool cp, RefKind ref_kind, int member_index) {
+ super(cp);
+ this.reference_kind = ref_kind;
+ this.reference_index = member_index;
+ }
+
+ public int getTag() {
+ return CONSTANT_MethodHandle;
+ }
+
+ public int byteLength() {
+ return 4;
+ }
+
+ @Override
+ public String toString() {
+ return "CONSTANT_MethodHandle_info[ref_kind: " + reference_kind + ", member_index: " + reference_index + "]";
+ }
+
+ public R accept(Visitor visitor, D data) {
+ return visitor.visitMethodHandle(this, data);
+ }
+
+ public CPRefInfo getCPRefInfo() throws ConstantPoolException {
+ int expected = CONSTANT_Methodref;
+ int actual = cp.get(reference_index).getTag();
+ // allow these tag types also:
+ switch (actual) {
+ case CONSTANT_Fieldref:
+ case CONSTANT_InterfaceMethodref:
+ expected = actual;
+ }
+ return (CPRefInfo) cp.get(reference_index, expected);
+ }
+
+ public final RefKind reference_kind;
+ public final int reference_index;
+ }
+
+ public static class CONSTANT_MethodType_info extends CPInfo {
+ CONSTANT_MethodType_info(ConstantPool cp, ClassReader cr) throws IOException {
+ super(cp);
+ descriptor_index = cr.readUnsignedShort();
+ }
+
+ public CONSTANT_MethodType_info(ConstantPool cp, int signature_index) {
+ super(cp);
+ this.descriptor_index = signature_index;
+ }
+
+ public int getTag() {
+ return CONSTANT_MethodType;
+ }
+
+ public int byteLength() {
+ return 3;
+ }
+
+ @Override
+ public String toString() {
+ return "CONSTANT_MethodType_info[signature_index: " + descriptor_index + "]";
+ }
+
+ public R accept(Visitor visitor, D data) {
+ return visitor.visitMethodType(this, data);
+ }
+
+ public String getType() throws ConstantPoolException {
+ return cp.getUTF8Value(descriptor_index);
+ }
+
+ public final int descriptor_index;
+ }
+
+ public static class CONSTANT_Methodref_info extends CPRefInfo {
+ CONSTANT_Methodref_info(ConstantPool cp, ClassReader cr) throws IOException {
+ super(cp, cr, CONSTANT_Methodref);
+ }
+
+ public CONSTANT_Methodref_info(ConstantPool cp, int class_index, int name_and_type_index) {
+ super(cp, CONSTANT_Methodref, class_index, name_and_type_index);
+ }
+
+ @Override
+ public String toString() {
+ return "CONSTANT_Methodref_info[class_index: " + class_index + ", name_and_type_index: " + name_and_type_index + "]";
+ }
+
+ public R accept(Visitor visitor, D data) {
+ return visitor.visitMethodref(this, data);
+ }
+ }
+
+ public static class CONSTANT_NameAndType_info extends CPInfo {
+ CONSTANT_NameAndType_info(ConstantPool cp, ClassReader cr) throws IOException {
+ super(cp);
+ name_index = cr.readUnsignedShort();
+ type_index = cr.readUnsignedShort();
+ }
+
+ public CONSTANT_NameAndType_info(ConstantPool cp, int name_index, int type_index) {
+ super(cp);
+ this.name_index = name_index;
+ this.type_index = type_index;
+ }
+
+ public int getTag() {
+ return CONSTANT_NameAndType;
+ }
+
+ public int byteLength() {
+ return 5;
+ }
+
+ public String getName() throws ConstantPoolException {
+ return cp.getUTF8Value(name_index);
+ }
+
+ public String getType() throws ConstantPoolException {
+ return cp.getUTF8Value(type_index);
+ }
+
+ public R accept(Visitor visitor, D data) {
+ return visitor.visitNameAndType(this, data);
+ }
+
+ @Override
+ public String toString() {
+ return "CONSTANT_NameAndType_info[name_index: " + name_index + ", type_index: " + type_index + "]";
+ }
+
+ public final int name_index;
+ public final int type_index;
+ }
+
+ public static class CONSTANT_String_info extends CPInfo {
+ CONSTANT_String_info(ConstantPool cp, ClassReader cr) throws IOException {
+ super(cp);
+ string_index = cr.readUnsignedShort();
+ }
+
+ public CONSTANT_String_info(ConstantPool cp, int string_index) {
+ super(cp);
+ this.string_index = string_index;
+ }
+
+ public int getTag() {
+ return CONSTANT_String;
+ }
+
+ public int byteLength() {
+ return 3;
+ }
+
+ public String getString() throws ConstantPoolException {
+ return cp.getUTF8Value(string_index);
+ }
+
+ public R accept(Visitor visitor, D data) {
+ return visitor.visitString(this, data);
+ }
+
+ @Override
+ public String toString() {
+ return "CONSTANT_String_info[class_index: " + string_index + "]";
+ }
+
+ public final int string_index;
+ }
+
+ public static class CONSTANT_Utf8_info extends CPInfo {
+ CONSTANT_Utf8_info(ClassReader cr) throws IOException {
+ value = cr.readUTF();
+ }
+
+ public CONSTANT_Utf8_info(String value) {
+ this.value = value;
+ }
+
+ public int getTag() {
+ return CONSTANT_Utf8;
+ }
+
+ public int byteLength() {
+ class SizeOutputStream extends OutputStream {
+ @Override
+ public void write(int b) {
+ size++;
+ }
+ int size;
+ }
+ SizeOutputStream sizeOut = new SizeOutputStream();
+ DataOutputStream out = new DataOutputStream(sizeOut);
+ try { out.writeUTF(value); } catch (IOException ignore) { }
+ return 1 + sizeOut.size;
+ }
+
+ @Override
+ public String toString() {
+ if (value.length() < 32 && isPrintableAscii(value))
+ return "CONSTANT_Utf8_info[value: \"" + value + "\"]";
+ else
+ return "CONSTANT_Utf8_info[value: (" + value.length() + " chars)]";
+ }
+
+ static boolean isPrintableAscii(String s) {
+ for (int i = 0; i < s.length(); i++) {
+ char c = s.charAt(i);
+ if (c < 32 || c >= 127)
+ return false;
+ }
+ return true;
+ }
+
+ public