changeset 47022:1d2eb4f23b71

Merge
author sspitsyn
date Mon, 28 Aug 2017 07:53:26 +0000
parents 9f639c395a14 5ae11f15e343
children c4d5e9974766 10283559cc3c e28c8b19ffb2
files jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/Constants.java jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/ExceptionConstants.java jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionConstants.java jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassLoader.java jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassLoaderRepository.java jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassVector.java jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/SecuritySupport.java jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/PolicyFile.java jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/SolarisNumericGroupPrincipal.java jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/SolarisNumericUserPrincipal.java jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/SolarisPrincipal.java jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/X500Principal.java jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/SolarisLoginModule.java jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/SolarisSystem.java jdk/src/jdk.security.auth/solaris/native/libjaas/Solaris.c langtools/test/jdk/jshell/MergedTabShiftTabCommandTest.java langtools/test/jdk/jshell/MergedTabShiftTabExpressionTest.java
diffstat 451 files changed, 37420 insertions(+), 25428 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Aug 28 00:49:06 2017 -0700
+++ b/.hgtags	Mon Aug 28 07:53:26 2017 +0000
@@ -1,3 +1,4 @@
+3cc80be736f24704e505ad8ddaa598dec3fa2ed3 jdk-9+181
 e2b70be325bd10dae4c06f74c46d70d480854916 jdk-9+179
 5b16a1c3ccffff2a82c88bb7ea894c4ff1c9ebde jdk-9+180
 43bf6f30fcba031ecf0cc7e511efe3a8179d0f77 jdk-9+176
@@ -442,3 +443,4 @@
 4bbea012e5676e8025ade2bcfab4d6581e6e9f4b jdk-10+16
 7db699468b4f84abbcc01647e5a964409737411a jdk-10+17
 3739654290616e533fc6f51bf9ad69ed47a6abba jdk-10+18
+14df107500cc3b8ab238c3e4ad2c74e12bfe6067 jdk-10+19
--- a/.hgtags-top-repo	Mon Aug 28 00:49:06 2017 -0700
+++ b/.hgtags-top-repo	Mon Aug 28 07:53:26 2017 +0000
@@ -441,3 +441,6 @@
 252475ccfd84cc249f8d6faf4b7806b5e2c384ce jdk-9+179
 a133a7d1007b1456bc62824382fd8ac93b45d329 jdk-10+17
 536b81db8075486ca0fe3225d8e59313df5b936c jdk-10+18
+b803e6cff41e72a1e6d8782e1ef7c25a6e3e5ee3 jdk-10+19
+d2982a786f53814367698e63efe6349c9128e1db jdk-9+180
+b656dea9398ef601f7fc08d1a5157a560e0ccbe0 jdk-9+181
--- a/corba/.hgtags	Mon Aug 28 00:49:06 2017 -0700
+++ b/corba/.hgtags	Mon Aug 28 07:53:26 2017 +0000
@@ -441,3 +441,6 @@
 24390da83c5ee9e23ceafbcaff4460a01e37bb3a jdk-9+179
 50ff1fd66362f212a8db6de76089d9d0ffa4df0f jdk-10+17
 a923b3f30e7bddb4f960059ddfc7978fc63e2e6e jdk-10+18
+28488561cfbcfa4d0d9c489e8afe0155f4231360 jdk-10+19
+6ce6cb8ff41c71c49f23b15e0f0468aca5d52b17 jdk-9+180
+ba71941ad9dba53b8fffb30602ef673eee88696c jdk-9+181
--- a/hotspot/.hgtags	Mon Aug 28 00:49:06 2017 -0700
+++ b/hotspot/.hgtags	Mon Aug 28 07:53:26 2017 +0000
@@ -601,3 +601,6 @@
 d2661aa42bff322badbe6c1337fc638d2e0f5730 jdk-9+179
 73e2cb8700bfa51304bd4b02f224620859a3f600 jdk-10+17
 c9d3317623d48da3327232c81e3f8cfc0d29d888 jdk-10+18
+33b74e13c1457f36041addb8b850831f81ca6e9f jdk-10+19
+d7baadc223e790c08bc69bf7e553bce65b4e7e40 jdk-9+180
+4a443796f6f57842d6a0434ac27ca3d1033ccc20 jdk-9+181
--- a/hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp	Mon Aug 28 00:49:06 2017 -0700
+++ b/hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp	Mon Aug 28 07:53:26 2017 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2017, 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
@@ -4389,6 +4389,15 @@
   rp->verify_no_references_recorded();
   assert(!rp->discovery_enabled(), "should have been disabled");
 
+  // If during an initial mark pause we install a pending list head which is not otherwise reachable
+  // ensure that it is marked in the bitmap for concurrent marking to discover.
+  if (collector_state()->during_initial_mark_pause()) {
+    oop pll_head = Universe::reference_pending_list();
+    if (pll_head != NULL) {
+      _cm->grayRoot(pll_head);
+    }
+  }
+
   // FIXME
   // CM's reference processing also cleans up the string and symbol tables.
   // Should we do that here also? We could, but it is a serial operation
--- a/hotspot/src/share/vm/memory/universe.cpp	Mon Aug 28 00:49:06 2017 -0700
+++ b/hotspot/src/share/vm/memory/universe.cpp	Mon Aug 28 07:53:26 2017 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -497,7 +497,11 @@
 #define assert_pll_ownership() assert_pll_locked(owned_by_self)
 
 oop Universe::reference_pending_list() {
-  assert_pll_ownership();
+  if (Thread::current()->is_VM_thread()) {
+    assert_pll_locked(is_locked);
+  } else {
+    assert_pll_ownership();
+  }
   return _reference_pending_list;
 }
 
--- a/jaxp/.hgtags	Mon Aug 28 00:49:06 2017 -0700
+++ b/jaxp/.hgtags	Mon Aug 28 07:53:26 2017 +0000
@@ -441,3 +441,6 @@
 87243a3131f79e8b3903eaca6b629abc48f08ace jdk-9+179
 97d6f14334cfd766f57c296a5a707c8a709aeff0 jdk-10+17
 7ba7ebbc304a4817e05b72efa6b45ed635839b98 jdk-10+18
+f5789425c26cee0274d0e2ebabb21faf268f218f jdk-10+19
+9934a03646f91ce55f61f53d8448c629828f8088 jdk-9+180
+ea18d767c9ec50ea7f40bbe6cf7379d3538110f1 jdk-9+181
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/Const.java	Mon Aug 28 07:53:26 2017 +0000
@@ -0,0 +1,3527 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.sun.org.apache.bcel.internal;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+/**
+ * Constants for the project, mostly defined in the JVM specification.
+ *
+ * @version $Id: Const.java 1748987 2016-06-18 12:36:47Z sebb $
+ * @since 6.0 (intended to replace the Constants interface)
+ */
+public final class Const {
+
+    /**
+     * Java class file format Magic number (0xCAFEBABE)
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.1-200-A">
+     * The ClassFile Structure in The Java Virtual Machine Specification</a>
+     */
+    public static final int JVM_CLASSFILE_MAGIC = 0xCAFEBABE;
+
+    /**
+     * Major version number of class files for Java 1.1.
+     *
+     * @see #MINOR_1_1
+   *
+     */
+    public static final short MAJOR_1_1 = 45;
+
+    /**
+     * Minor version number of class files for Java 1.1.
+     *
+     * @see #MAJOR_1_1
+   *
+     */
+    public static final short MINOR_1_1 = 3;
+
+    /**
+     * Major version number of class files for Java 1.2.
+     *
+     * @see #MINOR_1_2
+   *
+     */
+    public static final short MAJOR_1_2 = 46;
+
+    /**
+     * Minor version number of class files for Java 1.2.
+     *
+     * @see #MAJOR_1_2
+   *
+     */
+    public static final short MINOR_1_2 = 0;
+
+    /**
+     * Major version number of class files for Java 1.2.
+     *
+     * @see #MINOR_1_2
+   *
+     */
+    public static final short MAJOR_1_3 = 47;
+
+    /**
+     * Minor version number of class files for Java 1.3.
+     *
+     * @see #MAJOR_1_3
+   *
+     */
+    public static final short MINOR_1_3 = 0;
+
+    /**
+     * Major version number of class files for Java 1.3.
+     *
+     * @see #MINOR_1_3
+   *
+     */
+    public static final short MAJOR_1_4 = 48;
+
+    /**
+     * Minor version number of class files for Java 1.4.
+     *
+     * @see #MAJOR_1_4
+   *
+     */
+    public static final short MINOR_1_4 = 0;
+
+    /**
+     * Major version number of class files for Java 1.4.
+     *
+     * @see #MINOR_1_4
+   *
+     */
+    public static final short MAJOR_1_5 = 49;
+
+    /**
+     * Minor version number of class files for Java 1.5.
+     *
+     * @see #MAJOR_1_5
+   *
+     */
+    public static final short MINOR_1_5 = 0;
+
+    /**
+     * Major version number of class files for Java 1.6.
+     *
+     * @see #MINOR_1_6
+   *
+     */
+    public static final short MAJOR_1_6 = 50;
+
+    /**
+     * Minor version number of class files for Java 1.6.
+     *
+     * @see #MAJOR_1_6
+   *
+     */
+    public static final short MINOR_1_6 = 0;
+
+    /**
+     * Major version number of class files for Java 1.7.
+     *
+     * @see #MINOR_1_7
+   *
+     */
+    public static final short MAJOR_1_7 = 51;
+
+    /**
+     * Minor version number of class files for Java 1.7.
+     *
+     * @see #MAJOR_1_7
+   *
+     */
+    public static final short MINOR_1_7 = 0;
+
+    /**
+     * Major version number of class files for Java 1.8.
+     *
+     * @see #MINOR_1_8
+   *
+     */
+    public static final short MAJOR_1_8 = 52;
+
+    /**
+     * Major version number of class files for Java 9.
+     *
+     * @see #MINOR_1_9
+   *
+     */
+    public static final short MAJOR_1_9 = 53;
+
+    /**
+     * Minor version number of class files for Java 1.8.
+     *
+     * @see #MAJOR_1_8
+   *
+     */
+    public static final short MINOR_1_8 = 0;
+
+    /**
+     * Minor version number of class files for Java 9.
+     *
+     * @see #MAJOR_1_9
+   *
+     */
+    public static final short MINOR_1_9 = 0;
+
+    /**
+     * Default major version number. Class file is for Java 1.1.
+     *
+     * @see #MAJOR_1_1
+   *
+     */
+    public static final short MAJOR = MAJOR_1_1;
+
+    /**
+     * Default major version number. Class file is for Java 1.1.
+     *
+     * @see #MAJOR_1_1
+   *
+     */
+    public static final short MINOR = MINOR_1_1;
+
+    /**
+     * Maximum value for an unsigned short.
+     */
+    public static final int MAX_SHORT = 65535; // 2^16 - 1
+
+    /**
+     * Maximum value for an unsigned byte.
+     */
+    public static final int MAX_BYTE = 255; // 2^8 - 1
+
+    /**
+     * One of the access flags for fields, methods, or classes.
+     *
+     * @see <a
+     * href='http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.5'>
+     * Flag definitions for Fields in the Java Virtual Machine Specification
+     * (Java SE 8 Edition).</a>
+     * @see <a
+     * href='http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.6'>
+     * Flag definitions for Methods in the Java Virtual Machine Specification
+     * (Java SE 8 Edition).</a>
+     * @see <a
+     * href='http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.6-300-D.1-D.1'>
+     * Flag definitions for Classes in the Java Virtual Machine Specification
+     * (Java SE 8 Edition).</a>
+     */
+    public static final short ACC_PUBLIC = 0x0001;
+
+    /**
+     * One of the access flags for fields, methods, or classes.
+     *
+     * @see #ACC_PUBLIC
+     */
+    public static final short ACC_PRIVATE = 0x0002;
+
+    /**
+     * One of the access flags for fields, methods, or classes.
+     *
+     * @see #ACC_PUBLIC
+     */
+    public static final short ACC_PROTECTED = 0x0004;
+
+    /**
+     * One of the access flags for fields, methods, or classes.
+     *
+     * @see #ACC_PUBLIC
+     */
+    public static final short ACC_STATIC = 0x0008;
+
+    /**
+     * One of the access flags for fields, methods, or classes.
+     *
+     * @see #ACC_PUBLIC
+     */
+    public static final short ACC_FINAL = 0x0010;
+
+    /**
+     * One of the access flags for fields, methods, or classes.
+     *
+     * @see #ACC_PUBLIC
+     */
+    public static final short ACC_SYNCHRONIZED = 0x0020;
+
+    /**
+     * One of the access flags for fields, methods, or classes.
+     *
+     * @see #ACC_PUBLIC
+     */
+    public static final short ACC_VOLATILE = 0x0040;
+
+    /**
+     * One of the access flags for fields, methods, or classes.
+     *
+     * @see #ACC_PUBLIC
+     */
+    public static final short ACC_BRIDGE = 0x0040;
+
+    /**
+     * One of the access flags for fields, methods, or classes.
+     *
+     * @see #ACC_PUBLIC
+     */
+    public static final short ACC_TRANSIENT = 0x0080;
+
+    /**
+     * One of the access flags for fields, methods, or classes.
+     *
+     * @see #ACC_PUBLIC
+     */
+    public static final short ACC_VARARGS = 0x0080;
+
+    /**
+     * One of the access flags for fields, methods, or classes.
+     *
+     * @see #ACC_PUBLIC
+     */
+    public static final short ACC_NATIVE = 0x0100;
+
+    /**
+     * One of the access flags for fields, methods, or classes.
+     *
+     * @see #ACC_PUBLIC
+     */
+    public static final short ACC_INTERFACE = 0x0200;
+
+    /**
+     * One of the access flags for fields, methods, or classes.
+     *
+     * @see #ACC_PUBLIC
+     */
+    public static final short ACC_ABSTRACT = 0x0400;
+
+    /**
+     * One of the access flags for fields, methods, or classes.
+     *
+     * @see #ACC_PUBLIC
+     */
+    public static final short ACC_STRICT = 0x0800;
+
+    /**
+     * One of the access flags for fields, methods, or classes.
+     *
+     * @see #ACC_PUBLIC
+     */
+    public static final short ACC_SYNTHETIC = 0x1000;
+
+    /**
+     * One of the access flags for fields, methods, or classes.
+     *
+     * @see #ACC_PUBLIC
+     */
+    public static final short ACC_ANNOTATION = 0x2000;
+
+    /**
+     * One of the access flags for fields, methods, or classes.
+     *
+     * @see #ACC_PUBLIC
+     */
+    public static final short ACC_ENUM = 0x4000;
+
+    /**
+     * One of the access flags for fields, methods, or classes.
+     *
+     * @see #ACC_PUBLIC
+     */
+    public static final short ACC_MANDATED = (short) 0x8000;
+
+    // Applies to classes compiled by new compilers only
+    /**
+     * One of the access flags for fields, methods, or classes.
+     *
+     * @see #ACC_PUBLIC
+     */
+    public static final short ACC_SUPER = 0x0020;
+
+    /**
+     * One of the access flags for fields, methods, or classes.
+     *
+     * @see #ACC_PUBLIC
+     */
+    public static final short MAX_ACC_FLAG = ACC_ENUM;
+
+    /**
+     * The names of the access flags.
+     */
+    private static final String[] ACCESS_NAMES = {
+        "public", "private", "protected", "static", "final", "synchronized",
+        "volatile", "transient", "native", "interface", "abstract", "strictfp",
+        "synthetic", "annotation", "enum"
+    };
+
+    /**
+     * @since 6.0
+     */
+    public static final int ACCESS_NAMES_LENGTH = ACCESS_NAMES.length;
+
+    /**
+     * @param index
+     * @return the ACCESS_NAMES entry at the given index
+     * @since 6.0
+     */
+    public static String getAccessName(final int index) {
+        return ACCESS_NAMES[index];
+    }
+
+    /*
+     * The description of the constant pool is at:
+     * http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4
+     * References below are to the individual sections
+     */
+    /**
+     * Marks a constant pool entry as type UTF-8.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.7">
+     * The Constant Pool in The Java Virtual Machine Specification</a>
+     */
+    public static final byte CONSTANT_Utf8 = 1;
+
+    /**
+     * Marks a constant pool entry as type Integer.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.4">
+     * The Constant Pool in The Java Virtual Machine Specification</a>
+     */
+    public static final byte CONSTANT_Integer = 3;
+
+    /**
+     * Marks a constant pool entry as type Float.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.4">
+     * The Constant Pool in The Java Virtual Machine Specification</a>
+     */
+    public static final byte CONSTANT_Float = 4;
+
+    /**
+     * Marks a constant pool entry as type Long.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.5">
+     * The Constant Pool in The Java Virtual Machine Specification</a>
+     */
+    public static final byte CONSTANT_Long = 5;
+
+    /**
+     * Marks a constant pool entry as type Double.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.5">
+     * The Constant Pool in The Java Virtual Machine Specification</a>
+     */
+    public static final byte CONSTANT_Double = 6;
+
+    /**
+     * Marks a constant pool entry as a Class
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.1">
+     * The Constant Pool in The Java Virtual Machine Specification</a>
+     */
+    public static final byte CONSTANT_Class = 7;
+
+    /**
+     * Marks a constant pool entry as a Field Reference.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.2">
+     * The Constant Pool in The Java Virtual Machine Specification</a>
+     */
+    public static final byte CONSTANT_Fieldref = 9;
+
+    /**
+     * Marks a constant pool entry as type String
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.3">
+     * The Constant Pool in The Java Virtual Machine Specification</a>
+     */
+    public static final byte CONSTANT_String = 8;
+
+    /**
+     * Marks a constant pool entry as a Method Reference.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.2">
+     * The Constant Pool in The Java Virtual Machine Specification</a>
+     */
+    public static final byte CONSTANT_Methodref = 10;
+
+    /**
+     * Marks a constant pool entry as an Interface Method Reference.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.2">
+     * The Constant Pool in The Java Virtual Machine Specification</a>
+     */
+    public static final byte CONSTANT_InterfaceMethodref = 11;
+
+    /**
+     * Marks a constant pool entry as a name and type.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.6">
+     * The Constant Pool in The Java Virtual Machine Specification</a>
+     */
+    public static final byte CONSTANT_NameAndType = 12;
+
+    /**
+     * Marks a constant pool entry as a Method Handle.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.8">
+     * The Constant Pool in The Java Virtual Machine Specification</a>
+     */
+    public static final byte CONSTANT_MethodHandle = 15;
+
+    /**
+     * Marks a constant pool entry as a Method Type.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.9">
+     * The Constant Pool in The Java Virtual Machine Specification</a>
+     */
+    public static final byte CONSTANT_MethodType = 16;
+
+    /**
+     * Marks a constant pool entry as an Invoke Dynamic
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.10">
+     * The Constant Pool in The Java Virtual Machine Specification</a>
+     */
+    public static final byte CONSTANT_InvokeDynamic = 18;
+
+    /**
+     * The names of the types of entries in a constant pool. Use getConstantName
+     * instead
+     */
+    private static final String[] CONSTANT_NAMES = {
+        "", "CONSTANT_Utf8", "", "CONSTANT_Integer",
+        "CONSTANT_Float", "CONSTANT_Long", "CONSTANT_Double",
+        "CONSTANT_Class", "CONSTANT_String", "CONSTANT_Fieldref",
+        "CONSTANT_Methodref", "CONSTANT_InterfaceMethodref",
+        "CONSTANT_NameAndType", "", "", "CONSTANT_MethodHandle",
+        "CONSTANT_MethodType", "", "CONSTANT_InvokeDynamic"};
+
+    /**
+     *
+     * @param index
+     * @return the CONSTANT_NAMES entry at the given index
+     * @since 6.0
+     */
+    public static String getConstantName(final int index) {
+        return CONSTANT_NAMES[index];
+    }
+
+    /**
+     * The name of the static initializer, also called &quot;class
+     * initialization method&quot; or &quot;interface initialization
+     * method&quot;. This is &quot;&lt;clinit&gt;&quot;.
+     */
+    public static final String STATIC_INITIALIZER_NAME = "<clinit>";
+
+    /**
+     * The name of every constructor method in a class, also called
+     * &quot;instance initialization method&quot;. This is
+     * &quot;&lt;init&gt;&quot;.
+     */
+    public static final String CONSTRUCTOR_NAME = "<init>";
+
+    /**
+     * The names of the interfaces implemented by arrays
+     */
+    private static final String[] INTERFACES_IMPLEMENTED_BY_ARRAYS = {"java.lang.Cloneable", "java.io.Serializable"};
+
+    /**
+     * @since 6.0
+     */
+    public static Iterable<String> getInterfacesImplementedByArrays() {
+        return Collections.unmodifiableList(Arrays.asList(INTERFACES_IMPLEMENTED_BY_ARRAYS));
+    }
+
+    /**
+     * Maximum Constant Pool entries. One of the limitations of the Java Virtual
+     * Machine.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.11-100-A">
+     * The Java Virtual Machine Specification, Java SE 8 Edition, page 330,
+     * chapter 4.11.</a>
+     */
+    public static final int MAX_CP_ENTRIES = 65535;
+
+    /**
+     * Maximum code size (plus one; the code size must be LESS than this) One of
+     * the limitations of the Java Virtual Machine. Note vmspec2 page 152
+     * ("Limitations") says: "The amount of code per non-native, non-abstract
+     * method is limited to 65536 bytes by the sizes of the indices in the
+     * exception_table of the Code attribute (4.7.3), in the LineNumberTable
+     * attribute (4.7.8), and in the LocalVariableTable attribute (4.7.9)."
+     * However this should be taken as an upper limit rather than the defined
+     * maximum. On page 134 (4.8.1 Static Constants) of the same spec, it says:
+     * "The value of the code_length item must be less than 65536." The entry in
+     * the Limitations section has been removed from later versions of the spec;
+     * it is not present in the Java SE 8 edition.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.3-300-E">
+     * The Java Virtual Machine Specification, Java SE 8 Edition, page 104,
+     * chapter 4.7.</a>
+     */
+    public static final int MAX_CODE_SIZE = 65536; //bytes
+
+    /**
+     * The maximum number of dimensions in an array ({@value}). One of the
+     * limitations of the Java Virtual Machine.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.3.2-150">
+     * Field Descriptors in The Java Virtual Machine Specification</a>
+     */
+    public static final int MAX_ARRAY_DIMENSIONS = 255;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.nop">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short NOP = 0;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.aconst_null">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short ACONST_NULL = 1;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.iconst_i">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short ICONST_M1 = 2;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.iconst_i">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short ICONST_0 = 3;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.iconst_i">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short ICONST_1 = 4;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.iconst_i">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short ICONST_2 = 5;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.iconst_i">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short ICONST_3 = 6;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.iconst_i">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short ICONST_4 = 7;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.iconst_i">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short ICONST_5 = 8;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.lconst_l">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short LCONST_0 = 9;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.lconst_l">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short LCONST_1 = 10;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.fconst_f">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short FCONST_0 = 11;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.fconst_f">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short FCONST_1 = 12;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.fconst_f">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short FCONST_2 = 13;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.dconst_d">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short DCONST_0 = 14;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.dconst_d">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short DCONST_1 = 15;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.bipush">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short BIPUSH = 16;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.sipush">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short SIPUSH = 17;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.ldc">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short LDC = 18;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.ldc_w">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short LDC_W = 19;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.ldc2_w">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short LDC2_W = 20;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.iload">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short ILOAD = 21;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.lload">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short LLOAD = 22;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.fload">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short FLOAD = 23;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.dload">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short DLOAD = 24;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.aload">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short ALOAD = 25;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.iload_n">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short ILOAD_0 = 26;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.iload_n">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short ILOAD_1 = 27;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.iload_n">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short ILOAD_2 = 28;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.iload_n">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short ILOAD_3 = 29;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.lload_n">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short LLOAD_0 = 30;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.lload_n">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short LLOAD_1 = 31;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.lload_n">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short LLOAD_2 = 32;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.lload_n">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short LLOAD_3 = 33;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.fload_n">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short FLOAD_0 = 34;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.fload_n">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short FLOAD_1 = 35;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.fload_n">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short FLOAD_2 = 36;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.fload_n">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short FLOAD_3 = 37;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.dload_n">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short DLOAD_0 = 38;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.dload_n">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short DLOAD_1 = 39;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.dload_n">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short DLOAD_2 = 40;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.dload_n">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short DLOAD_3 = 41;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.aload_n">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short ALOAD_0 = 42;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.aload_n">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short ALOAD_1 = 43;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.aload_n">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short ALOAD_2 = 44;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.aload_n">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short ALOAD_3 = 45;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.iaload">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short IALOAD = 46;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.laload">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short LALOAD = 47;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.faload">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short FALOAD = 48;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.daload">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short DALOAD = 49;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.aaload">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short AALOAD = 50;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.baload">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short BALOAD = 51;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.caload">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short CALOAD = 52;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.saload">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short SALOAD = 53;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.istore">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short ISTORE = 54;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.lstore">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short LSTORE = 55;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.fstore">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short FSTORE = 56;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.dstore">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short DSTORE = 57;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.astore">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short ASTORE = 58;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.istore_n">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short ISTORE_0 = 59;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.istore_n">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short ISTORE_1 = 60;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.istore_n">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short ISTORE_2 = 61;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.istore_n">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short ISTORE_3 = 62;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.lstore_n">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short LSTORE_0 = 63;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.lstore_n">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short LSTORE_1 = 64;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.lstore_n">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short LSTORE_2 = 65;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.lstore_n">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short LSTORE_3 = 66;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.fstore_n">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short FSTORE_0 = 67;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.fstore_n">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short FSTORE_1 = 68;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.fstore_n">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short FSTORE_2 = 69;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.fstore_n">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short FSTORE_3 = 70;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.dstore_n">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short DSTORE_0 = 71;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.dstore_n">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short DSTORE_1 = 72;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.dstore_n">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short DSTORE_2 = 73;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.dstore_n">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short DSTORE_3 = 74;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.astore_n">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short ASTORE_0 = 75;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.astore_n">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short ASTORE_1 = 76;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.astore_n">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short ASTORE_2 = 77;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.astore_n">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short ASTORE_3 = 78;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.iastore">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short IASTORE = 79;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.lastore">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short LASTORE = 80;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.fastore">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short FASTORE = 81;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.dastore">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short DASTORE = 82;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.aastore">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short AASTORE = 83;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.bastore">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short BASTORE = 84;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.castore">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short CASTORE = 85;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.sastore">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short SASTORE = 86;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.pop">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short POP = 87;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.pop2">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short POP2 = 88;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.dup">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short DUP = 89;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.dup_x1">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short DUP_X1 = 90;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.dup_x2">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short DUP_X2 = 91;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.dup2">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short DUP2 = 92;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.dup2_x1">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short DUP2_X1 = 93;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.dup2_x2">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short DUP2_X2 = 94;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.swap">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short SWAP = 95;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.iadd">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short IADD = 96;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.ladd">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short LADD = 97;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.fadd">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short FADD = 98;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.dadd">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short DADD = 99;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.isub">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short ISUB = 100;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.lsub">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short LSUB = 101;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.fsub">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short FSUB = 102;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.dsub">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short DSUB = 103;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.imul">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short IMUL = 104;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.lmul">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short LMUL = 105;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.fmul">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short FMUL = 106;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.dmul">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short DMUL = 107;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.idiv">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short IDIV = 108;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.ldiv">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short LDIV = 109;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.fdiv">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short FDIV = 110;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.ddiv">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short DDIV = 111;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.irem">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short IREM = 112;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.lrem">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short LREM = 113;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.frem">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short FREM = 114;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.drem">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short DREM = 115;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.ineg">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short INEG = 116;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.lneg">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short LNEG = 117;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.fneg">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short FNEG = 118;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.dneg">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short DNEG = 119;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.ishl">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short ISHL = 120;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.lshl">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short LSHL = 121;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.ishr">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short ISHR = 122;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.lshr">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short LSHR = 123;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.iushr">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short IUSHR = 124;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.lushr">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short LUSHR = 125;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.iand">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short IAND = 126;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.land">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short LAND = 127;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.ior">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short IOR = 128;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.lor">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short LOR = 129;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.ixor">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short IXOR = 130;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.lxor">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short LXOR = 131;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.iinc">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short IINC = 132;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.i2l">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short I2L = 133;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.i2f">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short I2F = 134;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.i2d">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short I2D = 135;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.l2i">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short L2I = 136;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.l2f">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short L2F = 137;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.l2d">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short L2D = 138;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.f2i">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short F2I = 139;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.f2l">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short F2L = 140;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.f2d">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short F2D = 141;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.d2i">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short D2I = 142;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.d2l">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short D2L = 143;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.d2f">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short D2F = 144;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.i2b">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short I2B = 145;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short INT2BYTE = 145; // Old notation
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.i2c">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short I2C = 146;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short INT2CHAR = 146; // Old notation
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.i2s">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short I2S = 147;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short INT2SHORT = 147; // Old notation
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.lcmp">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short LCMP = 148;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.fcmpl">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short FCMPL = 149;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.fcmpg">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short FCMPG = 150;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.dcmpl">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short DCMPL = 151;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.dcmpg">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short DCMPG = 152;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.ifeq">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short IFEQ = 153;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.ifne">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short IFNE = 154;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.iflt">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short IFLT = 155;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.ifge">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short IFGE = 156;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.ifgt">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short IFGT = 157;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.ifle">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short IFLE = 158;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.if_icmp_cond">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short IF_ICMPEQ = 159;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.if_icmp_cond">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short IF_ICMPNE = 160;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.if_icmp_cond">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short IF_ICMPLT = 161;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.if_icmp_cond">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short IF_ICMPGE = 162;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.if_icmp_cond">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short IF_ICMPGT = 163;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.if_icmp_cond">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short IF_ICMPLE = 164;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.if_acmp_cond">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short IF_ACMPEQ = 165;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.if_acmp_cond">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short IF_ACMPNE = 166;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.goto">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short GOTO = 167;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.jsr">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short JSR = 168;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.ret">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short RET = 169;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.tableswitch">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short TABLESWITCH = 170;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.lookupswitch">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short LOOKUPSWITCH = 171;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.ireturn">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short IRETURN = 172;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.lreturn">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short LRETURN = 173;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.freturn">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short FRETURN = 174;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.dreturn">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short DRETURN = 175;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.areturn">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short ARETURN = 176;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.return">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short RETURN = 177;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.getstatic">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short GETSTATIC = 178;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.putstatic">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short PUTSTATIC = 179;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.getfield">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short GETFIELD = 180;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.putfield">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short PUTFIELD = 181;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.invokevirtual">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short INVOKEVIRTUAL = 182;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.invokespecial">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short INVOKESPECIAL = 183;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short INVOKENONVIRTUAL = 183; // Old name in JDK 1.0
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.invokestatic">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short INVOKESTATIC = 184;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.invokeinterface">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short INVOKEINTERFACE = 185;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.invokedynamic">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short INVOKEDYNAMIC = 186;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.new">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short NEW = 187;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.newarray">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short NEWARRAY = 188;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.anewarray">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short ANEWARRAY = 189;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.arraylength">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short ARRAYLENGTH = 190;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.athrow">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short ATHROW = 191;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.checkcast">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short CHECKCAST = 192;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.instanceof">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short INSTANCEOF = 193;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.monitorenter">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short MONITORENTER = 194;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.monitorexit">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short MONITOREXIT = 195;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.wide">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short WIDE = 196;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.multianewarray">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short MULTIANEWARRAY = 197;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.ifnull">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short IFNULL = 198;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.ifnonnull">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short IFNONNULL = 199;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.goto_w">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short GOTO_W = 200;
+
+    /**
+     * Java VM opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.jsr_w">
+     * Opcode definitions in The Java Virtual Machine Specification</a>
+     */
+    public static final short JSR_W = 201;
+
+    /**
+     * JVM internal opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.2">
+     * Reserved opcodes in the Java Virtual Machine Specification</a>
+     */
+    public static final short BREAKPOINT = 202;
+
+    /**
+     * JVM internal opcode.
+     *
+     * @see <a
+     * href="https://web.archive.org/web/20120108031230/http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html">
+     * Specification of _quick opcodes in the Java Virtual Machine Specification
+     * (version 1)</a>
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se5.0/html/ChangesAppendix.doc.html#448885">
+     * Why the _quick opcodes were removed from the second version of the Java
+     * Virtual Machine Specification.</a>
+     */
+    public static final short LDC_QUICK = 203;
+
+    /**
+     * JVM internal opcode.
+     *
+     * @see <a
+     * href="https://web.archive.org/web/20120108031230/http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html">
+     * Specification of _quick opcodes in the Java Virtual Machine Specification
+     * (version 1)</a>
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se5.0/html/ChangesAppendix.doc.html#448885">
+     * Why the _quick opcodes were removed from the second version of the Java
+     * Virtual Machine Specification.</a>
+     */
+    public static final short LDC_W_QUICK = 204;
+
+    /**
+     * JVM internal opcode.
+     *
+     * @see <a
+     * href="https://web.archive.org/web/20120108031230/http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html">
+     * Specification of _quick opcodes in the Java Virtual Machine Specification
+     * (version 1)</a>
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se5.0/html/ChangesAppendix.doc.html#448885">
+     * Why the _quick opcodes were removed from the second version of the Java
+     * Virtual Machine Specification.</a>
+     */
+    public static final short LDC2_W_QUICK = 205;
+
+    /**
+     * JVM internal opcode.
+     *
+     * @see <a
+     * href="https://web.archive.org/web/20120108031230/http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html">
+     * Specification of _quick opcodes in the Java Virtual Machine Specification
+     * (version 1)</a>
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se5.0/html/ChangesAppendix.doc.html#448885">
+     * Why the _quick opcodes were removed from the second version of the Java
+     * Virtual Machine Specification.</a>
+     */
+    public static final short GETFIELD_QUICK = 206;
+
+    /**
+     * JVM internal opcode.
+     *
+     * @see <a
+     * href="https://web.archive.org/web/20120108031230/http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html">
+     * Specification of _quick opcodes in the Java Virtual Machine Specification
+     * (version 1)</a>
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se5.0/html/ChangesAppendix.doc.html#448885">
+     * Why the _quick opcodes were removed from the second version of the Java
+     * Virtual Machine Specification.</a>
+     */
+    public static final short PUTFIELD_QUICK = 207;
+
+    /**
+     * JVM internal opcode.
+     *
+     * @see <a
+     * href="https://web.archive.org/web/20120108031230/http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html">
+     * Specification of _quick opcodes in the Java Virtual Machine Specification
+     * (version 1)</a>
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se5.0/html/ChangesAppendix.doc.html#448885">
+     * Why the _quick opcodes were removed from the second version of the Java
+     * Virtual Machine Specification.</a>
+     */
+    public static final short GETFIELD2_QUICK = 208;
+
+    /**
+     * JVM internal opcode.
+     *
+     * @see <a
+     * href="https://web.archive.org/web/20120108031230/http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html">
+     * Specification of _quick opcodes in the Java Virtual Machine Specification
+     * (version 1)</a>
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se5.0/html/ChangesAppendix.doc.html#448885">
+     * Why the _quick opcodes were removed from the second version of the Java
+     * Virtual Machine Specification.</a>
+     */
+    public static final short PUTFIELD2_QUICK = 209;
+
+    /**
+     * JVM internal opcode.
+     *
+     * @see <a
+     * href="https://web.archive.org/web/20120108031230/http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html">
+     * Specification of _quick opcodes in the Java Virtual Machine Specification
+     * (version 1)</a>
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se5.0/html/ChangesAppendix.doc.html#448885">
+     * Why the _quick opcodes were removed from the second version of the Java
+     * Virtual Machine Specification.</a>
+     */
+    public static final short GETSTATIC_QUICK = 210;
+
+    /**
+     * JVM internal opcode.
+     *
+     * @see <a
+     * href="https://web.archive.org/web/20120108031230/http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html">
+     * Specification of _quick opcodes in the Java Virtual Machine Specification
+     * (version 1)</a>
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se5.0/html/ChangesAppendix.doc.html#448885">
+     * Why the _quick opcodes were removed from the second version of the Java
+     * Virtual Machine Specification.</a>
+     */
+    public static final short PUTSTATIC_QUICK = 211;
+
+    /**
+     * JVM internal opcode.
+     *
+     * @see <a
+     * href="https://web.archive.org/web/20120108031230/http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html">
+     * Specification of _quick opcodes in the Java Virtual Machine Specification
+     * (version 1)</a>
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se5.0/html/ChangesAppendix.doc.html#448885">
+     * Why the _quick opcodes were removed from the second version of the Java
+     * Virtual Machine Specification.</a>
+     */
+    public static final short GETSTATIC2_QUICK = 212;
+
+    /**
+     * JVM internal opcode.
+     *
+     * @see <a
+     * href="https://web.archive.org/web/20120108031230/http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html">
+     * Specification of _quick opcodes in the Java Virtual Machine Specification
+     * (version 1)</a>
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se5.0/html/ChangesAppendix.doc.html#448885">
+     * Why the _quick opcodes were removed from the second version of the Java
+     * Virtual Machine Specification.</a>
+     */
+    public static final short PUTSTATIC2_QUICK = 213;
+
+    /**
+     * JVM internal opcode.
+     *
+     * @see <a
+     * href="https://web.archive.org/web/20120108031230/http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html">
+     * Specification of _quick opcodes in the Java Virtual Machine Specification
+     * (version 1)</a>
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se5.0/html/ChangesAppendix.doc.html#448885">
+     * Why the _quick opcodes were removed from the second version of the Java
+     * Virtual Machine Specification.</a>
+     */
+    public static final short INVOKEVIRTUAL_QUICK = 214;
+
+    /**
+     * JVM internal opcode.
+     *
+     * @see <a
+     * href="https://web.archive.org/web/20120108031230/http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html">
+     * Specification of _quick opcodes in the Java Virtual Machine Specification
+     * (version 1)</a>
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se5.0/html/ChangesAppendix.doc.html#448885">
+     * Why the _quick opcodes were removed from the second version of the Java
+     * Virtual Machine Specification.</a>
+     */
+    public static final short INVOKENONVIRTUAL_QUICK = 215;
+
+    /**
+     * JVM internal opcode.
+     *
+     * @see <a
+     * href="https://web.archive.org/web/20120108031230/http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html">
+     * Specification of _quick opcodes in the Java Virtual Machine Specification
+     * (version 1)</a>
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se5.0/html/ChangesAppendix.doc.html#448885">
+     * Why the _quick opcodes were removed from the second version of the Java
+     * Virtual Machine Specification.</a>
+     */
+    public static final short INVOKESUPER_QUICK = 216;
+
+    /**
+     * JVM internal opcode.
+     *
+     * @see <a
+     * href="https://web.archive.org/web/20120108031230/http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html">
+     * Specification of _quick opcodes in the Java Virtual Machine Specification
+     * (version 1)</a>
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se5.0/html/ChangesAppendix.doc.html#448885">
+     * Why the _quick opcodes were removed from the second version of the Java
+     * Virtual Machine Specification.</a>
+     */
+    public static final short INVOKESTATIC_QUICK = 217;
+
+    /**
+     * JVM internal opcode.
+     *
+     * @see <a
+     * href="https://web.archive.org/web/20120108031230/http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html">
+     * Specification of _quick opcodes in the Java Virtual Machine Specification
+     * (version 1)</a>
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se5.0/html/ChangesAppendix.doc.html#448885">
+     * Why the _quick opcodes were removed from the second version of the Java
+     * Virtual Machine Specification.</a>
+     */
+    public static final short INVOKEINTERFACE_QUICK = 218;
+
+    /**
+     * JVM internal opcode.
+     *
+     * @see <a
+     * href="https://web.archive.org/web/20120108031230/http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html">
+     * Specification of _quick opcodes in the Java Virtual Machine Specification
+     * (version 1)</a>
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se5.0/html/ChangesAppendix.doc.html#448885">
+     * Why the _quick opcodes were removed from the second version of the Java
+     * Virtual Machine Specification.</a>
+     */
+    public static final short INVOKEVIRTUALOBJECT_QUICK = 219;
+
+    /**
+     * JVM internal opcode.
+     *
+     * @see <a
+     * href="https://web.archive.org/web/20120108031230/http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html">
+     * Specification of _quick opcodes in the Java Virtual Machine Specification
+     * (version 1)</a>
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se5.0/html/ChangesAppendix.doc.html#448885">
+     * Why the _quick opcodes were removed from the second version of the Java
+     * Virtual Machine Specification.</a>
+     */
+    public static final short NEW_QUICK = 221;
+
+    /**
+     * JVM internal opcode.
+     *
+     * @see <a
+     * href="https://web.archive.org/web/20120108031230/http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html">
+     * Specification of _quick opcodes in the Java Virtual Machine Specification
+     * (version 1)</a>
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se5.0/html/ChangesAppendix.doc.html#448885">
+     * Why the _quick opcodes were removed from the second version of the Java
+     * Virtual Machine Specification.</a>
+     */
+    public static final short ANEWARRAY_QUICK = 222;
+
+    /**
+     * JVM internal opcode.
+     *
+     * @see <a
+     * href="https://web.archive.org/web/20120108031230/http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html">
+     * Specification of _quick opcodes in the Java Virtual Machine Specification
+     * (version 1)</a>
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se5.0/html/ChangesAppendix.doc.html#448885">
+     * Why the _quick opcodes were removed from the second version of the Java
+     * Virtual Machine Specification.</a>
+     */
+    public static final short MULTIANEWARRAY_QUICK = 223;
+
+    /**
+     * JVM internal opcode.
+     *
+     * @see <a
+     * href="https://web.archive.org/web/20120108031230/http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html">
+     * Specification of _quick opcodes in the Java Virtual Machine Specification
+     * (version 1)</a>
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se5.0/html/ChangesAppendix.doc.html#448885">
+     * Why the _quick opcodes were removed from the second version of the Java
+     * Virtual Machine Specification.</a>
+     */
+    public static final short CHECKCAST_QUICK = 224;
+
+    /**
+     * JVM internal opcode.
+     *
+     * @see <a
+     * href="https://web.archive.org/web/20120108031230/http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html">
+     * Specification of _quick opcodes in the Java Virtual Machine Specification
+     * (version 1)</a>
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se5.0/html/ChangesAppendix.doc.html#448885">
+     * Why the _quick opcodes were removed from the second version of the Java
+     * Virtual Machine Specification.</a>
+     */
+    public static final short INSTANCEOF_QUICK = 225;
+
+    /**
+     * JVM internal opcode.
+     *
+     * @see <a
+     * href="https://web.archive.org/web/20120108031230/http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html">
+     * Specification of _quick opcodes in the Java Virtual Machine Specification
+     * (version 1)</a>
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se5.0/html/ChangesAppendix.doc.html#448885">
+     * Why the _quick opcodes were removed from the second version of the Java
+     * Virtual Machine Specification.</a>
+     */
+    public static final short INVOKEVIRTUAL_QUICK_W = 226;
+
+    /**
+     * JVM internal opcode.
+     *
+     * @see <a
+     * href="https://web.archive.org/web/20120108031230/http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html">
+     * Specification of _quick opcodes in the Java Virtual Machine Specification
+     * (version 1)</a>
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se5.0/html/ChangesAppendix.doc.html#448885">
+     * Why the _quick opcodes were removed from the second version of the Java
+     * Virtual Machine Specification.</a>
+     */
+    public static final short GETFIELD_QUICK_W = 227;
+
+    /**
+     * JVM internal opcode.
+     *
+     * @see <a
+     * href="https://web.archive.org/web/20120108031230/http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html">
+     * Specification of _quick opcodes in the Java Virtual Machine Specification
+     * (version 1)</a>
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se5.0/html/ChangesAppendix.doc.html#448885">
+     * Why the _quick opcodes were removed from the second version of the Java
+     * Virtual Machine Specification.</a>
+     */
+    public static final short PUTFIELD_QUICK_W = 228;
+
+    /**
+     * JVM internal opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.2">
+     * Reserved opcodes in the Java Virtual Machine Specification</a>
+     */
+    public static final short IMPDEP1 = 254;
+
+    /**
+     * JVM internal opcode.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.2">
+     * Reserved opcodes in the Java Virtual Machine Specification</a>
+     */
+    public static final short IMPDEP2 = 255;
+
+    /**
+     * BCEL virtual instruction for pushing an arbitrary data type onto the
+     * stack. Will be converted to the appropriate JVM opcode when the class is
+     * dumped.
+     */
+    public static final short PUSH = 4711;
+
+    /**
+     * BCEL virtual instruction for either LOOKUPSWITCH or TABLESWITCH. Will be
+     * converted to the appropriate JVM opcode when the class is dumped.
+     */
+    public static final short SWITCH = 4712;
+
+    /**
+     * Illegal opcode.
+     */
+    public static final short UNDEFINED = -1;
+
+    /**
+     * Illegal opcode.
+     */
+    public static final short UNPREDICTABLE = -2;
+
+    /**
+     * Illegal opcode.
+     */
+    public static final short RESERVED = -3;
+
+    /**
+     * Mnemonic for an illegal opcode.
+     */
+    public static final String ILLEGAL_OPCODE = "<illegal opcode>";
+
+    /**
+     * Mnemonic for an illegal type.
+     */
+    public static final String ILLEGAL_TYPE = "<illegal type>";
+
+    /**
+     * Boolean data type.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.9.1-120-P">
+     * Static Constraints in the Java Virtual Machine Specification</a>
+     */
+    public static final byte T_BOOLEAN = 4;
+
+    /**
+     * Char data type.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.9.1-120-P">
+     * Static Constraints in the Java Virtual Machine Specification</a>
+     */
+    public static final byte T_CHAR = 5;
+
+    /**
+     * Float data type.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.9.1-120-P">
+     * Static Constraints in the Java Virtual Machine Specification</a>
+     */
+    public static final byte T_FLOAT = 6;
+
+    /**
+     * Double data type.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.9.1-120-P">
+     * Static Constraints in the Java Virtual Machine Specification</a>
+     */
+    public static final byte T_DOUBLE = 7;
+
+    /**
+     * Byte data type.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.9.1-120-P">
+     * Static Constraints in the Java Virtual Machine Specification</a>
+     */
+    public static final byte T_BYTE = 8;
+
+    /**
+     * Short data type.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.9.1-120-P">
+     * Static Constraints in the Java Virtual Machine Specification</a>
+     */
+    public static final byte T_SHORT = 9;
+
+    /**
+     * Int data type.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.9.1-120-P">
+     * Static Constraints in the Java Virtual Machine Specification</a>
+     */
+    public static final byte T_INT = 10;
+
+    /**
+     * Long data type.
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.9.1-120-P">
+     * Static Constraints in the Java Virtual Machine Specification</a>
+     */
+    public static final byte T_LONG = 11;
+
+    /**
+     * Void data type (non-standard).
+     */
+    public static final byte T_VOID = 12; // Non-standard
+
+    /**
+     * Array data type.
+     */
+    public static final byte T_ARRAY = 13;
+
+    /**
+     * Object data type.
+     */
+    public static final byte T_OBJECT = 14;
+
+    /**
+     * Reference data type (deprecated).
+     */
+    public static final byte T_REFERENCE = 14; // Deprecated
+
+    /**
+     * Unknown data type.
+     */
+    public static final byte T_UNKNOWN = 15;
+
+    /**
+     * Address data type.
+     */
+    public static final byte T_ADDRESS = 16;
+
+    /**
+     * The primitive type names corresponding to the T_XX constants, e.g.,
+     * TYPE_NAMES[T_INT] = "int"
+     */
+    private static final String[] TYPE_NAMES = {
+        ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE,
+        "boolean", "char", "float", "double", "byte", "short", "int", "long",
+        "void", "array", "object", "unknown", "address"
+    };
+
+    /**
+     * The primitive type names corresponding to the T_XX constants, e.g.,
+     * TYPE_NAMES[T_INT] = "int"
+     *
+     * @param index
+     * @return the type name
+     * @since 6.0
+     */
+    public static String getTypeName(final int index) {
+        return TYPE_NAMES[index];
+    }
+
+    /**
+     * The primitive class names corresponding to the T_XX constants, e.g.,
+     * CLASS_TYPE_NAMES[T_INT] = "java.lang.Integer"
+     */
+    private static final String[] CLASS_TYPE_NAMES = {
+        ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE,
+        "java.lang.Boolean", "java.lang.Character", "java.lang.Float",
+        "java.lang.Double", "java.lang.Byte", "java.lang.Short",
+        "java.lang.Integer", "java.lang.Long", "java.lang.Void",
+        ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE
+    };
+
+    /**
+     * The primitive class names corresponding to the T_XX constants, e.g.,
+     * CLASS_TYPE_NAMES[T_INT] = "java.lang.Integer"
+     *
+     * @param index
+     * @return the class name
+     * @since 6.0
+     */
+    public static String getClassTypeName(final int index) {
+        return CLASS_TYPE_NAMES[index];
+    }
+
+    /**
+     * The signature characters corresponding to primitive types, e.g.,
+     * SHORT_TYPE_NAMES[T_INT] = "I"
+     */
+    private static final String[] SHORT_TYPE_NAMES = {
+        ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE,
+        "Z", "C", "F", "D", "B", "S", "I", "J",
+        "V", ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE
+    };
+
+    /**
+     *
+     * @param index
+     * @return the short type name
+     * @since 6.0
+     */
+    public static String getShortTypeName(final int index) {
+        return SHORT_TYPE_NAMES[index];
+    }
+
+    /**
+     * Number of byte code operands for each opcode, i.e., number of bytes after
+     * the tag byte itself. Indexed by opcode, so NO_OF_OPERANDS[BIPUSH] = the
+     * number of operands for a bipush instruction.
+     */
+    private static final short[] NO_OF_OPERANDS = {
+        0/*nop*/, 0/*aconst_null*/, 0/*iconst_m1*/, 0/*iconst_0*/,
+        0/*iconst_1*/, 0/*iconst_2*/, 0/*iconst_3*/, 0/*iconst_4*/,
+        0/*iconst_5*/, 0/*lconst_0*/, 0/*lconst_1*/, 0/*fconst_0*/,
+        0/*fconst_1*/, 0/*fconst_2*/, 0/*dconst_0*/, 0/*dconst_1*/,
+        1/*bipush*/, 2/*sipush*/, 1/*ldc*/, 2/*ldc_w*/, 2/*ldc2_w*/,
+        1/*iload*/, 1/*lload*/, 1/*fload*/, 1/*dload*/, 1/*aload*/,
+        0/*iload_0*/, 0/*iload_1*/, 0/*iload_2*/, 0/*iload_3*/,
+        0/*lload_0*/, 0/*lload_1*/, 0/*lload_2*/, 0/*lload_3*/,
+        0/*fload_0*/, 0/*fload_1*/, 0/*fload_2*/, 0/*fload_3*/,
+        0/*dload_0*/, 0/*dload_1*/, 0/*dload_2*/, 0/*dload_3*/,
+        0/*aload_0*/, 0/*aload_1*/, 0/*aload_2*/, 0/*aload_3*/,
+        0/*iaload*/, 0/*laload*/, 0/*faload*/, 0/*daload*/,
+        0/*aaload*/, 0/*baload*/, 0/*caload*/, 0/*saload*/,
+        1/*istore*/, 1/*lstore*/, 1/*fstore*/, 1/*dstore*/,
+        1/*astore*/, 0/*istore_0*/, 0/*istore_1*/, 0/*istore_2*/,
+        0/*istore_3*/, 0/*lstore_0*/, 0/*lstore_1*/, 0/*lstore_2*/,
+        0/*lstore_3*/, 0/*fstore_0*/, 0/*fstore_1*/, 0/*fstore_2*/,
+        0/*fstore_3*/, 0/*dstore_0*/, 0/*dstore_1*/, 0/*dstore_2*/,
+        0/*dstore_3*/, 0/*astore_0*/, 0/*astore_1*/, 0/*astore_2*/,
+        0/*astore_3*/, 0/*iastore*/, 0/*lastore*/, 0/*fastore*/,
+        0/*dastore*/, 0/*aastore*/, 0/*bastore*/, 0/*castore*/,
+        0/*sastore*/, 0/*pop*/, 0/*pop2*/, 0/*dup*/, 0/*dup_x1*/,
+        0/*dup_x2*/, 0/*dup2*/, 0/*dup2_x1*/, 0/*dup2_x2*/, 0/*swap*/,
+        0/*iadd*/, 0/*ladd*/, 0/*fadd*/, 0/*dadd*/, 0/*isub*/,
+        0/*lsub*/, 0/*fsub*/, 0/*dsub*/, 0/*imul*/, 0/*lmul*/,
+        0/*fmul*/, 0/*dmul*/, 0/*idiv*/, 0/*ldiv*/, 0/*fdiv*/,
+        0/*ddiv*/, 0/*irem*/, 0/*lrem*/, 0/*frem*/, 0/*drem*/,
+        0/*ineg*/, 0/*lneg*/, 0/*fneg*/, 0/*dneg*/, 0/*ishl*/,
+        0/*lshl*/, 0/*ishr*/, 0/*lshr*/, 0/*iushr*/, 0/*lushr*/,
+        0/*iand*/, 0/*land*/, 0/*ior*/, 0/*lor*/, 0/*ixor*/, 0/*lxor*/,
+        2/*iinc*/, 0/*i2l*/, 0/*i2f*/, 0/*i2d*/, 0/*l2i*/, 0/*l2f*/,
+        0/*l2d*/, 0/*f2i*/, 0/*f2l*/, 0/*f2d*/, 0/*d2i*/, 0/*d2l*/,
+        0/*d2f*/, 0/*i2b*/, 0/*i2c*/, 0/*i2s*/, 0/*lcmp*/, 0/*fcmpl*/,
+        0/*fcmpg*/, 0/*dcmpl*/, 0/*dcmpg*/, 2/*ifeq*/, 2/*ifne*/,
+        2/*iflt*/, 2/*ifge*/, 2/*ifgt*/, 2/*ifle*/, 2/*if_icmpeq*/,
+        2/*if_icmpne*/, 2/*if_icmplt*/, 2/*if_icmpge*/, 2/*if_icmpgt*/,
+        2/*if_icmple*/, 2/*if_acmpeq*/, 2/*if_acmpne*/, 2/*goto*/,
+        2/*jsr*/, 1/*ret*/, UNPREDICTABLE/*tableswitch*/, UNPREDICTABLE/*lookupswitch*/,
+        0/*ireturn*/, 0/*lreturn*/, 0/*freturn*/,
+        0/*dreturn*/, 0/*areturn*/, 0/*return*/,
+        2/*getstatic*/, 2/*putstatic*/, 2/*getfield*/,
+        2/*putfield*/, 2/*invokevirtual*/, 2/*invokespecial*/, 2/*invokestatic*/,
+        4/*invokeinterface*/, 4/*invokedynamic*/, 2/*new*/,
+        1/*newarray*/, 2/*anewarray*/,
+        0/*arraylength*/, 0/*athrow*/, 2/*checkcast*/,
+        2/*instanceof*/, 0/*monitorenter*/,
+        0/*monitorexit*/, UNPREDICTABLE/*wide*/, 3/*multianewarray*/,
+        2/*ifnull*/, 2/*ifnonnull*/, 4/*goto_w*/,
+        4/*jsr_w*/, 0/*breakpoint*/, UNDEFINED,
+        UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
+        UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
+        UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
+        UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
+        UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
+        UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
+        UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
+        UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
+        UNDEFINED, UNDEFINED, RESERVED/*impdep1*/, RESERVED/*impdep2*/};
+
+    /**
+     *
+     * @param index
+     * @return Number of byte code operands
+     * @since 6.0
+     */
+    public static short getNoOfOperands(final int index) {
+        return NO_OF_OPERANDS[index];
+    }
+
+    /**
+     * How the byte code operands are to be interpreted for each opcode. Indexed
+     * by opcode. TYPE_OF_OPERANDS[ILOAD] = an array of shorts describing the
+     * data types for the instruction.
+     */
+    private static final short[][] TYPE_OF_OPERANDS = {
+        {}/*nop*/, {}/*aconst_null*/, {}/*iconst_m1*/, {}/*iconst_0*/,
+        {}/*iconst_1*/, {}/*iconst_2*/, {}/*iconst_3*/, {}/*iconst_4*/,
+        {}/*iconst_5*/, {}/*lconst_0*/, {}/*lconst_1*/, {}/*fconst_0*/,
+        {}/*fconst_1*/, {}/*fconst_2*/, {}/*dconst_0*/, {}/*dconst_1*/,
+        {T_BYTE}/*bipush*/, {T_SHORT}/*sipush*/, {T_BYTE}/*ldc*/,
+        {T_SHORT}/*ldc_w*/, {T_SHORT}/*ldc2_w*/,
+        {T_BYTE}/*iload*/, {T_BYTE}/*lload*/, {T_BYTE}/*fload*/,
+        {T_BYTE}/*dload*/, {T_BYTE}/*aload*/, {}/*iload_0*/,
+        {}/*iload_1*/, {}/*iload_2*/, {}/*iload_3*/, {}/*lload_0*/,
+        {}/*lload_1*/, {}/*lload_2*/, {}/*lload_3*/, {}/*fload_0*/,
+        {}/*fload_1*/, {}/*fload_2*/, {}/*fload_3*/, {}/*dload_0*/,
+        {}/*dload_1*/, {}/*dload_2*/, {}/*dload_3*/, {}/*aload_0*/,
+        {}/*aload_1*/, {}/*aload_2*/, {}/*aload_3*/, {}/*iaload*/,
+        {}/*laload*/, {}/*faload*/, {}/*daload*/, {}/*aaload*/,
+        {}/*baload*/, {}/*caload*/, {}/*saload*/, {T_BYTE}/*istore*/,
+        {T_BYTE}/*lstore*/, {T_BYTE}/*fstore*/, {T_BYTE}/*dstore*/,
+        {T_BYTE}/*astore*/, {}/*istore_0*/, {}/*istore_1*/,
+        {}/*istore_2*/, {}/*istore_3*/, {}/*lstore_0*/, {}/*lstore_1*/,
+        {}/*lstore_2*/, {}/*lstore_3*/, {}/*fstore_0*/, {}/*fstore_1*/,
+        {}/*fstore_2*/, {}/*fstore_3*/, {}/*dstore_0*/, {}/*dstore_1*/,
+        {}/*dstore_2*/, {}/*dstore_3*/, {}/*astore_0*/, {}/*astore_1*/,
+        {}/*astore_2*/, {}/*astore_3*/, {}/*iastore*/, {}/*lastore*/,
+        {}/*fastore*/, {}/*dastore*/, {}/*aastore*/, {}/*bastore*/,
+        {}/*castore*/, {}/*sastore*/, {}/*pop*/, {}/*pop2*/, {}/*dup*/,
+        {}/*dup_x1*/, {}/*dup_x2*/, {}/*dup2*/, {}/*dup2_x1*/,
+        {}/*dup2_x2*/, {}/*swap*/, {}/*iadd*/, {}/*ladd*/, {}/*fadd*/,
+        {}/*dadd*/, {}/*isub*/, {}/*lsub*/, {}/*fsub*/, {}/*dsub*/,
+        {}/*imul*/, {}/*lmul*/, {}/*fmul*/, {}/*dmul*/, {}/*idiv*/,
+        {}/*ldiv*/, {}/*fdiv*/, {}/*ddiv*/, {}/*irem*/, {}/*lrem*/,
+        {}/*frem*/, {}/*drem*/, {}/*ineg*/, {}/*lneg*/, {}/*fneg*/,
+        {}/*dneg*/, {}/*ishl*/, {}/*lshl*/, {}/*ishr*/, {}/*lshr*/,
+        {}/*iushr*/, {}/*lushr*/, {}/*iand*/, {}/*land*/, {}/*ior*/,
+        {}/*lor*/, {}/*ixor*/, {}/*lxor*/, {T_BYTE, T_BYTE}/*iinc*/,
+        {}/*i2l*/, {}/*i2f*/, {}/*i2d*/, {}/*l2i*/, {}/*l2f*/, {}/*l2d*/,
+        {}/*f2i*/, {}/*f2l*/, {}/*f2d*/, {}/*d2i*/, {}/*d2l*/, {}/*d2f*/,
+        {}/*i2b*/, {}/*i2c*/, {}/*i2s*/, {}/*lcmp*/, {}/*fcmpl*/,
+        {}/*fcmpg*/, {}/*dcmpl*/, {}/*dcmpg*/, {T_SHORT}/*ifeq*/,
+        {T_SHORT}/*ifne*/, {T_SHORT}/*iflt*/, {T_SHORT}/*ifge*/,
+        {T_SHORT}/*ifgt*/, {T_SHORT}/*ifle*/, {T_SHORT}/*if_icmpeq*/,
+        {T_SHORT}/*if_icmpne*/, {T_SHORT}/*if_icmplt*/,
+        {T_SHORT}/*if_icmpge*/, {T_SHORT}/*if_icmpgt*/,
+        {T_SHORT}/*if_icmple*/, {T_SHORT}/*if_acmpeq*/,
+        {T_SHORT}/*if_acmpne*/, {T_SHORT}/*goto*/, {T_SHORT}/*jsr*/,
+        {T_BYTE}/*ret*/, {}/*tableswitch*/, {}/*lookupswitch*/,
+        {}/*ireturn*/, {}/*lreturn*/, {}/*freturn*/, {}/*dreturn*/,
+        {}/*areturn*/, {}/*return*/, {T_SHORT}/*getstatic*/,
+        {T_SHORT}/*putstatic*/, {T_SHORT}/*getfield*/,
+        {T_SHORT}/*putfield*/, {T_SHORT}/*invokevirtual*/,
+        {T_SHORT}/*invokespecial*/, {T_SHORT}/*invokestatic*/,
+        {T_SHORT, T_BYTE, T_BYTE}/*invokeinterface*/, {T_SHORT, T_BYTE, T_BYTE}/*invokedynamic*/,
+        {T_SHORT}/*new*/, {T_BYTE}/*newarray*/,
+        {T_SHORT}/*anewarray*/, {}/*arraylength*/, {}/*athrow*/,
+        {T_SHORT}/*checkcast*/, {T_SHORT}/*instanceof*/,
+        {}/*monitorenter*/, {}/*monitorexit*/, {T_BYTE}/*wide*/,
+        {T_SHORT, T_BYTE}/*multianewarray*/, {T_SHORT}/*ifnull*/,
+        {T_SHORT}/*ifnonnull*/, {T_INT}/*goto_w*/, {T_INT}/*jsr_w*/,
+        {}/*breakpoint*/, {}, {}, {}, {}, {}, {}, {},
+        {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {},
+        {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {},
+        {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {},
+        {}/*impdep1*/, {}/*impdep2*/};
+
+    /**
+     * @since 6.0
+     */
+    public static short getOperandType(final int opcode, final int index) {
+        return TYPE_OF_OPERANDS[opcode][index];
+    }
+
+    /**
+     * @since 6.0
+     */
+    public static long getOperandTypeCount(final int opcode) {
+        return TYPE_OF_OPERANDS[opcode].length;
+    }
+
+    /**
+     * Names of opcodes. Indexed by opcode. OPCODE_NAMES[ALOAD] = "aload".
+     */
+    private static final String[] OPCODE_NAMES = {
+        "nop", "aconst_null", "iconst_m1", "iconst_0", "iconst_1",
+        "iconst_2", "iconst_3", "iconst_4", "iconst_5", "lconst_0",
+        "lconst_1", "fconst_0", "fconst_1", "fconst_2", "dconst_0",
+        "dconst_1", "bipush", "sipush", "ldc", "ldc_w", "ldc2_w", "iload",
+        "lload", "fload", "dload", "aload", "iload_0", "iload_1", "iload_2",
+        "iload_3", "lload_0", "lload_1", "lload_2", "lload_3", "fload_0",
+        "fload_1", "fload_2", "fload_3", "dload_0", "dload_1", "dload_2",
+        "dload_3", "aload_0", "aload_1", "aload_2", "aload_3", "iaload",
+        "laload", "faload", "daload", "aaload", "baload", "caload", "saload",
+        "istore", "lstore", "fstore", "dstore", "astore", "istore_0",
+        "istore_1", "istore_2", "istore_3", "lstore_0", "lstore_1",
+        "lstore_2", "lstore_3", "fstore_0", "fstore_1", "fstore_2",
+        "fstore_3", "dstore_0", "dstore_1", "dstore_2", "dstore_3",
+        "astore_0", "astore_1", "astore_2", "astore_3", "iastore", "lastore",
+        "fastore", "dastore", "aastore", "bastore", "castore", "sastore",
+        "pop", "pop2", "dup", "dup_x1", "dup_x2", "dup2", "dup2_x1",
+        "dup2_x2", "swap", "iadd", "ladd", "fadd", "dadd", "isub", "lsub",
+        "fsub", "dsub", "imul", "lmul", "fmul", "dmul", "idiv", "ldiv",
+        "fdiv", "ddiv", "irem", "lrem", "frem", "drem", "ineg", "lneg",
+        "fneg", "dneg", "ishl", "lshl", "ishr", "lshr", "iushr", "lushr",
+        "iand", "land", "ior", "lor", "ixor", "lxor", "iinc", "i2l", "i2f",
+        "i2d", "l2i", "l2f", "l2d", "f2i", "f2l", "f2d", "d2i", "d2l", "d2f",
+        "i2b", "i2c", "i2s", "lcmp", "fcmpl", "fcmpg",
+        "dcmpl", "dcmpg", "ifeq", "ifne", "iflt", "ifge", "ifgt", "ifle",
+        "if_icmpeq", "if_icmpne", "if_icmplt", "if_icmpge", "if_icmpgt",
+        "if_icmple", "if_acmpeq", "if_acmpne", "goto", "jsr", "ret",
+        "tableswitch", "lookupswitch", "ireturn", "lreturn", "freturn",
+        "dreturn", "areturn", "return", "getstatic", "putstatic", "getfield",
+        "putfield", "invokevirtual", "invokespecial", "invokestatic",
+        "invokeinterface", "invokedynamic", "new", "newarray", "anewarray",
+        "arraylength", "athrow", "checkcast", "instanceof", "monitorenter",
+        "monitorexit", "wide", "multianewarray", "ifnull", "ifnonnull",
+        "goto_w", "jsr_w", "breakpoint", ILLEGAL_OPCODE, ILLEGAL_OPCODE,
+        ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE,
+        ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE,
+        ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE,
+        ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE,
+        ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE,
+        ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE,
+        ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE,
+        ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE,
+        ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE,
+        ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE,
+        ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE,
+        ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE,
+        ILLEGAL_OPCODE, "impdep1", "impdep2"
+    };
+
+    /**
+     * @since 6.0
+     */
+    public static final int OPCODE_NAMES_LENGTH = OPCODE_NAMES.length;
+
+    /**
+     * @since 6.0
+     */
+    public static String getOpcodeName(final int index) {
+        return OPCODE_NAMES[index];
+    }
+
+    /**
+     * Number of words consumed on operand stack by instructions. Indexed by
+     * opcode. CONSUME_STACK[FALOAD] = number of words consumed from the stack
+     * by a faload instruction.
+     */
+    private static final int[] CONSUME_STACK = {
+        0/*nop*/, 0/*aconst_null*/, 0/*iconst_m1*/, 0/*iconst_0*/, 0/*iconst_1*/,
+        0/*iconst_2*/, 0/*iconst_3*/, 0/*iconst_4*/, 0/*iconst_5*/, 0/*lconst_0*/,
+        0/*lconst_1*/, 0/*fconst_0*/, 0/*fconst_1*/, 0/*fconst_2*/, 0/*dconst_0*/,
+        0/*dconst_1*/, 0/*bipush*/, 0/*sipush*/, 0/*ldc*/, 0/*ldc_w*/, 0/*ldc2_w*/, 0/*iload*/,
+        0/*lload*/, 0/*fload*/, 0/*dload*/, 0/*aload*/, 0/*iload_0*/, 0/*iload_1*/, 0/*iload_2*/,
+        0/*iload_3*/, 0/*lload_0*/, 0/*lload_1*/, 0/*lload_2*/, 0/*lload_3*/, 0/*fload_0*/,
+        0/*fload_1*/, 0/*fload_2*/, 0/*fload_3*/, 0/*dload_0*/, 0/*dload_1*/, 0/*dload_2*/,
+        0/*dload_3*/, 0/*aload_0*/, 0/*aload_1*/, 0/*aload_2*/, 0/*aload_3*/, 2/*iaload*/,
+        2/*laload*/, 2/*faload*/, 2/*daload*/, 2/*aaload*/, 2/*baload*/, 2/*caload*/, 2/*saload*/,
+        1/*istore*/, 2/*lstore*/, 1/*fstore*/, 2/*dstore*/, 1/*astore*/, 1/*istore_0*/,
+        1/*istore_1*/, 1/*istore_2*/, 1/*istore_3*/, 2/*lstore_0*/, 2/*lstore_1*/,
+        2/*lstore_2*/, 2/*lstore_3*/, 1/*fstore_0*/, 1/*fstore_1*/, 1/*fstore_2*/,
+        1/*fstore_3*/, 2/*dstore_0*/, 2/*dstore_1*/, 2/*dstore_2*/, 2/*dstore_3*/,
+        1/*astore_0*/, 1/*astore_1*/, 1/*astore_2*/, 1/*astore_3*/, 3/*iastore*/, 4/*lastore*/,
+        3/*fastore*/, 4/*dastore*/, 3/*aastore*/, 3/*bastore*/, 3/*castore*/, 3/*sastore*/,
+        1/*pop*/, 2/*pop2*/, 1/*dup*/, 2/*dup_x1*/, 3/*dup_x2*/, 2/*dup2*/, 3/*dup2_x1*/,
+        4/*dup2_x2*/, 2/*swap*/, 2/*iadd*/, 4/*ladd*/, 2/*fadd*/, 4/*dadd*/, 2/*isub*/, 4/*lsub*/,
+        2/*fsub*/, 4/*dsub*/, 2/*imul*/, 4/*lmul*/, 2/*fmul*/, 4/*dmul*/, 2/*idiv*/, 4/*ldiv*/,
+        2/*fdiv*/, 4/*ddiv*/, 2/*irem*/, 4/*lrem*/, 2/*frem*/, 4/*drem*/, 1/*ineg*/, 2/*lneg*/,
+        1/*fneg*/, 2/*dneg*/, 2/*ishl*/, 3/*lshl*/, 2/*ishr*/, 3/*lshr*/, 2/*iushr*/, 3/*lushr*/,
+        2/*iand*/, 4/*land*/, 2/*ior*/, 4/*lor*/, 2/*ixor*/, 4/*lxor*/, 0/*iinc*/,
+        1/*i2l*/, 1/*i2f*/, 1/*i2d*/, 2/*l2i*/, 2/*l2f*/, 2/*l2d*/, 1/*f2i*/, 1/*f2l*/,
+        1/*f2d*/, 2/*d2i*/, 2/*d2l*/, 2/*d2f*/, 1/*i2b*/, 1/*i2c*/, 1/*i2s*/,
+        4/*lcmp*/, 2/*fcmpl*/, 2/*fcmpg*/, 4/*dcmpl*/, 4/*dcmpg*/, 1/*ifeq*/, 1/*ifne*/,
+        1/*iflt*/, 1/*ifge*/, 1/*ifgt*/, 1/*ifle*/, 2/*if_icmpeq*/, 2/*if_icmpne*/, 2/*if_icmplt*/,
+        2 /*if_icmpge*/, 2/*if_icmpgt*/, 2/*if_icmple*/, 2/*if_acmpeq*/, 2/*if_acmpne*/,
+        0/*goto*/, 0/*jsr*/, 0/*ret*/, 1/*tableswitch*/, 1/*lookupswitch*/, 1/*ireturn*/,
+        2/*lreturn*/, 1/*freturn*/, 2/*dreturn*/, 1/*areturn*/, 0/*return*/, 0/*getstatic*/,
+        UNPREDICTABLE/*putstatic*/, 1/*getfield*/, UNPREDICTABLE/*putfield*/,
+        UNPREDICTABLE/*invokevirtual*/, UNPREDICTABLE/*invokespecial*/,
+        UNPREDICTABLE/*invokestatic*/,
+        UNPREDICTABLE/*invokeinterface*/, UNPREDICTABLE/*invokedynamic*/, 0/*new*/, 1/*newarray*/, 1/*anewarray*/,
+        1/*arraylength*/, 1/*athrow*/, 1/*checkcast*/, 1/*instanceof*/, 1/*monitorenter*/,
+        1/*monitorexit*/, 0/*wide*/, UNPREDICTABLE/*multianewarray*/, 1/*ifnull*/, 1/*ifnonnull*/,
+        0/*goto_w*/, 0/*jsr_w*/, 0/*breakpoint*/, UNDEFINED, UNDEFINED,
+        UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
+        UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
+        UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
+        UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
+        UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
+        UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
+        UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
+        UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
+        UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
+        UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
+        UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
+        UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
+        UNDEFINED, UNPREDICTABLE/*impdep1*/, UNPREDICTABLE/*impdep2*/};
+
+    /**
+     *
+     * @param index
+     * @return Number of words consumed on operand stack
+     * @since 6.0
+     */
+    public static int getConsumeStack(final int index) {
+        return CONSUME_STACK[index];
+    }
+
+    /**
+     * Number of words produced onto operand stack by instructions. Indexed by
+     * opcode. CONSUME_STACK[DALOAD] = number of words consumed from the stack
+     * by a daload instruction.
+     */
+    private static final int[] PRODUCE_STACK = {
+        0/*nop*/, 1/*aconst_null*/, 1/*iconst_m1*/, 1/*iconst_0*/, 1/*iconst_1*/,
+        1/*iconst_2*/, 1/*iconst_3*/, 1/*iconst_4*/, 1/*iconst_5*/, 2/*lconst_0*/,
+        2/*lconst_1*/, 1/*fconst_0*/, 1/*fconst_1*/, 1/*fconst_2*/, 2/*dconst_0*/,
+        2/*dconst_1*/, 1/*bipush*/, 1/*sipush*/, 1/*ldc*/, 1/*ldc_w*/, 2/*ldc2_w*/, 1/*iload*/,
+        2/*lload*/, 1/*fload*/, 2/*dload*/, 1/*aload*/, 1/*iload_0*/, 1/*iload_1*/, 1/*iload_2*/,
+        1/*iload_3*/, 2/*lload_0*/, 2/*lload_1*/, 2/*lload_2*/, 2/*lload_3*/, 1/*fload_0*/,
+        1/*fload_1*/, 1/*fload_2*/, 1/*fload_3*/, 2/*dload_0*/, 2/*dload_1*/, 2/*dload_2*/,
+        2/*dload_3*/, 1/*aload_0*/, 1/*aload_1*/, 1/*aload_2*/, 1/*aload_3*/, 1/*iaload*/,
+        2/*laload*/, 1/*faload*/, 2/*daload*/, 1/*aaload*/, 1/*baload*/, 1/*caload*/, 1/*saload*/,
+        0/*istore*/, 0/*lstore*/, 0/*fstore*/, 0/*dstore*/, 0/*astore*/, 0/*istore_0*/,
+        0/*istore_1*/, 0/*istore_2*/, 0/*istore_3*/, 0/*lstore_0*/, 0/*lstore_1*/,
+        0/*lstore_2*/, 0/*lstore_3*/, 0/*fstore_0*/, 0/*fstore_1*/, 0/*fstore_2*/,
+        0/*fstore_3*/, 0/*dstore_0*/, 0/*dstore_1*/, 0/*dstore_2*/, 0/*dstore_3*/,
+        0/*astore_0*/, 0/*astore_1*/, 0/*astore_2*/, 0/*astore_3*/, 0/*iastore*/, 0/*lastore*/,
+        0/*fastore*/, 0/*dastore*/, 0/*aastore*/, 0/*bastore*/, 0/*castore*/, 0/*sastore*/,
+        0/*pop*/, 0/*pop2*/, 2/*dup*/, 3/*dup_x1*/, 4/*dup_x2*/, 4/*dup2*/, 5/*dup2_x1*/,
+        6/*dup2_x2*/, 2/*swap*/, 1/*iadd*/, 2/*ladd*/, 1/*fadd*/, 2/*dadd*/, 1/*isub*/, 2/*lsub*/,
+        1/*fsub*/, 2/*dsub*/, 1/*imul*/, 2/*lmul*/, 1/*fmul*/, 2/*dmul*/, 1/*idiv*/, 2/*ldiv*/,
+        1/*fdiv*/, 2/*ddiv*/, 1/*irem*/, 2/*lrem*/, 1/*frem*/, 2/*drem*/, 1/*ineg*/, 2/*lneg*/,
+        1/*fneg*/, 2/*dneg*/, 1/*ishl*/, 2/*lshl*/, 1/*ishr*/, 2/*lshr*/, 1/*iushr*/, 2/*lushr*/,
+        1/*iand*/, 2/*land*/, 1/*ior*/, 2/*lor*/, 1/*ixor*/, 2/*lxor*/,
+        0/*iinc*/, 2/*i2l*/, 1/*i2f*/, 2/*i2d*/, 1/*l2i*/, 1/*l2f*/, 2/*l2d*/, 1/*f2i*/,
+        2/*f2l*/, 2/*f2d*/, 1/*d2i*/, 2/*d2l*/, 1/*d2f*/,
+        1/*i2b*/, 1/*i2c*/, 1/*i2s*/, 1/*lcmp*/, 1/*fcmpl*/, 1/*fcmpg*/,
+        1/*dcmpl*/, 1/*dcmpg*/, 0/*ifeq*/, 0/*ifne*/, 0/*iflt*/, 0/*ifge*/, 0/*ifgt*/, 0/*ifle*/,
+        0/*if_icmpeq*/, 0/*if_icmpne*/, 0/*if_icmplt*/, 0/*if_icmpge*/, 0/*if_icmpgt*/,
+        0/*if_icmple*/, 0/*if_acmpeq*/, 0/*if_acmpne*/, 0/*goto*/, 1/*jsr*/, 0/*ret*/,
+        0/*tableswitch*/, 0/*lookupswitch*/, 0/*ireturn*/, 0/*lreturn*/, 0/*freturn*/,
+        0/*dreturn*/, 0/*areturn*/, 0/*return*/, UNPREDICTABLE/*getstatic*/, 0/*putstatic*/,
+        UNPREDICTABLE/*getfield*/, 0/*putfield*/, UNPREDICTABLE/*invokevirtual*/,
+        UNPREDICTABLE/*invokespecial*/, UNPREDICTABLE/*invokestatic*/,
+        UNPREDICTABLE/*invokeinterface*/, UNPREDICTABLE/*invokedynamic*/, 1/*new*/, 1/*newarray*/, 1/*anewarray*/,
+        1/*arraylength*/, 1/*athrow*/, 1/*checkcast*/, 1/*instanceof*/, 0/*monitorenter*/,
+        0/*monitorexit*/, 0/*wide*/, 1/*multianewarray*/, 0/*ifnull*/, 0/*ifnonnull*/,
+        0/*goto_w*/, 1/*jsr_w*/, 0/*breakpoint*/, UNDEFINED, UNDEFINED,
+        UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
+        UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
+        UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
+        UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
+        UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
+        UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
+        UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
+        UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
+        UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
+        UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
+        UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
+        UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
+        UNDEFINED, UNPREDICTABLE/*impdep1*/, UNPREDICTABLE/*impdep2*/};
+
+    /**
+     *
+     * @param index
+     * @return Number of words produced onto operand stack
+     * @since 6.0
+     */
+    public static int getProduceStack(final int index) {
+        return PRODUCE_STACK[index];
+    }
+
+    /**
+     * Attributes and their corresponding names.
+     */
+    public static final byte ATTR_UNKNOWN = -1;
+    public static final byte ATTR_SOURCE_FILE = 0;
+    public static final byte ATTR_CONSTANT_VALUE = 1;
+    public static final byte ATTR_CODE = 2;
+    public static final byte ATTR_EXCEPTIONS = 3;
+    public static final byte ATTR_LINE_NUMBER_TABLE = 4;
+    public static final byte ATTR_LOCAL_VARIABLE_TABLE = 5;
+    public static final byte ATTR_INNER_CLASSES = 6;
+    public static final byte ATTR_SYNTHETIC = 7;
+    public static final byte ATTR_DEPRECATED = 8;
+    public static final byte ATTR_PMG = 9;
+    public static final byte ATTR_SIGNATURE = 10;
+    public static final byte ATTR_STACK_MAP = 11;
+    public static final byte ATTR_RUNTIME_VISIBLE_ANNOTATIONS = 12;
+    public static final byte ATTR_RUNTIME_INVISIBLE_ANNOTATIONS = 13;
+    public static final byte ATTR_RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS = 14;
+    public static final byte ATTR_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS = 15;
+    public static final byte ATTR_ANNOTATION_DEFAULT = 16;
+    public static final byte ATTR_LOCAL_VARIABLE_TYPE_TABLE = 17;
+    public static final byte ATTR_ENCLOSING_METHOD = 18;
+    public static final byte ATTR_STACK_MAP_TABLE = 19;
+    public static final byte ATTR_BOOTSTRAP_METHODS = 20;
+    public static final byte ATTR_METHOD_PARAMETERS = 21;
+
+    public static final short KNOWN_ATTRIBUTES = 22; // count of attributes
+
+    private static final String[] ATTRIBUTE_NAMES = {
+        "SourceFile", "ConstantValue", "Code", "Exceptions",
+        "LineNumberTable", "LocalVariableTable",
+        "InnerClasses", "Synthetic", "Deprecated",
+        "PMGClass", "Signature", "StackMap",
+        "RuntimeVisibleAnnotations", "RuntimeInvisibleAnnotations",
+        "RuntimeVisibleParameterAnnotations", "RuntimeInvisibleParameterAnnotations",
+        "AnnotationDefault", "LocalVariableTypeTable", "EnclosingMethod", "StackMapTable",
+        "BootstrapMethods", "MethodParameters"
+    };
+
+    /**
+     *
+     * @param index
+     * @return the attribute name
+     * @since 6.0
+     */
+    public static String getAttributeName(final int index) {
+        return ATTRIBUTE_NAMES[index];
+    }
+
+    /**
+     * Constants used in the StackMap attribute.
+     */
+    public static final byte ITEM_Bogus = 0;
+    public static final byte ITEM_Integer = 1;
+    public static final byte ITEM_Float = 2;
+    public static final byte ITEM_Double = 3;
+    public static final byte ITEM_Long = 4;
+    public static final byte ITEM_Null = 5;
+    public static final byte ITEM_InitObject = 6;
+    public static final byte ITEM_Object = 7;
+    public static final byte ITEM_NewObject = 8;
+
+    private static final String[] ITEM_NAMES = {
+        "Bogus", "Integer", "Float", "Double", "Long",
+        "Null", "InitObject", "Object", "NewObject"
+    };
+
+    /**
+     *
+     * @param index
+     * @return the item name
+     * @since 6.0
+     */
+    public static String getItemName(final int index) {
+        return ITEM_NAMES[index];
+    }
+
+    /**
+     * Constants used to identify StackMapEntry types.
+     *
+     * For those types which can specify a range, the constant names the lowest
+     * value.
+     */
+    public static final int SAME_FRAME = 0;
+    public static final int SAME_LOCALS_1_STACK_ITEM_FRAME = 64;
+    public static final int SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED = 247;
+    public static final int CHOP_FRAME = 248;
+    public static final int SAME_FRAME_EXTENDED = 251;
+    public static final int APPEND_FRAME = 252;
+    public static final int FULL_FRAME = 255;
+
+    /**
+     * Constants that define the maximum value of those constants which store
+     * ranges.
+     */
+    public static final int SAME_FRAME_MAX = 63;
+    public static final int SAME_LOCALS_1_STACK_ITEM_FRAME_MAX = 127;
+    public static final int CHOP_FRAME_MAX = 250;
+    public static final int APPEND_FRAME_MAX = 254;
+
+  // Constants defining the behavior of the Method Handles (JVMS 5.4.3.5)
+    public static final byte REF_getField = 1;
+    public static final byte REF_getStatic = 2;
+    public static final byte REF_putField = 3;
+    public static final byte REF_putStatic = 4;
+    public static final byte REF_invokeVirtual = 5;
+    public static final byte REF_invokeStatic = 6;
+    public static final byte REF_invokeSpecial = 7;
+    public static final byte REF_newInvokeSpecial = 8;
+    public static final byte REF_invokeInterface = 9;
+
+    /**
+     * The names of the reference_kinds of a CONSTANT_MethodHandle_info.
+     */
+    private static final String[] METHODHANDLE_NAMES = {
+        "", "getField", "getStatic", "putField", "putStatic", "invokeVirtual",
+        "invokeStatic", "invokeSpecial", "newInvokeSpecial", "invokeInterface"};
+
+    /**
+     *
+     * @param index
+     * @return the method handle name
+     * @since 6.0
+     */
+    public static String getMethodHandleName(final int index) {
+        return METHODHANDLE_NAMES[index];
+    }
+
+    private Const() {
+    } // not instantiable
+
+}
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/Constants.java	Mon Aug 28 00:49:06 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,754 +0,0 @@
-/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
- */
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.sun.org.apache.bcel.internal;
-
-
-/**
- * Constants for the project, mostly defined in the JVM specification.
- *
- * @author  <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A>
- */
-public interface Constants {
-  /** Major and minor version of the code.
-   */
-  public final static short MAJOR_1_1 = 45;
-  public final static short MINOR_1_1 = 3;
-  public final static short MAJOR_1_2 = 46;
-  public final static short MINOR_1_2 = 0;
-  public final static short MAJOR_1_3 = 47;
-  public final static short MINOR_1_3 = 0;
-  public final static short MAJOR     = MAJOR_1_1; // Defaults
-  public final static short MINOR     = MINOR_1_1;
-
-  /** Maximum value for an unsigned short.
-   */
-  public final static int MAX_SHORT = 65535; // 2^16 - 1
-
-  /** Maximum value for an unsigned byte.
-   */
-  public final static int MAX_BYTE  = 255; // 2^8 - 1
-
-  /** Access flags for classes, fields and methods.
-   */
-  public final static short ACC_PUBLIC       = 0x0001;
-  public final static short ACC_PRIVATE      = 0x0002;
-  public final static short ACC_PROTECTED    = 0x0004;
-  public final static short ACC_STATIC       = 0x0008;
-
-  public final static short ACC_FINAL        = 0x0010;
-  public final static short ACC_SYNCHRONIZED = 0x0020;
-  public final static short ACC_VOLATILE     = 0x0040;
-  public final static short ACC_TRANSIENT    = 0x0080;
-
-  public final static short ACC_NATIVE       = 0x0100;
-  public final static short ACC_INTERFACE    = 0x0200;
-  public final static short ACC_ABSTRACT     = 0x0400;
-  public final static short ACC_STRICT       = 0x0800;
-
-  // Applies to classes compiled by new compilers only
-  public final static short ACC_SUPER        = 0x0020;
-
-  public final static short MAX_ACC_FLAG     = ACC_STRICT;
-
-  public final static String[] ACCESS_NAMES = {
-    "public", "private", "protected", "static", "final", "synchronized",
-    "volatile", "transient", "native", "interface", "abstract", "strictfp"
-  };
-
-  /** Tags in constant pool to denote type of constant.
-   */
-  public final static byte CONSTANT_Utf8               = 1;
-  public final static byte CONSTANT_Integer            = 3;
-  public final static byte CONSTANT_Float              = 4;
-  public final static byte CONSTANT_Long               = 5;
-  public final static byte CONSTANT_Double             = 6;
-  public final static byte CONSTANT_Class              = 7;
-  public final static byte CONSTANT_Fieldref           = 9;
-  public final static byte CONSTANT_String             = 8;
-  public final static byte CONSTANT_Methodref          = 10;
-  public final static byte CONSTANT_InterfaceMethodref = 11;
-  public final static byte CONSTANT_NameAndType        = 12;
-
-  public final static String[] CONSTANT_NAMES = {
-    "", "CONSTANT_Utf8", "", "CONSTANT_Integer",
-    "CONSTANT_Float", "CONSTANT_Long", "CONSTANT_Double",
-    "CONSTANT_Class", "CONSTANT_String", "CONSTANT_Fieldref",
-    "CONSTANT_Methodref", "CONSTANT_InterfaceMethodref",
-    "CONSTANT_NameAndType" };
-
-  /** The name of the static initializer, also called &quot;class
-   *  initialization method&quot; or &quot;interface initialization
-   *   method&quot;. This is &quot;&lt;clinit&gt;&quot;.
-   */
-  public final static String STATIC_INITIALIZER_NAME = "<clinit>";
-
-  /** The name of every constructor method in a class, also called
-   * &quot;instance initialization method&quot;. This is &quot;&lt;init&gt;&quot;.
-   */
-  public final static String CONSTRUCTOR_NAME = "<init>";
-
-  /** The names of the interfaces implemented by arrays */
-  public final static String[] INTERFACES_IMPLEMENTED_BY_ARRAYS = {"java.lang.Cloneable", "java.io.Serializable"};
-
-  /**
-   * Limitations of the Java Virtual Machine.
-   * See The Java Virtual Machine Specification, Second Edition, page 152, chapter 4.10.
-   */
-  public static final int MAX_CP_ENTRIES     = 65535;
-  public static final int MAX_CODE_SIZE      = 65536; //bytes
-
-  /** Java VM opcodes.
-   */
-  public static final short NOP              = 0;
-  public static final short ACONST_NULL      = 1;
-  public static final short ICONST_M1        = 2;
-  public static final short ICONST_0         = 3;
-  public static final short ICONST_1         = 4;
-  public static final short ICONST_2         = 5;
-  public static final short ICONST_3         = 6;
-  public static final short ICONST_4         = 7;
-  public static final short ICONST_5         = 8;
-  public static final short LCONST_0         = 9;
-  public static final short LCONST_1         = 10;
-  public static final short FCONST_0         = 11;
-  public static final short FCONST_1         = 12;
-  public static final short FCONST_2         = 13;
-  public static final short DCONST_0         = 14;
-  public static final short DCONST_1         = 15;
-  public static final short BIPUSH           = 16;
-  public static final short SIPUSH           = 17;
-  public static final short LDC              = 18;
-  public static final short LDC_W            = 19;
-  public static final short LDC2_W           = 20;
-  public static final short ILOAD            = 21;
-  public static final short LLOAD            = 22;
-  public static final short FLOAD            = 23;
-  public static final short DLOAD            = 24;
-  public static final short ALOAD            = 25;
-  public static final short ILOAD_0          = 26;
-  public static final short ILOAD_1          = 27;
-  public static final short ILOAD_2          = 28;
-  public static final short ILOAD_3          = 29;
-  public static final short LLOAD_0          = 30;
-  public static final short LLOAD_1          = 31;
-  public static final short LLOAD_2          = 32;
-  public static final short LLOAD_3          = 33;
-  public static final short FLOAD_0          = 34;
-  public static final short FLOAD_1          = 35;
-  public static final short FLOAD_2          = 36;
-  public static final short FLOAD_3          = 37;
-  public static final short DLOAD_0          = 38;
-  public static final short DLOAD_1          = 39;
-  public static final short DLOAD_2          = 40;
-  public static final short DLOAD_3          = 41;
-  public static final short ALOAD_0          = 42;
-  public static final short ALOAD_1          = 43;
-  public static final short ALOAD_2          = 44;
-  public static final short ALOAD_3          = 45;
-  public static final short IALOAD           = 46;
-  public static final short LALOAD           = 47;
-  public static final short FALOAD           = 48;
-  public static final short DALOAD           = 49;
-  public static final short AALOAD           = 50;
-  public static final short BALOAD           = 51;
-  public static final short CALOAD           = 52;
-  public static final short SALOAD           = 53;
-  public static final short ISTORE           = 54;
-  public static final short LSTORE           = 55;
-  public static final short FSTORE           = 56;
-  public static final short DSTORE           = 57;
-  public static final short ASTORE           = 58;
-  public static final short ISTORE_0         = 59;
-  public static final short ISTORE_1         = 60;
-  public static final short ISTORE_2         = 61;
-  public static final short ISTORE_3         = 62;
-  public static final short LSTORE_0         = 63;
-  public static final short LSTORE_1         = 64;
-  public static final short LSTORE_2         = 65;
-  public static final short LSTORE_3         = 66;
-  public static final short FSTORE_0         = 67;
-  public static final short FSTORE_1         = 68;
-  public static final short FSTORE_2         = 69;
-  public static final short FSTORE_3         = 70;
-  public static final short DSTORE_0         = 71;
-  public static final short DSTORE_1         = 72;
-  public static final short DSTORE_2         = 73;
-  public static final short DSTORE_3         = 74;
-  public static final short ASTORE_0         = 75;
-  public static final short ASTORE_1         = 76;
-  public static final short ASTORE_2         = 77;
-  public static final short ASTORE_3         = 78;
-  public static final short IASTORE          = 79;
-  public static final short LASTORE          = 80;
-  public static final short FASTORE          = 81;
-  public static final short DASTORE          = 82;
-  public static final short AASTORE          = 83;
-  public static final short BASTORE          = 84;
-  public static final short CASTORE          = 85;
-  public static final short SASTORE          = 86;
-  public static final short POP              = 87;
-  public static final short POP2             = 88;
-  public static final short DUP              = 89;
-  public static final short DUP_X1           = 90;
-  public static final short DUP_X2           = 91;
-  public static final short DUP2             = 92;
-  public static final short DUP2_X1          = 93;
-  public static final short DUP2_X2          = 94;
-  public static final short SWAP             = 95;
-  public static final short IADD             = 96;
-  public static final short LADD             = 97;
-  public static final short FADD             = 98;
-  public static final short DADD             = 99;
-  public static final short ISUB             = 100;
-  public static final short LSUB             = 101;
-  public static final short FSUB             = 102;
-  public static final short DSUB             = 103;
-  public static final short IMUL             = 104;
-  public static final short LMUL             = 105;
-  public static final short FMUL             = 106;
-  public static final short DMUL             = 107;
-  public static final short IDIV             = 108;
-  public static final short LDIV             = 109;
-  public static final short FDIV             = 110;
-  public static final short DDIV             = 111;
-  public static final short IREM             = 112;
-  public static final short LREM             = 113;
-  public static final short FREM             = 114;
-  public static final short DREM             = 115;
-  public static final short INEG             = 116;
-  public static final short LNEG             = 117;
-  public static final short FNEG             = 118;
-  public static final short DNEG             = 119;
-  public static final short ISHL             = 120;
-  public static final short LSHL             = 121;
-  public static final short ISHR             = 122;
-  public static final short LSHR             = 123;
-  public static final short IUSHR            = 124;
-  public static final short LUSHR            = 125;
-  public static final short IAND             = 126;
-  public static final short LAND             = 127;
-  public static final short IOR              = 128;
-  public static final short LOR              = 129;
-  public static final short IXOR             = 130;
-  public static final short LXOR             = 131;
-  public static final short IINC             = 132;
-  public static final short I2L              = 133;
-  public static final short I2F              = 134;
-  public static final short I2D              = 135;
-  public static final short L2I              = 136;
-  public static final short L2F              = 137;
-  public static final short L2D              = 138;
-  public static final short F2I              = 139;
-  public static final short F2L              = 140;
-  public static final short F2D              = 141;
-  public static final short D2I              = 142;
-  public static final short D2L              = 143;
-  public static final short D2F              = 144;
-  public static final short I2B              = 145;
-  public static final short INT2BYTE         = 145; // Old notion
-  public static final short I2C              = 146;
-  public static final short INT2CHAR         = 146; // Old notion
-  public static final short I2S              = 147;
-  public static final short INT2SHORT        = 147; // Old notion
-  public static final short LCMP             = 148;
-  public static final short FCMPL            = 149;
-  public static final short FCMPG            = 150;
-  public static final short DCMPL            = 151;
-  public static final short DCMPG            = 152;
-  public static final short IFEQ             = 153;
-  public static final short IFNE             = 154;
-  public static final short IFLT             = 155;
-  public static final short IFGE             = 156;
-  public static final short IFGT             = 157;
-  public static final short IFLE             = 158;
-  public static final short IF_ICMPEQ        = 159;
-  public static final short IF_ICMPNE        = 160;
-  public static final short IF_ICMPLT        = 161;
-  public static final short IF_ICMPGE        = 162;
-  public static final short IF_ICMPGT        = 163;
-  public static final short IF_ICMPLE        = 164;
-  public static final short IF_ACMPEQ        = 165;
-  public static final short IF_ACMPNE        = 166;
-  public static final short GOTO             = 167;
-  public static final short JSR              = 168;
-  public static final short RET              = 169;
-  public static final short TABLESWITCH      = 170;
-  public static final short LOOKUPSWITCH     = 171;
-  public static final short IRETURN          = 172;
-  public static final short LRETURN          = 173;
-  public static final short FRETURN          = 174;
-  public static final short DRETURN          = 175;
-  public static final short ARETURN          = 176;
-  public static final short RETURN           = 177;
-  public static final short GETSTATIC        = 178;
-  public static final short PUTSTATIC        = 179;
-  public static final short GETFIELD         = 180;
-  public static final short PUTFIELD         = 181;
-  public static final short INVOKEVIRTUAL    = 182;
-  public static final short INVOKESPECIAL    = 183;
-  public static final short INVOKENONVIRTUAL = 183; // Old name in JDK 1.0
-  public static final short INVOKESTATIC     = 184;
-  public static final short INVOKEINTERFACE  = 185;
-  public static final short NEW              = 187;
-  public static final short NEWARRAY         = 188;
-  public static final short ANEWARRAY        = 189;
-  public static final short ARRAYLENGTH      = 190;
-  public static final short ATHROW           = 191;
-  public static final short CHECKCAST        = 192;
-  public static final short INSTANCEOF       = 193;
-  public static final short MONITORENTER     = 194;
-  public static final short MONITOREXIT      = 195;
-  public static final short WIDE             = 196;
-  public static final short MULTIANEWARRAY   = 197;
-  public static final short IFNULL           = 198;
-  public static final short IFNONNULL        = 199;
-  public static final short GOTO_W           = 200;
-  public static final short JSR_W            = 201;
-
-  /**
-   * Non-legal opcodes, may be used by JVM internally.
-   */
-  public static final short BREAKPOINT                = 202;
-  public static final short LDC_QUICK                 = 203;
-  public static final short LDC_W_QUICK               = 204;
-  public static final short LDC2_W_QUICK              = 205;
-  public static final short GETFIELD_QUICK            = 206;
-  public static final short PUTFIELD_QUICK            = 207;
-  public static final short GETFIELD2_QUICK           = 208;
-  public static final short PUTFIELD2_QUICK           = 209;
-  public static final short GETSTATIC_QUICK           = 210;
-  public static final short PUTSTATIC_QUICK           = 211;
-  public static final short GETSTATIC2_QUICK          = 212;
-  public static final short PUTSTATIC2_QUICK          = 213;
-  public static final short INVOKEVIRTUAL_QUICK       = 214;
-  public static final short INVOKENONVIRTUAL_QUICK    = 215;
-  public static final short INVOKESUPER_QUICK         = 216;
-  public static final short INVOKESTATIC_QUICK        = 217;
-  public static final short INVOKEINTERFACE_QUICK     = 218;
-  public static final short INVOKEVIRTUALOBJECT_QUICK = 219;
-  public static final short NEW_QUICK                 = 221;
-  public static final short ANEWARRAY_QUICK           = 222;
-  public static final short MULTIANEWARRAY_QUICK      = 223;
-  public static final short CHECKCAST_QUICK           = 224;
-  public static final short INSTANCEOF_QUICK          = 225;
-  public static final short INVOKEVIRTUAL_QUICK_W     = 226;
-  public static final short GETFIELD_QUICK_W          = 227;
-  public static final short PUTFIELD_QUICK_W          = 228;
-  public static final short IMPDEP1                   = 254;
-  public static final short IMPDEP2                   = 255;
-
-  /**
-   * For internal purposes only.
-   */
-  public static final short PUSH             = 4711;
-  public static final short SWITCH           = 4712;
-
-  /**
-   * Illegal codes
-   */
-  public static final short  UNDEFINED      = -1;
-  public static final short  UNPREDICTABLE  = -2;
-  public static final short  RESERVED       = -3;
-  public static final String ILLEGAL_OPCODE = "<illegal opcode>";
-  public static final String ILLEGAL_TYPE   = "<illegal type>";
-
-  public static final byte T_BOOLEAN = 4;
-  public static final byte T_CHAR    = 5;
-  public static final byte T_FLOAT   = 6;
-  public static final byte T_DOUBLE  = 7;
-  public static final byte T_BYTE    = 8;
-  public static final byte T_SHORT   = 9;
-  public static final byte T_INT     = 10;
-  public static final byte T_LONG    = 11;
-
-  public static final byte T_VOID      = 12; // Non-standard
-  public static final byte T_ARRAY     = 13;
-  public static final byte T_OBJECT    = 14;
-  public static final byte T_REFERENCE = 14; // Deprecated
-  public static final byte T_UNKNOWN   = 15;
-  public static final byte T_ADDRESS   = 16;
-
-  /** The primitive type names corresponding to the T_XX constants,
-   * e.g., TYPE_NAMES[T_INT] = "int"
-   */
-  public static final String[] TYPE_NAMES = {
-    ILLEGAL_TYPE, ILLEGAL_TYPE,  ILLEGAL_TYPE, ILLEGAL_TYPE,
-    "boolean", "char", "float", "double", "byte", "short", "int", "long",
-    "void", "array", "object", "unknown" // Non-standard
-  };
-
-  /** The primitive class names corresponding to the T_XX constants,
-   * e.g., CLASS_TYPE_NAMES[T_INT] = "java.lang.Integer"
-   */
-  public static final String[] CLASS_TYPE_NAMES = {
-    ILLEGAL_TYPE, ILLEGAL_TYPE,  ILLEGAL_TYPE, ILLEGAL_TYPE,
-    "java.lang.Boolean", "java.lang.Character", "java.lang.Float",
-    "java.lang.Double", "java.lang.Byte", "java.lang.Short",
-    "java.lang.Integer", "java.lang.Long", "java.lang.Void",
-    ILLEGAL_TYPE, ILLEGAL_TYPE,  ILLEGAL_TYPE
-  };
-
-  /** The signature characters corresponding to primitive types,
-   * e.g., SHORT_TYPE_NAMES[T_INT] = "I"
-   */
-  public static final String[] SHORT_TYPE_NAMES = {
-    ILLEGAL_TYPE, ILLEGAL_TYPE,  ILLEGAL_TYPE, ILLEGAL_TYPE,
-    "Z", "C", "F", "D", "B", "S", "I", "J",
-    "V", ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE
-  };
-
-  /**
-   * Number of byte code operands, i.e., number of bytes after the tag byte
-   * itself.
-   */
-  public static final short[] NO_OF_OPERANDS = {
-    0/*nop*/, 0/*aconst_null*/, 0/*iconst_m1*/, 0/*iconst_0*/,
-    0/*iconst_1*/, 0/*iconst_2*/, 0/*iconst_3*/, 0/*iconst_4*/,
-    0/*iconst_5*/, 0/*lconst_0*/, 0/*lconst_1*/, 0/*fconst_0*/,
-    0/*fconst_1*/, 0/*fconst_2*/, 0/*dconst_0*/, 0/*dconst_1*/,
-    1/*bipush*/, 2/*sipush*/, 1/*ldc*/, 2/*ldc_w*/, 2/*ldc2_w*/,
-    1/*iload*/, 1/*lload*/, 1/*fload*/, 1/*dload*/, 1/*aload*/,
-    0/*iload_0*/, 0/*iload_1*/, 0/*iload_2*/, 0/*iload_3*/,
-    0/*lload_0*/, 0/*lload_1*/, 0/*lload_2*/, 0/*lload_3*/,
-    0/*fload_0*/, 0/*fload_1*/, 0/*fload_2*/, 0/*fload_3*/,
-    0/*dload_0*/, 0/*dload_1*/, 0/*dload_2*/, 0/*dload_3*/,
-    0/*aload_0*/, 0/*aload_1*/, 0/*aload_2*/, 0/*aload_3*/,
-    0/*iaload*/, 0/*laload*/, 0/*faload*/, 0/*daload*/,
-    0/*aaload*/, 0/*baload*/, 0/*caload*/, 0/*saload*/,
-    1/*istore*/, 1/*lstore*/, 1/*fstore*/, 1/*dstore*/,
-    1/*astore*/, 0/*istore_0*/, 0/*istore_1*/, 0/*istore_2*/,
-    0/*istore_3*/, 0/*lstore_0*/, 0/*lstore_1*/, 0/*lstore_2*/,
-    0/*lstore_3*/, 0/*fstore_0*/, 0/*fstore_1*/, 0/*fstore_2*/,
-    0/*fstore_3*/, 0/*dstore_0*/, 0/*dstore_1*/, 0/*dstore_2*/,
-    0/*dstore_3*/, 0/*astore_0*/, 0/*astore_1*/, 0/*astore_2*/,
-    0/*astore_3*/, 0/*iastore*/, 0/*lastore*/, 0/*fastore*/,
-    0/*dastore*/, 0/*aastore*/, 0/*bastore*/, 0/*castore*/,
-    0/*sastore*/, 0/*pop*/, 0/*pop2*/, 0/*dup*/, 0/*dup_x1*/,
-    0/*dup_x2*/, 0/*dup2*/, 0/*dup2_x1*/, 0/*dup2_x2*/, 0/*swap*/,
-    0/*iadd*/, 0/*ladd*/, 0/*fadd*/, 0/*dadd*/, 0/*isub*/,
-    0/*lsub*/, 0/*fsub*/, 0/*dsub*/, 0/*imul*/, 0/*lmul*/,
-    0/*fmul*/, 0/*dmul*/, 0/*idiv*/, 0/*ldiv*/, 0/*fdiv*/,
-    0/*ddiv*/, 0/*irem*/, 0/*lrem*/, 0/*frem*/, 0/*drem*/,
-    0/*ineg*/, 0/*lneg*/, 0/*fneg*/, 0/*dneg*/, 0/*ishl*/,
-    0/*lshl*/, 0/*ishr*/, 0/*lshr*/, 0/*iushr*/, 0/*lushr*/,
-    0/*iand*/, 0/*land*/, 0/*ior*/, 0/*lor*/, 0/*ixor*/, 0/*lxor*/,
-    2/*iinc*/, 0/*i2l*/, 0/*i2f*/, 0/*i2d*/, 0/*l2i*/, 0/*l2f*/,
-    0/*l2d*/, 0/*f2i*/, 0/*f2l*/, 0/*f2d*/, 0/*d2i*/, 0/*d2l*/,
-    0/*d2f*/, 0/*i2b*/, 0/*i2c*/, 0/*i2s*/, 0/*lcmp*/, 0/*fcmpl*/,
-    0/*fcmpg*/, 0/*dcmpl*/, 0/*dcmpg*/, 2/*ifeq*/, 2/*ifne*/,
-    2/*iflt*/, 2/*ifge*/, 2/*ifgt*/, 2/*ifle*/, 2/*if_icmpeq*/,
-    2/*if_icmpne*/, 2/*if_icmplt*/, 2/*if_icmpge*/, 2/*if_icmpgt*/,
-    2/*if_icmple*/, 2/*if_acmpeq*/, 2/*if_acmpne*/, 2/*goto*/,
-    2/*jsr*/, 1/*ret*/, UNPREDICTABLE/*tableswitch*/, UNPREDICTABLE/*lookupswitch*/,
-    0/*ireturn*/, 0/*lreturn*/, 0/*freturn*/,
-    0/*dreturn*/, 0/*areturn*/, 0/*return*/,
-    2/*getstatic*/, 2/*putstatic*/, 2/*getfield*/,
-    2/*putfield*/, 2/*invokevirtual*/, 2/*invokespecial*/, 2/*invokestatic*/,
-    4/*invokeinterface*/, UNDEFINED, 2/*new*/,
-    1/*newarray*/, 2/*anewarray*/,
-    0/*arraylength*/, 0/*athrow*/, 2/*checkcast*/,
-    2/*instanceof*/, 0/*monitorenter*/,
-    0/*monitorexit*/, UNPREDICTABLE/*wide*/, 3/*multianewarray*/,
-    2/*ifnull*/, 2/*ifnonnull*/, 4/*goto_w*/,
-    4/*jsr_w*/, 0/*breakpoint*/, UNDEFINED,
-    UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
-    UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
-    UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
-    UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
-    UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
-    UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
-    UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
-    UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
-    UNDEFINED, UNDEFINED, RESERVED/*impdep1*/, RESERVED/*impdep2*/
-  };
-
-  /**
-   * How the byte code operands are to be interpreted.
-   */
-  public static final short[][] TYPE_OF_OPERANDS = {
-    {}/*nop*/, {}/*aconst_null*/, {}/*iconst_m1*/, {}/*iconst_0*/,
-    {}/*iconst_1*/, {}/*iconst_2*/, {}/*iconst_3*/, {}/*iconst_4*/,
-    {}/*iconst_5*/, {}/*lconst_0*/, {}/*lconst_1*/, {}/*fconst_0*/,
-    {}/*fconst_1*/, {}/*fconst_2*/, {}/*dconst_0*/, {}/*dconst_1*/,
-    {T_BYTE}/*bipush*/, {T_SHORT}/*sipush*/, {T_BYTE}/*ldc*/,
-    {T_SHORT}/*ldc_w*/, {T_SHORT}/*ldc2_w*/,
-    {T_BYTE}/*iload*/, {T_BYTE}/*lload*/, {T_BYTE}/*fload*/,
-    {T_BYTE}/*dload*/, {T_BYTE}/*aload*/, {}/*iload_0*/,
-    {}/*iload_1*/, {}/*iload_2*/, {}/*iload_3*/, {}/*lload_0*/,
-    {}/*lload_1*/, {}/*lload_2*/, {}/*lload_3*/, {}/*fload_0*/,
-    {}/*fload_1*/, {}/*fload_2*/, {}/*fload_3*/, {}/*dload_0*/,
-    {}/*dload_1*/, {}/*dload_2*/, {}/*dload_3*/, {}/*aload_0*/,
-    {}/*aload_1*/, {}/*aload_2*/, {}/*aload_3*/, {}/*iaload*/,
-    {}/*laload*/, {}/*faload*/, {}/*daload*/, {}/*aaload*/,
-    {}/*baload*/, {}/*caload*/, {}/*saload*/, {T_BYTE}/*istore*/,
-    {T_BYTE}/*lstore*/, {T_BYTE}/*fstore*/, {T_BYTE}/*dstore*/,
-    {T_BYTE}/*astore*/, {}/*istore_0*/, {}/*istore_1*/,
-    {}/*istore_2*/, {}/*istore_3*/, {}/*lstore_0*/, {}/*lstore_1*/,
-    {}/*lstore_2*/, {}/*lstore_3*/, {}/*fstore_0*/, {}/*fstore_1*/,
-    {}/*fstore_2*/, {}/*fstore_3*/, {}/*dstore_0*/, {}/*dstore_1*/,
-    {}/*dstore_2*/, {}/*dstore_3*/, {}/*astore_0*/, {}/*astore_1*/,
-    {}/*astore_2*/, {}/*astore_3*/, {}/*iastore*/, {}/*lastore*/,
-    {}/*fastore*/, {}/*dastore*/, {}/*aastore*/, {}/*bastore*/,
-    {}/*castore*/, {}/*sastore*/, {}/*pop*/, {}/*pop2*/, {}/*dup*/,
-    {}/*dup_x1*/, {}/*dup_x2*/, {}/*dup2*/, {}/*dup2_x1*/,
-    {}/*dup2_x2*/, {}/*swap*/, {}/*iadd*/, {}/*ladd*/, {}/*fadd*/,
-    {}/*dadd*/, {}/*isub*/, {}/*lsub*/, {}/*fsub*/, {}/*dsub*/,
-    {}/*imul*/, {}/*lmul*/, {}/*fmul*/, {}/*dmul*/, {}/*idiv*/,
-    {}/*ldiv*/, {}/*fdiv*/, {}/*ddiv*/, {}/*irem*/, {}/*lrem*/,
-    {}/*frem*/, {}/*drem*/, {}/*ineg*/, {}/*lneg*/, {}/*fneg*/,
-    {}/*dneg*/, {}/*ishl*/, {}/*lshl*/, {}/*ishr*/, {}/*lshr*/,
-    {}/*iushr*/, {}/*lushr*/, {}/*iand*/, {}/*land*/, {}/*ior*/,
-    {}/*lor*/, {}/*ixor*/, {}/*lxor*/, {T_BYTE, T_BYTE}/*iinc*/,
-    {}/*i2l*/, {}/*i2f*/, {}/*i2d*/, {}/*l2i*/, {}/*l2f*/, {}/*l2d*/,
-    {}/*f2i*/, {}/*f2l*/, {}/*f2d*/, {}/*d2i*/, {}/*d2l*/, {}/*d2f*/,
-    {}/*i2b*/, {}/*i2c*/,{}/*i2s*/, {}/*lcmp*/, {}/*fcmpl*/,
-    {}/*fcmpg*/, {}/*dcmpl*/, {}/*dcmpg*/, {T_SHORT}/*ifeq*/,
-    {T_SHORT}/*ifne*/, {T_SHORT}/*iflt*/, {T_SHORT}/*ifge*/,
-    {T_SHORT}/*ifgt*/, {T_SHORT}/*ifle*/, {T_SHORT}/*if_icmpeq*/,
-    {T_SHORT}/*if_icmpne*/, {T_SHORT}/*if_icmplt*/,
-    {T_SHORT}/*if_icmpge*/, {T_SHORT}/*if_icmpgt*/,
-    {T_SHORT}/*if_icmple*/, {T_SHORT}/*if_acmpeq*/,
-    {T_SHORT}/*if_acmpne*/, {T_SHORT}/*goto*/, {T_SHORT}/*jsr*/,
-    {T_BYTE}/*ret*/, {}/*tableswitch*/, {}/*lookupswitch*/,
-    {}/*ireturn*/, {}/*lreturn*/, {}/*freturn*/, {}/*dreturn*/,
-    {}/*areturn*/, {}/*return*/, {T_SHORT}/*getstatic*/,
-    {T_SHORT}/*putstatic*/, {T_SHORT}/*getfield*/,
-    {T_SHORT}/*putfield*/, {T_SHORT}/*invokevirtual*/,
-    {T_SHORT}/*invokespecial*/, {T_SHORT}/*invokestatic*/,
-    {T_SHORT, T_BYTE, T_BYTE}/*invokeinterface*/, {},
-    {T_SHORT}/*new*/, {T_BYTE}/*newarray*/,
-    {T_SHORT}/*anewarray*/, {}/*arraylength*/, {}/*athrow*/,
-    {T_SHORT}/*checkcast*/, {T_SHORT}/*instanceof*/,
-    {}/*monitorenter*/, {}/*monitorexit*/, {T_BYTE}/*wide*/,
-    {T_SHORT, T_BYTE}/*multianewarray*/, {T_SHORT}/*ifnull*/,
-    {T_SHORT}/*ifnonnull*/, {T_INT}/*goto_w*/, {T_INT}/*jsr_w*/,
-    {}/*breakpoint*/, {}, {}, {}, {}, {}, {}, {},
-    {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {},
-    {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {},
-    {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {},
-    {}/*impdep1*/, {}/*impdep2*/
-  };
-
-  /**
-   * Names of opcodes.
-   */
-  public static final String[] OPCODE_NAMES = {
-    "nop", "aconst_null", "iconst_m1", "iconst_0", "iconst_1",
-    "iconst_2", "iconst_3", "iconst_4", "iconst_5", "lconst_0",
-    "lconst_1", "fconst_0", "fconst_1", "fconst_2", "dconst_0",
-    "dconst_1", "bipush", "sipush", "ldc", "ldc_w", "ldc2_w", "iload",
-    "lload", "fload", "dload", "aload", "iload_0", "iload_1", "iload_2",
-    "iload_3", "lload_0", "lload_1", "lload_2", "lload_3", "fload_0",
-    "fload_1", "fload_2", "fload_3", "dload_0", "dload_1", "dload_2",
-    "dload_3", "aload_0", "aload_1", "aload_2", "aload_3", "iaload",
-    "laload", "faload", "daload", "aaload", "baload", "caload", "saload",
-    "istore", "lstore", "fstore", "dstore", "astore", "istore_0",
-    "istore_1", "istore_2", "istore_3", "lstore_0", "lstore_1",
-    "lstore_2", "lstore_3", "fstore_0", "fstore_1", "fstore_2",
-    "fstore_3", "dstore_0", "dstore_1", "dstore_2", "dstore_3",
-    "astore_0", "astore_1", "astore_2", "astore_3", "iastore", "lastore",
-    "fastore", "dastore", "aastore", "bastore", "castore", "sastore",
-    "pop", "pop2", "dup", "dup_x1", "dup_x2", "dup2", "dup2_x1",
-    "dup2_x2", "swap", "iadd", "ladd", "fadd", "dadd", "isub", "lsub",
-    "fsub", "dsub", "imul", "lmul", "fmul", "dmul", "idiv", "ldiv",
-    "fdiv", "ddiv", "irem", "lrem", "frem", "drem", "ineg", "lneg",
-    "fneg", "dneg", "ishl", "lshl", "ishr", "lshr", "iushr", "lushr",
-    "iand", "land", "ior", "lor", "ixor", "lxor", "iinc", "i2l", "i2f",
-    "i2d", "l2i", "l2f", "l2d", "f2i", "f2l", "f2d", "d2i", "d2l", "d2f",
-    "i2b", "i2c", "i2s", "lcmp", "fcmpl", "fcmpg",
-    "dcmpl", "dcmpg", "ifeq", "ifne", "iflt", "ifge", "ifgt", "ifle",
-    "if_icmpeq", "if_icmpne", "if_icmplt", "if_icmpge", "if_icmpgt",
-    "if_icmple", "if_acmpeq", "if_acmpne", "goto", "jsr", "ret",
-    "tableswitch", "lookupswitch", "ireturn", "lreturn", "freturn",
-    "dreturn", "areturn", "return", "getstatic", "putstatic", "getfield",
-    "putfield", "invokevirtual", "invokespecial", "invokestatic",
-    "invokeinterface", ILLEGAL_OPCODE, "new", "newarray", "anewarray",
-    "arraylength", "athrow", "checkcast", "instanceof", "monitorenter",
-    "monitorexit", "wide", "multianewarray", "ifnull", "ifnonnull",
-    "goto_w", "jsr_w", "breakpoint", ILLEGAL_OPCODE, ILLEGAL_OPCODE,
-    ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE,
-    ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE,
-    ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE,
-    ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE,
-    ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE,
-    ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE,
-    ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE,
-    ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE,
-    ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE,
-    ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE,
-    ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE,
-    ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE,
-    ILLEGAL_OPCODE, "impdep1", "impdep2"
-  };
-
-  /**
-   * Number of words consumed on operand stack by instructions.
-   */
-  public static final int[] CONSUME_STACK = {
-    0/*nop*/, 0/*aconst_null*/, 0/*iconst_m1*/, 0/*iconst_0*/, 0/*iconst_1*/,
-    0/*iconst_2*/, 0/*iconst_3*/, 0/*iconst_4*/, 0/*iconst_5*/, 0/*lconst_0*/,
-    0/*lconst_1*/, 0/*fconst_0*/, 0/*fconst_1*/, 0/*fconst_2*/, 0/*dconst_0*/,
-    0/*dconst_1*/, 0/*bipush*/, 0/*sipush*/, 0/*ldc*/, 0/*ldc_w*/, 0/*ldc2_w*/, 0/*iload*/,
-    0/*lload*/, 0/*fload*/, 0/*dload*/, 0/*aload*/, 0/*iload_0*/, 0/*iload_1*/, 0/*iload_2*/,
-    0/*iload_3*/, 0/*lload_0*/, 0/*lload_1*/, 0/*lload_2*/, 0/*lload_3*/, 0/*fload_0*/,
-    0/*fload_1*/, 0/*fload_2*/, 0/*fload_3*/, 0/*dload_0*/, 0/*dload_1*/, 0/*dload_2*/,
-    0/*dload_3*/, 0/*aload_0*/, 0/*aload_1*/, 0/*aload_2*/, 0/*aload_3*/, 2/*iaload*/,
-    2/*laload*/, 2/*faload*/, 2/*daload*/, 2/*aaload*/, 2/*baload*/, 2/*caload*/, 2/*saload*/,
-    1/*istore*/, 2/*lstore*/, 1/*fstore*/, 2/*dstore*/, 1/*astore*/, 1/*istore_0*/,
-    1/*istore_1*/, 1/*istore_2*/, 1/*istore_3*/, 2/*lstore_0*/, 2/*lstore_1*/,
-    2/*lstore_2*/, 2/*lstore_3*/, 1/*fstore_0*/, 1/*fstore_1*/, 1/*fstore_2*/,
-    1/*fstore_3*/, 2/*dstore_0*/, 2/*dstore_1*/, 2/*dstore_2*/, 2/*dstore_3*/,
-    1/*astore_0*/, 1/*astore_1*/, 1/*astore_2*/, 1/*astore_3*/, 3/*iastore*/, 4/*lastore*/,
-    3/*fastore*/, 4/*dastore*/, 3/*aastore*/, 3/*bastore*/, 3/*castore*/, 3/*sastore*/,
-    1/*pop*/, 2/*pop2*/, 1/*dup*/, 2/*dup_x1*/, 3/*dup_x2*/, 2/*dup2*/, 3/*dup2_x1*/,
-    4/*dup2_x2*/, 2/*swap*/, 2/*iadd*/, 4/*ladd*/, 2/*fadd*/, 4/*dadd*/, 2/*isub*/, 4/*lsub*/,
-    2/*fsub*/, 4/*dsub*/, 2/*imul*/, 4/*lmul*/, 2/*fmul*/, 4/*dmul*/, 2/*idiv*/, 4/*ldiv*/,
-    2/*fdiv*/, 4/*ddiv*/, 2/*irem*/, 4/*lrem*/, 2/*frem*/, 4/*drem*/, 1/*ineg*/, 2/*lneg*/,
-    1/*fneg*/, 2/*dneg*/, 2/*ishl*/, 3/*lshl*/, 2/*ishr*/, 3/*lshr*/, 2/*iushr*/, 3/*lushr*/,
-    2/*iand*/, 4/*land*/, 2/*ior*/, 4/*lor*/, 2/*ixor*/, 4/*lxor*/, 0/*iinc*/,
-    1/*i2l*/, 1/*i2f*/, 1/*i2d*/, 2/*l2i*/, 2/*l2f*/, 2/*l2d*/, 1/*f2i*/, 1/*f2l*/,
-    1/*f2d*/, 2/*d2i*/, 2/*d2l*/, 2/*d2f*/, 1/*i2b*/, 1/*i2c*/, 1/*i2s*/,
-    4/*lcmp*/, 2/*fcmpl*/, 2/*fcmpg*/, 4/*dcmpl*/, 4/*dcmpg*/, 1/*ifeq*/, 1/*ifne*/,
-    1/*iflt*/, 1/*ifge*/, 1/*ifgt*/, 1/*ifle*/, 2/*if_icmpeq*/, 2/*if_icmpne*/, 2/*if_icmplt*/,
-    2 /*if_icmpge*/, 2/*if_icmpgt*/, 2/*if_icmple*/, 2/*if_acmpeq*/, 2/*if_acmpne*/,
-    0/*goto*/, 0/*jsr*/, 0/*ret*/, 1/*tableswitch*/, 1/*lookupswitch*/, 1/*ireturn*/,
-    2/*lreturn*/, 1/*freturn*/, 2/*dreturn*/, 1/*areturn*/, 0/*return*/, 0/*getstatic*/,
-    UNPREDICTABLE/*putstatic*/, 1/*getfield*/, UNPREDICTABLE/*putfield*/,
-    UNPREDICTABLE/*invokevirtual*/, UNPREDICTABLE/*invokespecial*/,
-    UNPREDICTABLE/*invokestatic*/,
-    UNPREDICTABLE/*invokeinterface*/, UNDEFINED, 0/*new*/, 1/*newarray*/, 1/*anewarray*/,
-    1/*arraylength*/, 1/*athrow*/, 1/*checkcast*/, 1/*instanceof*/, 1/*monitorenter*/,
-    1/*monitorexit*/, 0/*wide*/, UNPREDICTABLE/*multianewarray*/, 1/*ifnull*/, 1/*ifnonnull*/,
-    0/*goto_w*/, 0/*jsr_w*/, 0/*breakpoint*/, UNDEFINED, UNDEFINED,
-    UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
-    UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
-    UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
-    UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
-    UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
-    UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
-    UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
-    UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
-    UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
-    UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
-    UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
-    UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
-    UNDEFINED, UNPREDICTABLE/*impdep1*/, UNPREDICTABLE/*impdep2*/
-  };
-
-  /**
-   * Number of words produced onto operand stack by instructions.
-   */
-  public static final int[] PRODUCE_STACK = {
-    0/*nop*/, 1/*aconst_null*/, 1/*iconst_m1*/, 1/*iconst_0*/, 1/*iconst_1*/,
-    1/*iconst_2*/, 1/*iconst_3*/, 1/*iconst_4*/, 1/*iconst_5*/, 2/*lconst_0*/,
-    2/*lconst_1*/, 1/*fconst_0*/, 1/*fconst_1*/, 1/*fconst_2*/, 2/*dconst_0*/,
-    2/*dconst_1*/, 1/*bipush*/, 1/*sipush*/, 1/*ldc*/, 1/*ldc_w*/, 2/*ldc2_w*/, 1/*iload*/,
-    2/*lload*/, 1/*fload*/, 2/*dload*/, 1/*aload*/, 1/*iload_0*/, 1/*iload_1*/, 1/*iload_2*/,
-    1/*iload_3*/, 2/*lload_0*/, 2/*lload_1*/, 2/*lload_2*/, 2/*lload_3*/, 1/*fload_0*/,
-    1/*fload_1*/, 1/*fload_2*/, 1/*fload_3*/, 2/*dload_0*/, 2/*dload_1*/, 2/*dload_2*/,
-    2/*dload_3*/, 1/*aload_0*/, 1/*aload_1*/, 1/*aload_2*/, 1/*aload_3*/, 1/*iaload*/,
-    2/*laload*/, 1/*faload*/, 2/*daload*/, 1/*aaload*/, 1/*baload*/, 1/*caload*/, 1/*saload*/,
-    0/*istore*/, 0/*lstore*/, 0/*fstore*/, 0/*dstore*/, 0/*astore*/, 0/*istore_0*/,
-    0/*istore_1*/, 0/*istore_2*/, 0/*istore_3*/, 0/*lstore_0*/, 0/*lstore_1*/,
-    0/*lstore_2*/, 0/*lstore_3*/, 0/*fstore_0*/, 0/*fstore_1*/, 0/*fstore_2*/,
-    0/*fstore_3*/, 0/*dstore_0*/, 0/*dstore_1*/, 0/*dstore_2*/, 0/*dstore_3*/,
-    0/*astore_0*/, 0/*astore_1*/, 0/*astore_2*/, 0/*astore_3*/, 0/*iastore*/, 0/*lastore*/,
-    0/*fastore*/, 0/*dastore*/, 0/*aastore*/, 0/*bastore*/, 0/*castore*/, 0/*sastore*/,
-    0/*pop*/, 0/*pop2*/, 2/*dup*/, 3/*dup_x1*/, 4/*dup_x2*/, 4/*dup2*/, 5/*dup2_x1*/,
-    6/*dup2_x2*/, 2/*swap*/, 1/*iadd*/, 2/*ladd*/, 1/*fadd*/, 2/*dadd*/, 1/*isub*/, 2/*lsub*/,
-    1/*fsub*/, 2/*dsub*/, 1/*imul*/, 2/*lmul*/, 1/*fmul*/, 2/*dmul*/, 1/*idiv*/, 2/*ldiv*/,
-    1/*fdiv*/, 2/*ddiv*/, 1/*irem*/, 2/*lrem*/, 1/*frem*/, 2/*drem*/, 1/*ineg*/, 2/*lneg*/,
-    1/*fneg*/, 2/*dneg*/, 1/*ishl*/, 2/*lshl*/, 1/*ishr*/, 2/*lshr*/, 1/*iushr*/, 2/*lushr*/,
-    1/*iand*/, 2/*land*/, 1/*ior*/, 2/*lor*/, 1/*ixor*/, 2/*lxor*/,
-    0/*iinc*/, 2/*i2l*/, 1/*i2f*/, 2/*i2d*/, 1/*l2i*/, 1/*l2f*/, 2/*l2d*/, 1/*f2i*/,
-    2/*f2l*/, 2/*f2d*/, 1/*d2i*/, 2/*d2l*/, 1/*d2f*/,
-    1/*i2b*/, 1/*i2c*/, 1/*i2s*/, 1/*lcmp*/, 1/*fcmpl*/, 1/*fcmpg*/,
-    1/*dcmpl*/, 1/*dcmpg*/, 0/*ifeq*/, 0/*ifne*/, 0/*iflt*/, 0/*ifge*/, 0/*ifgt*/, 0/*ifle*/,
-    0/*if_icmpeq*/, 0/*if_icmpne*/, 0/*if_icmplt*/, 0/*if_icmpge*/, 0/*if_icmpgt*/,
-    0/*if_icmple*/, 0/*if_acmpeq*/, 0/*if_acmpne*/, 0/*goto*/, 1/*jsr*/, 0/*ret*/,
-    0/*tableswitch*/, 0/*lookupswitch*/, 0/*ireturn*/, 0/*lreturn*/, 0/*freturn*/,
-    0/*dreturn*/, 0/*areturn*/, 0/*return*/, UNPREDICTABLE/*getstatic*/, 0/*putstatic*/,
-    UNPREDICTABLE/*getfield*/, 0/*putfield*/, UNPREDICTABLE/*invokevirtual*/,
-    UNPREDICTABLE/*invokespecial*/, UNPREDICTABLE/*invokestatic*/,
-    UNPREDICTABLE/*invokeinterface*/, UNDEFINED, 1/*new*/, 1/*newarray*/, 1/*anewarray*/,
-    1/*arraylength*/, 1/*athrow*/, 1/*checkcast*/, 1/*instanceof*/, 0/*monitorenter*/,
-    0/*monitorexit*/, 0/*wide*/, 1/*multianewarray*/, 0/*ifnull*/, 0/*ifnonnull*/,
-    0/*goto_w*/, 1/*jsr_w*/, 0/*breakpoint*/, UNDEFINED, UNDEFINED,
-    UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
-    UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
-    UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
-    UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
-    UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
-    UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
-    UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
-    UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
-    UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
-    UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
-    UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
-    UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
-    UNDEFINED, UNPREDICTABLE/*impdep1*/, UNPREDICTABLE/*impdep2*/
-  };
-
-  /** Attributes and their corresponding names.
-   */
-  public static final byte ATTR_UNKNOWN                                 = -1;
-  public static final byte ATTR_SOURCE_FILE                             = 0;
-  public static final byte ATTR_CONSTANT_VALUE                          = 1;
-  public static final byte ATTR_CODE                                    = 2;
-  public static final byte ATTR_EXCEPTIONS                              = 3;
-  public static final byte ATTR_LINE_NUMBER_TABLE                       = 4;
-  public static final byte ATTR_LOCAL_VARIABLE_TABLE                    = 5;
-  public static final byte ATTR_INNER_CLASSES                           = 6;
-  public static final byte ATTR_SYNTHETIC                               = 7;
-  public static final byte ATTR_DEPRECATED                              = 8;
-  public static final byte ATTR_PMG                                     = 9;
-  public static final byte ATTR_SIGNATURE                               = 10;
-  public static final byte ATTR_STACK_MAP                               = 11;
-  public static final byte ATTR_LOCAL_VARIABLE_TYPE_TABLE               = 12;
-
-  public static final short KNOWN_ATTRIBUTES = 13;
-
-  public static final String[] ATTRIBUTE_NAMES = {
-    "SourceFile", "ConstantValue", "Code", "Exceptions",
-    "LineNumberTable", "LocalVariableTable",
-    "InnerClasses", "Synthetic", "Deprecated",
-    "PMGClass", "Signature", "StackMap",
-    "LocalVariableTypeTable"
-  };
-
-  /** Constants used in the StackMap attribute.
-   */
-  public static final byte ITEM_Bogus      = 0;
-  public static final byte ITEM_Integer    = 1;
-  public static final byte ITEM_Float      = 2;
-  public static final byte ITEM_Double     = 3;
-  public static final byte ITEM_Long       = 4;
-  public static final byte ITEM_Null       = 5;
-  public static final byte ITEM_InitObject = 6;
-  public static final byte ITEM_Object     = 7;
-  public static final byte ITEM_NewObject  = 8;
-
-  public static final String[] ITEM_NAMES = {
-    "Bogus", "Integer", "Float", "Double", "Long",
-    "Null", "InitObject", "Object", "NewObject"
-  };
-}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/ExceptionConst.java	Mon Aug 28 07:53:26 2017 +0000
@@ -0,0 +1,130 @@
+/*
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
+ */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.sun.org.apache.bcel.internal;
+
+/**
+ * Exception constants.
+ * @since 6.0 (intended to replace the InstructionConstant interface)
+ */
+public final class ExceptionConst {
+
+    /** The mother of all exceptions
+     */
+    public static final Class<Throwable> THROWABLE = Throwable.class;
+    /** Super class of any run-time exception
+     */
+    public static final Class<RuntimeException> RUNTIME_EXCEPTION = RuntimeException.class;
+    /** Super class of any linking exception (aka Linkage Error)
+     */
+    public static final Class<LinkageError> LINKING_EXCEPTION = LinkageError.class;
+    /** Linking Exceptions
+     */
+    public static final Class<ClassCircularityError> CLASS_CIRCULARITY_ERROR = ClassCircularityError.class;
+    public static final Class<ClassFormatError> CLASS_FORMAT_ERROR = ClassFormatError.class;
+    public static final Class<ExceptionInInitializerError> EXCEPTION_IN_INITIALIZER_ERROR = ExceptionInInitializerError.class;
+    public static final Class<IncompatibleClassChangeError> INCOMPATIBLE_CLASS_CHANGE_ERROR = IncompatibleClassChangeError.class;
+    public static final Class<AbstractMethodError> ABSTRACT_METHOD_ERROR = AbstractMethodError.class;
+    public static final Class<IllegalAccessError> ILLEGAL_ACCESS_ERROR = IllegalAccessError.class;
+    public static final Class<InstantiationError> INSTANTIATION_ERROR = InstantiationError.class;
+    public static final Class<NoSuchFieldError> NO_SUCH_FIELD_ERROR = NoSuchFieldError.class;
+    public static final Class<NoSuchMethodError> NO_SUCH_METHOD_ERROR = NoSuchMethodError.class;
+    public static final Class<NoClassDefFoundError> NO_CLASS_DEF_FOUND_ERROR = NoClassDefFoundError.class;
+    public static final Class<UnsatisfiedLinkError> UNSATISFIED_LINK_ERROR = UnsatisfiedLinkError.class;
+    public static final Class<VerifyError> VERIFY_ERROR = VerifyError.class;
+    /* UnsupportedClassVersionError is new in JDK 1.2 */
+//    public static final Class UnsupportedClassVersionError = UnsupportedClassVersionError.class;
+    /** Run-Time Exceptions
+     */
+    public static final Class<NullPointerException> NULL_POINTER_EXCEPTION = NullPointerException.class;
+    public static final Class<ArrayIndexOutOfBoundsException> ARRAY_INDEX_OUT_OF_BOUNDS_EXCEPTION
+                                                            = ArrayIndexOutOfBoundsException.class;
+    public static final Class<ArithmeticException> ARITHMETIC_EXCEPTION = ArithmeticException.class;
+    public static final Class<NegativeArraySizeException> NEGATIVE_ARRAY_SIZE_EXCEPTION = NegativeArraySizeException.class;
+    public static final Class<ClassCastException> CLASS_CAST_EXCEPTION = ClassCastException.class;
+    public static final Class<IllegalMonitorStateException> ILLEGAL_MONITOR_STATE = IllegalMonitorStateException.class;
+
+    /**
+     * Pre-defined exception arrays according to chapters 5.1-5.4 of the Java Virtual
+     * Machine Specification
+     */
+    private static final Class<?>[] EXCS_CLASS_AND_INTERFACE_RESOLUTION = {
+            NO_CLASS_DEF_FOUND_ERROR, CLASS_FORMAT_ERROR, VERIFY_ERROR, ABSTRACT_METHOD_ERROR,
+            EXCEPTION_IN_INITIALIZER_ERROR, ILLEGAL_ACCESS_ERROR
+    }; // Chapter 5.1
+    private static final Class<?>[] EXCS_FIELD_AND_METHOD_RESOLUTION = {
+            NO_SUCH_FIELD_ERROR, ILLEGAL_ACCESS_ERROR, NO_SUCH_METHOD_ERROR
+    }; // Chapter 5.2
+    private static final Class<?>[] EXCS_INTERFACE_METHOD_RESOLUTION = new Class[0]; // Chapter 5.3 (as below)
+    private static final Class<?>[] EXCS_STRING_RESOLUTION = new Class[0];
+    // Chapter 5.4 (no errors but the ones that _always_ could happen! How stupid.)
+    private static final Class<?>[] EXCS_ARRAY_EXCEPTION = {
+            NULL_POINTER_EXCEPTION, ARRAY_INDEX_OUT_OF_BOUNDS_EXCEPTION
+    };
+
+    /**
+     * Enum corresponding to the various Exception Class arrays,
+     * used by {@link ExceptionConst#createExceptions(EXCS, Class...)}
+     */
+    public enum EXCS {
+        EXCS_CLASS_AND_INTERFACE_RESOLUTION,
+        EXCS_FIELD_AND_METHOD_RESOLUTION,
+        EXCS_INTERFACE_METHOD_RESOLUTION,
+        EXCS_STRING_RESOLUTION,
+        EXCS_ARRAY_EXCEPTION,
+    }
+
+    // helper method to merge exception class arrays
+    private static Class<?>[] mergeExceptions(final Class<?>[] input, final Class<?> ... extraClasses) {
+        final int extraLen = extraClasses == null ? 0 : extraClasses.length;
+        final Class<?>[] excs = new Class<?>[input.length + extraLen];
+        System.arraycopy(input, 0, excs, 0, input.length);
+        if (extraLen > 0) {
+            System.arraycopy(extraClasses, 0, excs, input.length, extraLen);
+        }
+        return excs;
+    }
+
+    /**
+     * Creates a copy of the specified Exception Class array combined with any additional Exception classes.
+     * @param type the basic array type
+     * @param extraClasses additional classes, if any
+     * @return the merged array
+     */
+    public static Class<?>[] createExceptions(final EXCS type, final Class<?> ... extraClasses) {
+        switch (type) {
+        case EXCS_CLASS_AND_INTERFACE_RESOLUTION:
+            return mergeExceptions(EXCS_CLASS_AND_INTERFACE_RESOLUTION, extraClasses);
+        case EXCS_ARRAY_EXCEPTION:
+            return mergeExceptions(EXCS_ARRAY_EXCEPTION, extraClasses);
+        case EXCS_FIELD_AND_METHOD_RESOLUTION:
+            return mergeExceptions(EXCS_FIELD_AND_METHOD_RESOLUTION, extraClasses);
+        case EXCS_INTERFACE_METHOD_RESOLUTION:
+            return mergeExceptions(EXCS_INTERFACE_METHOD_RESOLUTION, extraClasses);
+        case EXCS_STRING_RESOLUTION:
+            return mergeExceptions(EXCS_STRING_RESOLUTION, extraClasses);
+        default:
+            throw new AssertionError("Cannot happen; unexpected enum value: " + type);
+        }
+    }
+
+
+}
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/ExceptionConstants.java	Mon Aug 28 00:49:06 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
- */
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.sun.org.apache.bcel.internal;
-
-
-/**
- * Exception constants.
- *
- * @author  <A HREF="http://www.inf.fu-berlin.de/~ehaase">E. Haase</A>
- */
-public interface ExceptionConstants {
-  /** The mother of all exceptions
-   */
-  public static final Class THROWABLE = Throwable.class;
-
-  /** Super class of any run-time exception
-   */
-  public static final Class RUNTIME_EXCEPTION = RuntimeException.class;
-
-  /** Super class of any linking exception (aka Linkage Error)
-   */
-  public static final Class LINKING_EXCEPTION = LinkageError.class;
-
-  /** Linking Exceptions
-   */
-  public static final Class CLASS_CIRCULARITY_ERROR         = ClassCircularityError.class;
-  public static final Class CLASS_FORMAT_ERROR              = ClassFormatError.class;
-  public static final Class EXCEPTION_IN_INITIALIZER_ERROR  = ExceptionInInitializerError.class;
-  public static final Class INCOMPATIBLE_CLASS_CHANGE_ERROR = IncompatibleClassChangeError.class;
-  public static final Class ABSTRACT_METHOD_ERROR           = AbstractMethodError.class;
-  public static final Class ILLEGAL_ACCESS_ERROR            = IllegalAccessError.class;
-  public static final Class INSTANTIATION_ERROR             = InstantiationError.class;
-  public static final Class NO_SUCH_FIELD_ERROR             = NoSuchFieldError.class;
-  public static final Class NO_SUCH_METHOD_ERROR            = NoSuchMethodError.class;
-  public static final Class NO_CLASS_DEF_FOUND_ERROR        = NoClassDefFoundError.class;
-  public static final Class UNSATISFIED_LINK_ERROR          = UnsatisfiedLinkError.class;
-  public static final Class VERIFY_ERROR                    = VerifyError.class;
-
-  /* UnsupportedClassVersionError is new in JDK 1.2 */
-  //public static final Class UnsupportedClassVersionError = UnsupportedClassVersionError.class;
-
-  /** Run-Time Exceptions
-   */
-  public static final Class NULL_POINTER_EXCEPTION              = NullPointerException.class;
-  public static final Class ARRAY_INDEX_OUT_OF_BOUNDS_EXCEPTION = ArrayIndexOutOfBoundsException.class;
-  public static final Class ARITHMETIC_EXCEPTION                = ArithmeticException.class;
-  public static final Class NEGATIVE_ARRAY_SIZE_EXCEPTION       = NegativeArraySizeException.class;
-  public static final Class CLASS_CAST_EXCEPTION                = ClassCastException.class;
-  public static final Class ILLEGAL_MONITOR_STATE               = IllegalMonitorStateException.class;
-
-  /** Pre-defined exception arrays according to chapters 5.1-5.4 of the Java Virtual
-   * Machine Specification
-   */
-  public static final Class[] EXCS_CLASS_AND_INTERFACE_RESOLUTION = {
-    NO_CLASS_DEF_FOUND_ERROR, CLASS_FORMAT_ERROR, VERIFY_ERROR, ABSTRACT_METHOD_ERROR,
-    EXCEPTION_IN_INITIALIZER_ERROR, ILLEGAL_ACCESS_ERROR
-  }; // Chapter 5.1
-
-  public static final Class[] EXCS_FIELD_AND_METHOD_RESOLUTION = {
-    NO_SUCH_FIELD_ERROR, ILLEGAL_ACCESS_ERROR, NO_SUCH_METHOD_ERROR
-  }; // Chapter 5.2
-
-  public static final Class[] EXCS_INTERFACE_METHOD_RESOLUTION = new Class[0]; // Chapter 5.3 (as below)
-  public static final Class[] EXCS_STRING_RESOLUTION           = new Class[0];
-  // Chapter 5.4 (no errors but the ones that _always_ could happen! How stupid.)
-
-  public static final Class[] EXCS_ARRAY_EXCEPTION = {
-    NULL_POINTER_EXCEPTION, ARRAY_INDEX_OUT_OF_BOUNDS_EXCEPTION
-  };
-
-}
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/Repository.java	Mon Aug 28 00:49:06 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/Repository.java	Mon Aug 28 07:53:26 2017 +0000
@@ -1,6 +1,5 @@
 /*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,189 +17,218 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.sun.org.apache.bcel.internal;
 
 
 import com.sun.org.apache.bcel.internal.classfile.JavaClass;
-import com.sun.org.apache.bcel.internal.util.*;
-import java.io.*;
+import com.sun.org.apache.bcel.internal.util.SyntheticRepository;
 
 /**
  * The repository maintains informations about class interdependencies, e.g.,
- * whether a class is a sub-class of another. Delegates actual class loading
- * to SyntheticRepository with current class path by default.
+ * whether a class is a sub-class of another. Delegates actual class loading to
+ * SyntheticRepository with current class path by default.
  *
  * @see com.sun.org.apache.bcel.internal.util.Repository
- * @see com.sun.org.apache.bcel.internal.util.SyntheticRepository
+ * @see SyntheticRepository
  *
- * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A>
+ * @version $Id: Repository.java 1749603 2016-06-21 20:50:19Z ggregory $
  */
 public abstract class Repository {
-  private static com.sun.org.apache.bcel.internal.util.Repository _repository =
-    SyntheticRepository.getInstance();
+
+    private static com.sun.org.apache.bcel.internal.util.Repository repository
+            = SyntheticRepository.getInstance();
 
-  /** @return currently used repository instance
-   */
-  public static com.sun.org.apache.bcel.internal.util.Repository getRepository() {
-    return _repository;
-  }
+    /**
+     * @return currently used repository instance
+     */
+    public static com.sun.org.apache.bcel.internal.util.Repository getRepository() {
+        return repository;
+    }
 
-  /** Set repository instance to be used for class loading
-   */
-  public static void setRepository(com.sun.org.apache.bcel.internal.util.Repository rep) {
-    _repository = rep;
-  }
+    /**
+     * Set repository instance to be used for class loading
+     */
+    public static void setRepository(final com.sun.org.apache.bcel.internal.util.Repository rep) {
+        repository = rep;
+    }
 
-  /** Lookup class somewhere found on your CLASSPATH, or whereever the
-   * repository instance looks for it.
-   *
-   * @return class object for given fully qualified class name, or null
-   * if the class could not be found or parsed correctly
-   */
-  public static JavaClass lookupClass(String class_name) {
-    try {
-      JavaClass clazz = _repository.findClass(class_name);
+    /**
+     * Lookup class somewhere found on your CLASSPATH, or whereever the
+     * repository instance looks for it.
+     *
+     * @return class object for given fully qualified class name
+     * @throws ClassNotFoundException if the class could not be found or parsed
+     * correctly
+     */
+    public static JavaClass lookupClass(final String class_name)
+            throws ClassNotFoundException {
+        return repository.loadClass(class_name);
+    }
 
-      if(clazz == null) {
-        return _repository.loadClass(class_name);
-      } else {
-        return clazz;
-      }
-    } catch(ClassNotFoundException ex) { return null; }
-  }
+    /**
+     * Try to find class source using the internal repository instance.
+     *
+     * @see Class
+     * @return JavaClass object for given runtime class
+     * @throws ClassNotFoundException if the class could not be found or parsed
+     * correctly
+     */
+    public static JavaClass lookupClass(final Class<?> clazz)
+            throws ClassNotFoundException {
+        return repository.loadClass(clazz);
+    }
 
-  /**
-   * Try to find class source via getResourceAsStream().
-   * @see Class
-   * @return JavaClass object for given runtime class
-   */
-  public static JavaClass lookupClass(Class clazz) {
-    try {
-      return _repository.loadClass(clazz);
-    } catch(ClassNotFoundException ex) { return null; }
-  }
+    /**
+     * Clear the repository.
+     */
+    public static void clearCache() {
+        repository.clear();
+    }
 
-  /** Clear the repository.
-   */
-  public static void clearCache() {
-    _repository.clear();
-  }
+    /**
+     * Add clazz to repository if there isn't an equally named class already in
+     * there.
+     *
+     * @return old entry in repository
+     */
+    public static JavaClass addClass(final JavaClass clazz) {
+        final JavaClass old = repository.findClass(clazz.getClassName());
+        repository.storeClass(clazz);
+        return old;
+    }
+
+    /**
+     * Remove class with given (fully qualified) name from repository.
+     */
+    public static void removeClass(final String clazz) {
+        repository.removeClass(repository.findClass(clazz));
+    }
 
-  /**
-   * Add clazz to repository if there isn't an equally named class already in there.
-   *
-   * @return old entry in repository
-   */
-  public static JavaClass addClass(JavaClass clazz) {
-    JavaClass old = _repository.findClass(clazz.getClassName());
-    _repository.storeClass(clazz);
-    return old;
-  }
+    /**
+     * Remove given class from repository.
+     */
+    public static void removeClass(final JavaClass clazz) {
+        repository.removeClass(clazz);
+    }
 
-  /**
-   * Remove class with given (fully qualified) name from repository.
-   */
-  public static void removeClass(String clazz) {
-    _repository.removeClass(_repository.findClass(clazz));
-  }
+    /**
+     * @return list of super classes of clazz in ascending order, i.e., Object
+     * is always the last element
+     * @throws ClassNotFoundException if any of the superclasses can't be found
+     */
+    public static JavaClass[] getSuperClasses(final JavaClass clazz) throws ClassNotFoundException {
+        return clazz.getSuperClasses();
+    }
 
-  /**
-   * Remove given class from repository.
-   */
-  public static void removeClass(JavaClass clazz) {
-    _repository.removeClass(clazz);
-  }
-
-  /**
-   * @return list of super classes of clazz in ascending order, i.e.,
-   * Object is always the last element
-   */
-  public static JavaClass[] getSuperClasses(JavaClass clazz) {
-    return clazz.getSuperClasses();
-  }
+    /**
+     * @return list of super classes of clazz in ascending order, i.e., Object
+     * is always the last element.
+     * @throws ClassNotFoundException if the named class or any of its
+     * superclasses can't be found
+     */
+    public static JavaClass[] getSuperClasses(final String class_name) throws ClassNotFoundException {
+        final JavaClass jc = lookupClass(class_name);
+        return getSuperClasses(jc);
+    }
 
-  /**
-   * @return list of super classes of clazz in ascending order, i.e.,
-   * Object is always the last element. return "null", if class
-   * cannot be found.
-   */
-  public static JavaClass[] getSuperClasses(String class_name) {
-    JavaClass jc = lookupClass(class_name);
-    return (jc == null? null : getSuperClasses(jc));
-  }
+    /**
+     * @return all interfaces implemented by class and its super classes and the
+     * interfaces that those interfaces extend, and so on. (Some people call
+     * this a transitive hull).
+     * @throws ClassNotFoundException if any of the class's superclasses or
+     * superinterfaces can't be found
+     */
+    public static JavaClass[] getInterfaces(final JavaClass clazz) throws ClassNotFoundException {
+        return clazz.getAllInterfaces();
+    }
 
-  /**
-   * @return all interfaces implemented by class and its super
-   * classes and the interfaces that those interfaces extend, and so on.
-   * (Some people call this a transitive hull).
-   */
-  public static JavaClass[] getInterfaces(JavaClass clazz) {
-    return clazz.getAllInterfaces();
-  }
+    /**
+     * @return all interfaces implemented by class and its super classes and the
+     * interfaces that extend those interfaces, and so on
+     * @throws ClassNotFoundException if the named class can't be found, or if
+     * any of its superclasses or superinterfaces can't be found
+     */
+    public static JavaClass[] getInterfaces(final String class_name) throws ClassNotFoundException {
+        return getInterfaces(lookupClass(class_name));
+    }
 
-  /**
-   * @return all interfaces implemented by class and its super
-   * classes and the interfaces that extend those interfaces, and so on
-   */
-  public static JavaClass[] getInterfaces(String class_name) {
-    return getInterfaces(lookupClass(class_name));
-  }
+    /**
+     * Equivalent to runtime "instanceof" operator.
+     *
+     * @return true, if clazz is an instance of super_class
+     * @throws ClassNotFoundException if any superclasses or superinterfaces of
+     * clazz can't be found
+     */
+    public static boolean instanceOf(final JavaClass clazz, final JavaClass super_class)
+            throws ClassNotFoundException {
+        return clazz.instanceOf(super_class);
+    }
 
-  /**
-   * Equivalent to runtime "instanceof" operator.
-   * @return true, if clazz is an instance of super_class
-   */
-  public static boolean instanceOf(JavaClass clazz, JavaClass super_class) {
-    return clazz.instanceOf(super_class);
-  }
-
-  /**
-   * @return true, if clazz is an instance of super_class
-   */
-  public static boolean instanceOf(String clazz, String super_class) {
-    return instanceOf(lookupClass(clazz), lookupClass(super_class));
-  }
+    /**
+     * @return true, if clazz is an instance of super_class
+     * @throws ClassNotFoundException if either clazz or super_class can't be
+     * found
+     */
+    public static boolean instanceOf(final String clazz, final String super_class)
+            throws ClassNotFoundException {
+        return instanceOf(lookupClass(clazz), lookupClass(super_class));
+    }
 
-  /**
-   * @return true, if clazz is an instance of super_class
-   */
-  public static boolean instanceOf(JavaClass clazz, String super_class) {
-    return instanceOf(clazz, lookupClass(super_class));
-  }
+    /**
+     * @return true, if clazz is an instance of super_class
+     * @throws ClassNotFoundException if super_class can't be found
+     */
+    public static boolean instanceOf(final JavaClass clazz, final String super_class)
+            throws ClassNotFoundException {
+        return instanceOf(clazz, lookupClass(super_class));
+    }
 
-  /**
-   * @return true, if clazz is an instance of super_class
-   */
-  public static boolean instanceOf(String clazz, JavaClass super_class) {
-    return instanceOf(lookupClass(clazz), super_class);
-  }
+    /**
+     * @return true, if clazz is an instance of super_class
+     * @throws ClassNotFoundException if clazz can't be found
+     */
+    public static boolean instanceOf(final String clazz, final JavaClass super_class)
+            throws ClassNotFoundException {
+        return instanceOf(lookupClass(clazz), super_class);
+    }
 
-  /**
-   * @return true, if clazz is an implementation of interface inter
-   */
-  public static boolean implementationOf(JavaClass clazz, JavaClass inter) {
-    return clazz.implementationOf(inter);
-  }
+    /**
+     * @return true, if clazz is an implementation of interface inter
+     * @throws ClassNotFoundException if any superclasses or superinterfaces of
+     * clazz can't be found
+     */
+    public static boolean implementationOf(final JavaClass clazz, final JavaClass inter)
+            throws ClassNotFoundException {
+        return clazz.implementationOf(inter);
+    }
 
-  /**
-   * @return true, if clazz is an implementation of interface inter
-   */
-  public static boolean implementationOf(String clazz, String inter) {
-    return implementationOf(lookupClass(clazz), lookupClass(inter));
-  }
+    /**
+     * @return true, if clazz is an implementation of interface inter
+     * @throws ClassNotFoundException if clazz, inter, or any superclasses or
+     * superinterfaces of clazz can't be found
+     */
+    public static boolean implementationOf(final String clazz, final String inter)
+            throws ClassNotFoundException {
+        return implementationOf(lookupClass(clazz), lookupClass(inter));
+    }
 
-  /**
-   * @return true, if clazz is an implementation of interface inter
-   */
-  public static boolean implementationOf(JavaClass clazz, String inter) {
-    return implementationOf(clazz, lookupClass(inter));
-  }
+    /**
+     * @return true, if clazz is an implementation of interface inter
+     * @throws ClassNotFoundException if inter or any superclasses or
+     * superinterfaces of clazz can't be found
+     */
+    public static boolean implementationOf(final JavaClass clazz, final String inter)
+            throws ClassNotFoundException {
+        return implementationOf(clazz, lookupClass(inter));
+    }
 
-  /**
-   * @return true, if clazz is an implementation of interface inter
-   */
-  public static boolean implementationOf(String clazz, JavaClass inter) {
-    return implementationOf(lookupClass(clazz), inter);
-  }
+    /**
+     * @return true, if clazz is an implementation of interface inter
+     * @throws ClassNotFoundException if clazz or any superclasses or
+     * superinterfaces of clazz can't be found
+     */
+    public static boolean implementationOf(final String clazz, final JavaClass inter)
+            throws ClassNotFoundException {
+        return implementationOf(lookupClass(clazz), inter);
+    }
 }
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/AccessFlags.java	Mon Aug 28 00:49:06 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/AccessFlags.java	Mon Aug 28 07:53:26 2017 +0000
@@ -1,6 +1,5 @@
 /*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,121 +17,199 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.sun.org.apache.bcel.internal.classfile;
 
-
-import  com.sun.org.apache.bcel.internal.Constants;
+import com.sun.org.apache.bcel.internal.Const;
 
 /**
- * Super class for all objects that have modifiers like private, final, ...
- * I.e. classes, fields, and methods.
+ * Super class for all objects that have modifiers like private, final, ... I.e.
+ * classes, fields, and methods.
  *
- * @author  <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A>
+ * @version $Id: AccessFlags.java 1748636 2016-06-15 20:45:17Z dbrosius $
  */
-public abstract class AccessFlags implements java.io.Serializable {
-  protected int access_flags;
+public abstract class AccessFlags {
+
+    private int access_flags;
+
+    public AccessFlags() {
+    }
 
-  public AccessFlags() {}
+    /**
+     * @param a inital access flags
+     */
+    public AccessFlags(final int a) {
+        access_flags = a;
+    }
 
-  /**
-   * @param a inital access flags
-   */
-  public AccessFlags(int a) {
-    access_flags = a;
-  }
+    /**
+     * @return Access flags of the object aka. "modifiers".
+     */
+    public final int getAccessFlags() {
+        return access_flags;
+    }
 
-  /**
-   * @return Access flags of the object aka. "modifiers".
-   */
-  public final int getAccessFlags() { return access_flags; }
+    /**
+     * @return Access flags of the object aka. "modifiers".
+     */
+    public final int getModifiers() {
+        return access_flags;
+    }
 
-  /**
-   * @return Access flags of the object aka. "modifiers".
-   */
-  public final int getModifiers() { return access_flags; }
+    /**
+     * Set access flags aka "modifiers".
+     *
+     * @param access_flags Access flags of the object.
+     */
+    public final void setAccessFlags(final int access_flags) {
+        this.access_flags = access_flags;
+    }
 
-  /** Set access flags aka "modifiers".
-   * @param access_flags Access flags of the object.
-   */
-  public final void setAccessFlags(int access_flags) {
-    this.access_flags = access_flags;
-  }
+    /**
+     * Set access flags aka "modifiers".
+     *
+     * @param access_flags Access flags of the object.
+     */
+    public final void setModifiers(final int access_flags) {
+        setAccessFlags(access_flags);
+    }
 
-  /** Set access flags aka "modifiers".
-   * @param access_flags Access flags of the object.
-   */
-  public final void setModifiers(int access_flags) {
-    setAccessFlags(access_flags);
-  }
+    private void setFlag(final int flag, final boolean set) {
+        if ((access_flags & flag) != 0) { // Flag is set already
+            if (!set) {
+                access_flags ^= flag;
+            }
+        } else { // Flag not set
+            if (set) {
+                access_flags |= flag;
+            }
+        }
+    }
+
+    public final void isPublic(final boolean flag) {
+        setFlag(Const.ACC_PUBLIC, flag);
+    }
 
-  private final void setFlag(int flag, boolean set) {
-    if((access_flags & flag) != 0) { // Flag is set already
-      if(!set) // Delete flag ?
-        access_flags ^= flag;
-    } else {   // Flag not set
-      if(set)  // Set flag ?
-        access_flags |= flag;
+    public final boolean isPublic() {
+        return (access_flags & Const.ACC_PUBLIC) != 0;
+    }
+
+    public final void isPrivate(final boolean flag) {
+        setFlag(Const.ACC_PRIVATE, flag);
+    }
+
+    public final boolean isPrivate() {
+        return (access_flags & Const.ACC_PRIVATE) != 0;
     }
-  }
+
+    public final void isProtected(final boolean flag) {
+        setFlag(Const.ACC_PROTECTED, flag);
+    }
 
-  public final void isPublic(boolean flag) { setFlag(Constants.ACC_PUBLIC, flag); }
-  public final boolean isPublic() {
-    return (access_flags & Constants.ACC_PUBLIC) != 0;
-  }
+    public final boolean isProtected() {
+        return (access_flags & Const.ACC_PROTECTED) != 0;
+    }
+
+    public final void isStatic(final boolean flag) {
+        setFlag(Const.ACC_STATIC, flag);
+    }
+
+    public final boolean isStatic() {
+        return (access_flags & Const.ACC_STATIC) != 0;
+    }
 
-  public final void isPrivate(boolean flag) { setFlag(Constants.ACC_PRIVATE, flag); }
-  public final boolean isPrivate() {
-    return (access_flags & Constants.ACC_PRIVATE) != 0;
-  }
+    public final void isFinal(final boolean flag) {
+        setFlag(Const.ACC_FINAL, flag);
+    }
+
+    public final boolean isFinal() {
+        return (access_flags & Const.ACC_FINAL) != 0;
+    }
+
+    public final void isSynchronized(final boolean flag) {
+        setFlag(Const.ACC_SYNCHRONIZED, flag);
+    }
 
-  public final void isProtected(boolean flag) { setFlag(Constants.ACC_PROTECTED, flag); }
-  public final boolean isProtected() {
-    return (access_flags & Constants.ACC_PROTECTED) != 0;
-  }
+    public final boolean isSynchronized() {
+        return (access_flags & Const.ACC_SYNCHRONIZED) != 0;
+    }
+
+    public final void isVolatile(final boolean flag) {
+        setFlag(Const.ACC_VOLATILE, flag);
+    }
+
+    public final boolean isVolatile() {
+        return (access_flags & Const.ACC_VOLATILE) != 0;
+    }
 
-  public final void isStatic(boolean flag) { setFlag(Constants.ACC_STATIC, flag); }
-  public final boolean isStatic() {
-    return (access_flags & Constants.ACC_STATIC) != 0;
-  }
+    public final void isTransient(final boolean flag) {
+        setFlag(Const.ACC_TRANSIENT, flag);
+    }
+
+    public final boolean isTransient() {
+        return (access_flags & Const.ACC_TRANSIENT) != 0;
+    }
+
+    public final void isNative(final boolean flag) {
+        setFlag(Const.ACC_NATIVE, flag);
+    }
 
-  public final void isFinal(boolean flag) { setFlag(Constants.ACC_FINAL, flag); }
-  public final boolean isFinal() {
-    return (access_flags & Constants.ACC_FINAL) != 0;
-  }
+    public final boolean isNative() {
+        return (access_flags & Const.ACC_NATIVE) != 0;
+    }
 
-  public final void isSynchronized(boolean flag) { setFlag(Constants.ACC_SYNCHRONIZED, flag); }
-  public final boolean isSynchronized() {
-    return (access_flags & Constants.ACC_SYNCHRONIZED) != 0;
-  }
+    public final void isInterface(final boolean flag) {
+        setFlag(Const.ACC_INTERFACE, flag);
+    }
+
+    public final boolean isInterface() {
+        return (access_flags & Const.ACC_INTERFACE) != 0;
+    }
 
-  public final void isVolatile(boolean flag) { setFlag(Constants.ACC_VOLATILE, flag); }
-  public final boolean isVolatile() {
-    return (access_flags & Constants.ACC_VOLATILE) != 0;
-  }
+    public final void isAbstract(final boolean flag) {
+        setFlag(Const.ACC_ABSTRACT, flag);
+    }
+
+    public final boolean isAbstract() {
+        return (access_flags & Const.ACC_ABSTRACT) != 0;
+    }
+
+    public final void isStrictfp(final boolean flag) {
+        setFlag(Const.ACC_STRICT, flag);
+    }
 
-  public final void isTransient(boolean flag) { setFlag(Constants.ACC_TRANSIENT, flag); }
-  public final boolean isTransient() {
-    return (access_flags & Constants.ACC_TRANSIENT) != 0;
-  }
+    public final boolean isStrictfp() {
+        return (access_flags & Const.ACC_STRICT) != 0;
+    }
 
-  public final void isNative(boolean flag) { setFlag(Constants.ACC_NATIVE, flag); }
-  public final boolean isNative() {
-    return (access_flags & Constants.ACC_NATIVE) != 0;
-  }
+    public final void isSynthetic(final boolean flag) {
+        setFlag(Const.ACC_SYNTHETIC, flag);
+    }
+
+    public final boolean isSynthetic() {
+        return (access_flags & Const.ACC_SYNTHETIC) != 0;
+    }
 
-  public final void isInterface(boolean flag) { setFlag(Constants.ACC_INTERFACE, flag); }
-  public final boolean isInterface() {
-    return (access_flags & Constants.ACC_INTERFACE) != 0;
-  }
+    public final void isAnnotation(final boolean flag) {
+        setFlag(Const.ACC_ANNOTATION, flag);
+    }
+
+    public final boolean isAnnotation() {
+        return (access_flags & Const.ACC_ANNOTATION) != 0;
+    }
+
+    public final void isEnum(final boolean flag) {
+        setFlag(Const.ACC_ENUM, flag);
+    }
 
-  public final void isAbstract(boolean flag) { setFlag(Constants.ACC_ABSTRACT, flag); }
-  public final boolean isAbstract() {
-    return (access_flags & Constants.ACC_ABSTRACT) != 0;
-  }
+    public final boolean isEnum() {
+        return (access_flags & Const.ACC_ENUM) != 0;
+    }
 
-  public final void isStrictfp(boolean flag) { setFlag(Constants.ACC_STRICT, flag); }
-  public final boolean isStrictfp() {
-    return (access_flags & Constants.ACC_STRICT) != 0;
-  }
+    public final void isVarArgs(final boolean flag) {
+        setFlag(Const.ACC_VARARGS, flag);
+    }
+
+    public final boolean isVarArgs() {
+        return (access_flags & Const.ACC_VARARGS) != 0;
+    }
 }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/AnnotationDefault.java	Mon Aug 28 07:53:26 2017 +0000
@@ -0,0 +1,98 @@
+/*
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
+ */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.sun.org.apache.bcel.internal.classfile;
+
+import java.io.DataInput;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import com.sun.org.apache.bcel.internal.Const;
+
+/**
+ * Represents the default value of a annotation for a method info
+ *
+ * @version $Id: AnnotationDefault 1 2005-02-13 03:15:08Z dbrosius $
+ * @since 6.0
+ */
+public class AnnotationDefault extends Attribute {
+
+    private ElementValue default_value;
+
+    /**
+     * @param name_index    Index pointing to the name <em>Code</em>
+     * @param length        Content length in bytes
+     * @param input         Input stream
+     * @param constant_pool Array of constants
+     */
+    AnnotationDefault(final int name_index, final int length, final DataInput input, final ConstantPool constant_pool) throws IOException {
+        this(name_index, length, (ElementValue) null, constant_pool);
+        default_value = ElementValue.readElementValue(input, constant_pool);
+    }
+
+    /**
+     * @param name_index    Index pointing to the name <em>Code</em>
+     * @param length        Content length in bytes
+     * @param defaultValue  the annotation's default value
+     * @param constant_pool Array of constants
+     */
+    public AnnotationDefault(final int name_index, final int length, final ElementValue defaultValue, final ConstantPool constant_pool) {
+        super(Const.ATTR_ANNOTATION_DEFAULT, name_index, length, constant_pool);
+        this.default_value = defaultValue;
+    }
+
+    /**
+     * Called by objects that are traversing the nodes of the tree implicitely
+     * defined by the contents of a Java class. I.e., the hierarchy of methods,
+     * fields, attributes, etc. spawns a tree of objects.
+     *
+     * @param v Visitor object
+     */
+    @Override
+    public void accept(final Visitor v) {
+        v.visitAnnotationDefault(this);
+    }
+
+    /**
+     * @param defaultValue the default value of this methodinfo's annotation
+     */
+    public final void setDefaultValue(final ElementValue defaultValue) {
+        default_value = defaultValue;
+    }
+
+    /**
+     * @return the default value
+     */
+    public final ElementValue getDefaultValue() {
+        return default_value;
+    }
+
+    @Override
+    public Attribute copy(final ConstantPool _constant_pool) {
+        return (Attribute) clone();
+    }
+
+    @Override
+    public final void dump(final DataOutputStream dos) throws IOException {
+        super.dump(dos);
+        default_value.dump(dos);
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/AnnotationElementValue.java	Mon Aug 28 07:53:26 2017 +0000
@@ -0,0 +1,69 @@
+/*
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
+ */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.sun.org.apache.bcel.internal.classfile;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+/**
+ * @since 6.0
+ */
+public class AnnotationElementValue extends ElementValue
+{
+        // For annotation element values, this is the annotation
+        private final AnnotationEntry annotationEntry;
+
+        public AnnotationElementValue(final int type, final AnnotationEntry annotationEntry,
+                        final ConstantPool cpool)
+        {
+                super(type, cpool);
+                if (type != ANNOTATION) {
+                    throw new RuntimeException(
+                                    "Only element values of type annotation can be built with this ctor - type specified: " + type);
+                }
+                this.annotationEntry = annotationEntry;
+        }
+
+        @Override
+        public void dump(final DataOutputStream dos) throws IOException
+        {
+                dos.writeByte(super.getType()); // u1 type of value (ANNOTATION == '@')
+                annotationEntry.dump(dos);
+        }
+
+        @Override
+        public String stringifyValue()
+        {
+                return annotationEntry.toString();
+        }
+
+        @Override
+        public String toString()
+        {
+                return stringifyValue();
+        }
+
+        public AnnotationEntry getAnnotationEntry()
+        {
+                return annotationEntry;
+        }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/AnnotationEntry.java	Mon Aug 28 07:53:26 2017 +0000
@@ -0,0 +1,172 @@
+/*
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
+ */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.sun.org.apache.bcel.internal.classfile;
+
+import java.io.DataInput;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import com.sun.org.apache.bcel.internal.Const;
+
+/**
+ * represents one annotation in the annotation table
+ *
+ * @version $Id: AnnotationEntry
+ * @since 6.0
+ */
+public class AnnotationEntry implements Node {
+
+    private final int type_index;
+    private final ConstantPool constant_pool;
+    private final boolean isRuntimeVisible;
+
+    private List<ElementValuePair> element_value_pairs;
+
+    /*
+     * Factory method to create an AnnotionEntry from a DataInput
+     *
+     * @param input
+     * @param constant_pool
+     * @param isRuntimeVisible
+     * @return the entry
+     * @throws IOException
+     */
+    public static AnnotationEntry read(final DataInput input, final ConstantPool constant_pool, final boolean isRuntimeVisible) throws IOException {
+
+        final AnnotationEntry annotationEntry = new AnnotationEntry(input.readUnsignedShort(), constant_pool, isRuntimeVisible);
+        final int num_element_value_pairs = input.readUnsignedShort();
+        annotationEntry.element_value_pairs = new ArrayList<>();
+        for (int i = 0; i < num_element_value_pairs; i++) {
+            annotationEntry.element_value_pairs.add(
+                    new ElementValuePair(input.readUnsignedShort(), ElementValue.readElementValue(input, constant_pool),
+                    constant_pool));
+        }
+        return annotationEntry;
+    }
+
+    public AnnotationEntry(final int type_index, final ConstantPool constant_pool, final boolean isRuntimeVisible) {
+        this.type_index = type_index;
+        this.constant_pool = constant_pool;
+        this.isRuntimeVisible = isRuntimeVisible;
+    }
+
+    public int getTypeIndex() {
+        return type_index;
+    }
+
+    public ConstantPool getConstantPool() {
+        return constant_pool;
+    }
+
+    public boolean isRuntimeVisible() {
+        return isRuntimeVisible;
+    }
+
+    /**
+     * Called by objects that are traversing the nodes of the tree implicitely defined by the contents of a Java class.
+     * I.e., the hierarchy of methods, fields, attributes, etc. spawns a tree of objects.
+     *
+     * @param v Visitor object
+     */
+    @Override
+    public void accept(final Visitor v) {
+        v.visitAnnotationEntry(this);
+    }
+
+    /**
+     * @return the annotation type name
+     */
+    public String getAnnotationType() {
+        final ConstantUtf8 c = (ConstantUtf8) constant_pool.getConstant(type_index, Const.CONSTANT_Utf8);
+        return c.getBytes();
+    }
+
+    /**
+     * @return the annotation type index
+     */
+    public int getAnnotationTypeIndex() {
+        return type_index;
+    }
+
+    /**
+     * @return the number of element value pairs in this annotation entry
+     */
+    public final int getNumElementValuePairs() {
+        return element_value_pairs.size();
+    }
+
+    /**
+     * @return the element value pairs in this annotation entry
+     */
+    public ElementValuePair[] getElementValuePairs() {
+        // TODO return List
+        return element_value_pairs.toArray(new ElementValuePair[element_value_pairs.size()]);
+    }
+
+    public void dump(final DataOutputStream dos) throws IOException {
+        dos.writeShort(type_index); // u2 index of type name in cpool
+        dos.writeShort(element_value_pairs.size()); // u2 element_value pair
+        // count
+        for (final ElementValuePair envp : element_value_pairs) {
+            envp.dump(dos);
+        }
+    }
+
+    public void addElementNameValuePair(final ElementValuePair elementNameValuePair) {
+        element_value_pairs.add(elementNameValuePair);
+    }
+
+    public String toShortString() {
+        final StringBuilder result = new StringBuilder();
+        result.append("@");
+        result.append(getAnnotationType());
+        final ElementValuePair[] evPairs = getElementValuePairs();
+        if (evPairs.length > 0) {
+            result.append("(");
+            for (final ElementValuePair element : evPairs) {
+                result.append(element.toShortString());
+            }
+            result.append(")");
+        }
+        return result.toString();
+    }
+
+    @Override
+    public String toString() {
+        return toShortString();
+    }
+
+    public static AnnotationEntry[] createAnnotationEntries(final Attribute[] attrs) {
+        // Find attributes that contain annotation data
+        final List<AnnotationEntry> accumulatedAnnotations = new ArrayList<>(attrs.length);
+        for (final Attribute attribute : attrs) {
+            if (attribute instanceof Annotations) {
+                final Annotations runtimeAnnotations = (Annotations) attribute;
+                Collections.addAll(accumulatedAnnotations, runtimeAnnotations.getAnnotationEntries());
+            }
+        }
+        return accumulatedAnnotations.toArray(new AnnotationEntry[accumulatedAnnotations.size()]);
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Annotations.java	Mon Aug 28 07:53:26 2017 +0000
@@ -0,0 +1,118 @@
+/*
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
+ */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.sun.org.apache.bcel.internal.classfile;
+
+import java.io.DataInput;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+/**
+ * base class for annotations
+ *
+ * @version $Id: Annotations
+ * @since 6.0
+ */
+public abstract class Annotations extends Attribute {
+
+    private AnnotationEntry[] annotation_table;
+    private final boolean isRuntimeVisible;
+
+    /**
+     * @param annotation_type the subclass type of the annotation
+     * @param name_index Index pointing to the name <em>Code</em>
+     * @param length Content length in bytes
+     * @param input Input stream
+     * @param constant_pool Array of constants
+     */
+    Annotations(final byte annotation_type, final int name_index, final int length, final DataInput input,
+            final ConstantPool constant_pool, final boolean isRuntimeVisible) throws IOException {
+        this(annotation_type, name_index, length, (AnnotationEntry[]) null, constant_pool, isRuntimeVisible);
+        final int annotation_table_length = input.readUnsignedShort();
+        annotation_table = new AnnotationEntry[annotation_table_length];
+        for (int i = 0; i < annotation_table_length; i++) {
+            annotation_table[i] = AnnotationEntry.read(input, constant_pool, isRuntimeVisible);
+        }
+    }
+
+    /**
+     * @param annotation_type the subclass type of the annotation
+     * @param name_index Index pointing to the name <em>Code</em>
+     * @param length Content length in bytes
+     * @param annotation_table the actual annotations
+     * @param constant_pool Array of constants
+     */
+    public Annotations(final byte annotation_type, final int name_index, final int length, final AnnotationEntry[] annotation_table,
+            final ConstantPool constant_pool, final boolean isRuntimeVisible) {
+        super(annotation_type, name_index, length, constant_pool);
+        this.annotation_table = annotation_table;
+        this.isRuntimeVisible = isRuntimeVisible;
+    }
+
+    /**
+     * Called by objects that are traversing the nodes of the tree implicitely defined by the contents of a Java class.
+     * I.e., the hierarchy of methods, fields, attributes, etc. spawns a tree of objects.
+     *
+     * @param v Visitor object
+     */
+    @Override
+    public void accept(final Visitor v) {
+        v.visitAnnotation(this);
+    }
+
+    /**
+     * @param annotation_table the entries to set in this annotation
+     */
+    public final void setAnnotationTable(final AnnotationEntry[] annotation_table) {
+        this.annotation_table = annotation_table;
+    }
+
+    /**
+     * returns the array of annotation entries in this annotation
+     */
+    public AnnotationEntry[] getAnnotationEntries() {
+        return annotation_table;
+    }
+
+    /**
+     * @return the number of annotation entries in this annotation
+     */
+    public final int getNumAnnotations() {
+        if (annotation_table == null) {
+            return 0;
+        }
+        return annotation_table.length;
+    }
+
+    public boolean isRuntimeVisible() {
+        return isRuntimeVisible;
+    }
+
+    protected void writeAnnotations(final DataOutputStream dos) throws IOException {
+        if (annotation_table == null) {
+            return;
+        }
+        dos.writeShort(annotation_table.length);
+        for (final AnnotationEntry element : annotation_table) {
+            element.dump(dos);
+        }
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ArrayElementValue.java	Mon Aug 28 07:53:26 2017 +0000
@@ -0,0 +1,96 @@
+/*
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
+ */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.sun.org.apache.bcel.internal.classfile;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+/**
+ * @since 6.0
+ */
+public class ArrayElementValue extends ElementValue
+{
+    // For array types, this is the array
+    private final ElementValue[] evalues;
+
+    @Override
+    public String toString()
+    {
+        final StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        for (int i = 0; i < evalues.length; i++)
+        {
+            sb.append(evalues[i]);
+            if ((i + 1) < evalues.length) {
+                sb.append(",");
+            }
+        }
+        sb.append("}");
+        return sb.toString();
+    }
+
+    public ArrayElementValue(final int type, final ElementValue[] datums, final ConstantPool cpool)
+    {
+        super(type, cpool);
+        if (type != ARRAY) {
+            throw new RuntimeException(
+                    "Only element values of type array can be built with this ctor - type specified: " + type);
+        }
+        this.evalues = datums;
+    }
+
+    @Override
+    public void dump(final DataOutputStream dos) throws IOException
+    {
+        dos.writeByte(super.getType()); // u1 type of value (ARRAY == '[')
+        dos.writeShort(evalues.length);
+        for (final ElementValue evalue : evalues) {
+            evalue.dump(dos);
+        }
+    }
+
+    @Override
+    public String stringifyValue()
+    {
+        final StringBuilder sb = new StringBuilder();
+        sb.append("[");
+        for (int i = 0; i < evalues.length; i++)
+        {
+            sb.append(evalues[i].stringifyValue());
+            if ((i + 1) < evalues.length) {
+                sb.append(",");
+            }
+        }
+        sb.append("]");
+        return sb.toString();
+    }
+
+    public ElementValue[] getElementValuesArray()
+    {
+        return evalues;
+    }
+
+    public int getElementValuesArraySize()
+    {
+        return evalues.length;
+    }
+}
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Attribute.java	Mon Aug 28 00:49:06 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Attribute.java	Mon Aug 28 07:53:26 2017 +0000
@@ -1,6 +1,5 @@
 /*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,255 +17,295 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.sun.org.apache.bcel.internal.classfile;
 
+import java.io.DataInput;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 
-import com.sun.org.apache.bcel.internal.Constants;
-import java.io.*;
-import java.util.HashMap;
+import com.sun.org.apache.bcel.internal.Const;
 
 /**
  * Abstract super class for <em>Attribute</em> objects. Currently the
  * <em>ConstantValue</em>, <em>SourceFile</em>, <em>Code</em>,
  * <em>Exceptiontable</em>, <em>LineNumberTable</em>,
  * <em>LocalVariableTable</em>, <em>InnerClasses</em> and
- * <em>Synthetic</em> attributes are supported. The
- * <em>Unknown</em> attribute stands for non-standard-attributes.
+ * <em>Synthetic</em> attributes are supported. The <em>Unknown</em>
+ * attribute stands for non-standard-attributes.
  *
- * @author  <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A>
- * @see     ConstantValue
- * @see     SourceFile
- * @see     Code
- * @see     Unknown
- * @see     ExceptionTable
- * @see     LineNumberTable
- * @see     LocalVariableTable
- * @see     InnerClasses
- * @see     Synthetic
- * @see     Deprecated
- * @see     Signature
-*/
-public abstract class Attribute implements Cloneable, Node, Serializable {
-  protected int          name_index; // Points to attribute name in constant pool
-  protected int          length;     // Content length of attribute field
-  protected byte         tag;        // Tag to distiguish subclasses
-  protected ConstantPool constant_pool;
+ * @version $Id: Attribute.java 1750029 2016-06-23 22:14:38Z sebb $
+ * @see ConstantValue
+ * @see SourceFile
+ * @see Code
+ * @see Unknown
+ * @see ExceptionTable
+ * @see LineNumberTable
+ * @see LocalVariableTable
+ * @see InnerClasses
+ * @see Synthetic
+ * @see Deprecated
+ * @see Signature
+ */
+public abstract class Attribute implements Cloneable, Node {
 
-  protected Attribute(byte tag, int name_index, int length,
-                      ConstantPool constant_pool) {
-    this.tag           = tag;
-    this.name_index    = name_index;
-    this.length        = length;
-    this.constant_pool = constant_pool;
-  }
+    private int name_index; // Points to attribute name in constant pool
+    private int length; // Content length of attribute field
+    private final byte tag; // Tag to distinguish subclasses
+    private ConstantPool constant_pool;
 
-  /**
-   * Called by objects that are traversing the nodes of the tree implicitely
-   * defined by the contents of a Java class. I.e., the hierarchy of methods,
-   * fields, attributes, etc. spawns a tree of objects.
-   *
-   * @param v Visitor object
-   */
-  public abstract void accept(Visitor v);
+    protected Attribute(final byte tag, final int name_index, final int length, final ConstantPool constant_pool) {
+        this.tag = tag;
+        this.name_index = name_index;
+        this.length = length;
+        this.constant_pool = constant_pool;
+    }
 
-  /**
-   * Dump attribute to file stream in binary format.
-   *
-   * @param file Output file stream
-   * @throws IOException
-   */
-  public void dump(DataOutputStream file) throws IOException
-  {
-    file.writeShort(name_index);
-    file.writeInt(length);
-  }
-
-  private static HashMap readers = new HashMap();
+    /**
+     * Called by objects that are traversing the nodes of the tree implicitely
+     * defined by the contents of a Java class. I.e., the hierarchy of methods,
+     * fields, attributes, etc. spawns a tree of objects.
+     *
+     * @param v Visitor object
+     */
+    @Override
+    public abstract void accept(Visitor v);
 
-  /** Add an Attribute reader capable of parsing (user-defined) attributes
-   * named "name". You should not add readers for the standard attributes
-   * such as "LineNumberTable", because those are handled internally.
-   *
-   * @param name the name of the attribute as stored in the class file
-   * @param r the reader object
-   */
-  public static void addAttributeReader(String name, AttributeReader r) {
-    readers.put(name, r);
-  }
+    /**
+     * Dump attribute to file stream in binary format.
+     *
+     * @param file Output file stream
+     * @throws IOException
+     */
+    public void dump(final DataOutputStream file) throws IOException {
+        file.writeShort(name_index);
+        file.writeInt(length);
+    }
 
-  /** Remove attribute reader
-   *
-   * @param name the name of the attribute as stored in the class file
-   */
-  public static void removeAttributeReader(String name) {
-    readers.remove(name);
-  }
+    private static final Map<String, Object> readers = new HashMap<>();
+
+    /**
+     * Add an Attribute reader capable of parsing (user-defined) attributes
+     * named "name". You should not add readers for the standard attributes such
+     * as "LineNumberTable", because those are handled internally.
+     *
+     * @param name the name of the attribute as stored in the class file
+     * @param r the reader object
+     */
+    public static void addAttributeReader(final String name, final UnknownAttributeReader r) {
+        readers.put(name, r);
+    }
 
-  /* Class method reads one attribute from the input data stream.
-   * This method must not be accessible from the outside.  It is
-   * called by the Field and Method constructor methods.
-   *
-   * @see    Field
-   * @see    Method
-   * @param  file Input stream
-   * @param  constant_pool Array of constants
-   * @return Attribute
-   * @throws  IOException
-   * @throws  ClassFormatException
-   */
-  public static final Attribute readAttribute(DataInputStream file,
-                                              ConstantPool constant_pool)
-    throws IOException, ClassFormatException
-  {
-    ConstantUtf8 c;
-    String       name;
-    int          name_index;
-    int          length;
-    byte         tag = Constants.ATTR_UNKNOWN; // Unknown attribute
+    /**
+     * Remove attribute reader
+     *
+     * @param name the name of the attribute as stored in the class file
+     */
+    public static void removeAttributeReader(final String name) {
+        readers.remove(name);
+    }
 
-    // Get class name from constant pool via `name_index' indirection
-    name_index = (int)file.readUnsignedShort();
-    c          = (ConstantUtf8)constant_pool.getConstant(name_index,
-                                                         Constants.CONSTANT_Utf8);
-    name       = c.getBytes();
-
-    // Length of data in bytes
-    length = file.readInt();
-
-    // Compare strings to find known attribute
-    for(byte i=0; i < Constants.KNOWN_ATTRIBUTES; i++) {
-      if(name.equals(Constants.ATTRIBUTE_NAMES[i])) {
-        tag = i; // found!
-        break;
-      }
+    /**
+     * Class method reads one attribute from the input data stream. This method
+     * must not be accessible from the outside. It is called by the Field and
+     * Method constructor methods.
+     *
+     * @see Field
+     * @see Method
+     *
+     * @param file Input stream
+     * @param constant_pool Array of constants
+     * @return Attribute
+     * @throws IOException
+     * @throws ClassFormatException
+     */
+    public static Attribute readAttribute(final DataInputStream file, final ConstantPool constant_pool)
+            throws IOException, ClassFormatException {
+        return readAttribute((DataInput) file, constant_pool);
     }
 
-    // Call proper constructor, depending on `tag'
-    switch(tag) {
-    case Constants.ATTR_UNKNOWN:
-      AttributeReader r = (AttributeReader)readers.get(name);
-
-      if(r != null)
-        return r.createAttribute(name_index, length, file, constant_pool);
-      else
-        return new Unknown(name_index, length, file, constant_pool);
-
-    case Constants.ATTR_CONSTANT_VALUE:
-      return new ConstantValue(name_index, length, file, constant_pool);
-
-    case Constants.ATTR_SOURCE_FILE:
-      return new SourceFile(name_index, length, file, constant_pool);
-
-    case Constants.ATTR_CODE:
-      return new Code(name_index, length, file, constant_pool);
-
-    case Constants.ATTR_EXCEPTIONS:
-      return new ExceptionTable(name_index, length, file, constant_pool);
-
-    case Constants.ATTR_LINE_NUMBER_TABLE:
-      return new LineNumberTable(name_index, length, file, constant_pool);
+    /**
+     * Class method reads one attribute from the input data stream. This method
+     * must not be accessible from the outside. It is called by the Field and
+     * Method constructor methods.
+     *
+     * @see Field
+     * @see Method
+     *
+     * @param file Input stream
+     * @param constant_pool Array of constants
+     * @return Attribute
+     * @throws IOException
+     * @throws ClassFormatException
+     * @since 6.0
+     */
+    public static Attribute readAttribute(final DataInput file, final ConstantPool constant_pool)
+            throws IOException, ClassFormatException {
+        byte tag = Const.ATTR_UNKNOWN; // Unknown attribute
+        // Get class name from constant pool via `name_index' indirection
+        final int name_index = file.readUnsignedShort();
+        final ConstantUtf8 c = (ConstantUtf8) constant_pool.getConstant(name_index, Const.CONSTANT_Utf8);
+        final String name = c.getBytes();
 
-    case Constants.ATTR_LOCAL_VARIABLE_TABLE:
-      return new LocalVariableTable(name_index, length, file, constant_pool);
-
-    case Constants.ATTR_LOCAL_VARIABLE_TYPE_TABLE:
-      return new LocalVariableTypeTable(name_index, length, file, constant_pool);
-
-    case Constants.ATTR_INNER_CLASSES:
-      return new InnerClasses(name_index, length, file, constant_pool);
-
-    case Constants.ATTR_SYNTHETIC:
-      return new Synthetic(name_index, length, file, constant_pool);
+        // Length of data in bytes
+        final int length = file.readInt();
 
-    case Constants.ATTR_DEPRECATED:
-      return new Deprecated(name_index, length, file, constant_pool);
-
-    case Constants.ATTR_PMG:
-      return new PMGClass(name_index, length, file, constant_pool);
-
-    case Constants.ATTR_SIGNATURE:
-      return new Signature(name_index, length, file, constant_pool);
-
-    case Constants.ATTR_STACK_MAP:
-      return new StackMap(name_index, length, file, constant_pool);
-
-    default: // Never reached
-      throw new IllegalStateException("Ooops! default case reached.");
-    }
-  }
+        // Compare strings to find known attribute
+        for (byte i = 0; i < Const.KNOWN_ATTRIBUTES; i++) {
+            if (name.equals(Const.getAttributeName(i))) {
+                tag = i; // found!
+                break;
+            }
+        }
 
-  /**
-   * @return Length of attribute field in bytes.
-   */
-  public final int   getLength()    { return length; }
-
-  /**
-   * @param Attribute length in bytes.
-   */
-  public final void setLength(int length) {
-    this.length = length;
-  }
-
-  /**
-   * @param name_index of attribute.
-   */
-  public final void setNameIndex(int name_index) {
-    this.name_index = name_index;
-  }
-
-  /**
-   * @return Name index in constant pool of attribute name.
-   */
-  public final int getNameIndex() { return name_index; }
-
-  /**
-   * @return Tag of attribute, i.e., its type. Value may not be altered, thus
-   * there is no setTag() method.
-   */
-  public final byte  getTag()       { return tag; }
-
-  /**
-   * @return Constant pool used by this object.
-   * @see ConstantPool
-   */
-  public final ConstantPool getConstantPool() { return constant_pool; }
-
-  /**
-   * @param constant_pool Constant pool to be used for this object.
-   * @see ConstantPool
-   */
-  public final void setConstantPool(ConstantPool constant_pool) {
-    this.constant_pool = constant_pool;
-  }
-
-  /**
-   * Use copy() if you want to have a deep copy(), i.e., with all references
-   * copied correctly.
-   *
-   * @return shallow copy of this attribute
-   */
-  public Object clone() {
-    Object o = null;
-
-    try {
-      o = super.clone();
-    } catch(CloneNotSupportedException e) {
-      e.printStackTrace(); // Never occurs
+        // Call proper constructor, depending on `tag'
+        switch (tag) {
+            case Const.ATTR_UNKNOWN:
+                final Object r = readers.get(name);
+                if (r instanceof UnknownAttributeReader) {
+                    return ((UnknownAttributeReader) r).createAttribute(name_index, length, file, constant_pool);
+                }
+                return new Unknown(name_index, length, file, constant_pool);
+            case Const.ATTR_CONSTANT_VALUE:
+                return new ConstantValue(name_index, length, file, constant_pool);
+            case Const.ATTR_SOURCE_FILE:
+                return new SourceFile(name_index, length, file, constant_pool);
+            case Const.ATTR_CODE:
+                return new Code(name_index, length, file, constant_pool);
+            case Const.ATTR_EXCEPTIONS:
+                return new ExceptionTable(name_index, length, file, constant_pool);
+            case Const.ATTR_LINE_NUMBER_TABLE:
+                return new LineNumberTable(name_index, length, file, constant_pool);
+            case Const.ATTR_LOCAL_VARIABLE_TABLE:
+                return new LocalVariableTable(name_index, length, file, constant_pool);
+            case Const.ATTR_INNER_CLASSES:
+                return new InnerClasses(name_index, length, file, constant_pool);
+            case Const.ATTR_SYNTHETIC:
+                return new Synthetic(name_index, length, file, constant_pool);
+            case Const.ATTR_DEPRECATED:
+                return new Deprecated(name_index, length, file, constant_pool);
+            case Const.ATTR_PMG:
+                return new PMGClass(name_index, length, file, constant_pool);
+            case Const.ATTR_SIGNATURE:
+                return new Signature(name_index, length, file, constant_pool);
+            case Const.ATTR_STACK_MAP:
+                return new StackMap(name_index, length, file, constant_pool);
+            case Const.ATTR_RUNTIME_VISIBLE_ANNOTATIONS:
+                return new RuntimeVisibleAnnotations(name_index, length, file, constant_pool);
+            case Const.ATTR_RUNTIME_INVISIBLE_ANNOTATIONS:
+                return new RuntimeInvisibleAnnotations(name_index, length, file, constant_pool);
+            case Const.ATTR_RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS:
+                return new RuntimeVisibleParameterAnnotations(name_index, length, file, constant_pool);
+            case Const.ATTR_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS:
+                return new RuntimeInvisibleParameterAnnotations(name_index, length, file, constant_pool);
+            case Const.ATTR_ANNOTATION_DEFAULT:
+                return new AnnotationDefault(name_index, length, file, constant_pool);
+            case Const.ATTR_LOCAL_VARIABLE_TYPE_TABLE:
+                return new LocalVariableTypeTable(name_index, length, file, constant_pool);
+            case Const.ATTR_ENCLOSING_METHOD:
+                return new EnclosingMethod(name_index, length, file, constant_pool);
+            case Const.ATTR_STACK_MAP_TABLE:
+                return new StackMap(name_index, length, file, constant_pool);
+            case Const.ATTR_BOOTSTRAP_METHODS:
+                return new BootstrapMethods(name_index, length, file, constant_pool);
+            case Const.ATTR_METHOD_PARAMETERS:
+                return new MethodParameters(name_index, length, file, constant_pool);
+            default:
+                // Never reached
+                throw new IllegalStateException("Unrecognized attribute type tag parsed: " + tag);
+        }
     }
 
-    return o;
-  }
+    /**
+     * @return Name of attribute
+     * @since 6.0
+     */
+    public String getName() {
+        final ConstantUtf8 c = (ConstantUtf8) constant_pool.getConstant(name_index, Const.CONSTANT_Utf8);
+        return c.getBytes();
+    }
+
+    /**
+     * @return Length of attribute field in bytes.
+     */
+    public final int getLength() {
+        return length;
+    }
 
-  /**
-   * @return deep copy of this attribute
-   */
-  public abstract Attribute copy(ConstantPool constant_pool);
+    /**
+     * @param length length in bytes.
+     */
+    public final void setLength(final int length) {
+        this.length = length;
+    }
+
+    /**
+     * @param name_index of attribute.
+     */
+    public final void setNameIndex(final int name_index) {
+        this.name_index = name_index;
+    }
+
+    /**
+     * @return Name index in constant pool of attribute name.
+     */
+    public final int getNameIndex() {
+        return name_index;
+    }
+
+    /**
+     * @return Tag of attribute, i.e., its type. Value may not be altered, thus
+     * there is no setTag() method.
+     */
+    public final byte getTag() {
+        return tag;
+    }
 
-  /**
-   * @return attribute name.
-   */
-  public String toString() {
-    return Constants.ATTRIBUTE_NAMES[tag];
-  }
+    /**
+     * @return Constant pool used by this object.
+     * @see ConstantPool
+     */
+    public final ConstantPool getConstantPool() {
+        return constant_pool;
+    }
+
+    /**
+     * @param constant_pool Constant pool to be used for this object.
+     * @see ConstantPool
+     */
+    public final void setConstantPool(final ConstantPool constant_pool) {
+        this.constant_pool = constant_pool;
+    }
+
+    /**
+     * Use copy() if you want to have a deep copy(), i.e., with all references
+     * copied correctly.
+     *
+     * @return shallow copy of this attribute
+     */
+    @Override
+    public Object clone() {
+        Attribute attr = null;
+        try {
+            attr = (Attribute) super.clone();
+        } catch (final CloneNotSupportedException e) {
+            throw new Error("Clone Not Supported"); // never happens
+        }
+        return attr;
+    }
+
+    /**
+     * @return deep copy of this attribute
+     */
+    public abstract Attribute copy(ConstantPool _constant_pool);
+
+    /**
+     * @return attribute name.
+     */
+    @Override
+    public String toString() {
+        return Const.getAttributeName(tag);
+    }
 }
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/AttributeReader.java	Mon Aug 28 00:49:06 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/AttributeReader.java	Mon Aug 28 07:53:26 2017 +0000
@@ -21,17 +21,20 @@
 
 package com.sun.org.apache.bcel.internal.classfile;
 
-
 /**
  * Unknown (non-standard) attributes may be read via user-defined factory
  * objects that can be registered with the Attribute.addAttributeReader
  * method. These factory objects should implement this interface.
 
  * @see Attribute
- * @author  <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A>
+ * @version $Id: AttributeReader.java 1748467 2016-06-14 21:05:14Z ggregory $
+ *
+ * @deprecated Use UnknownAttributeReader instead
  */
+@java.lang.Deprecated
 public interface AttributeReader {
-  /**
+
+    /**
      When this attribute reader is added via the static method
      Attribute.addAttributeReader, an attribute name is associated with it.
      As the class file parser parses attributes, it will call various
@@ -56,9 +59,6 @@
      returned which will cause the parsing of the class file to fail.
 
      @see Attribute#addAttributeReader( String, AttributeReader )
-  */
-  public Attribute createAttribute(int name_index,
-                                   int length,
-                                   java.io.DataInputStream file,
-                                   ConstantPool constant_pool);
+     */
+    Attribute createAttribute( int name_index, int length, java.io.DataInputStream file, ConstantPool constant_pool );
 }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/BootstrapMethod.java	Mon Aug 28 07:53:26 2017 +0000
@@ -0,0 +1,173 @@
+/*
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
+ */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.sun.org.apache.bcel.internal.classfile;
+
+import java.io.DataInput;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.Arrays;
+
+import com.sun.org.apache.bcel.internal.Const;
+
+/**
+ * This class represents a bootstrap method attribute, i.e., the bootstrap
+ * method ref, the number of bootstrap arguments and an array of the
+ * bootstrap arguments.
+ *
+ * @see <a href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.23">
+ * The class File Format : The BootstrapMethods Attribute</a>
+ * @since 6.0
+ */
+public class BootstrapMethod implements Cloneable {
+
+    /** Index of the CONSTANT_MethodHandle_info structure in the constant_pool table */
+    private int bootstrap_method_ref;
+
+    /** Array of references to the constant_pool table */
+    private int[] bootstrap_arguments;
+
+
+    /**
+     * Initialize from another object.
+     */
+    public BootstrapMethod(final BootstrapMethod c) {
+        this(c.getBootstrapMethodRef(), c.getBootstrapArguments());
+    }
+
+    /**
+     * Construct object from input stream.
+     *
+     * @param input Input stream
+     * @throws IOException
+     */
+    BootstrapMethod(final DataInput input) throws IOException {
+        this(input.readUnsignedShort(), input.readUnsignedShort());
+
+        for (int i = 0; i < bootstrap_arguments.length; i++) {
+            bootstrap_arguments[i] = input.readUnsignedShort();
+        }
+    }
+
+    // helper method
+    private BootstrapMethod(final int bootstrap_method_ref, final int num_bootstrap_arguments) {
+        this(bootstrap_method_ref, new int[num_bootstrap_arguments]);
+    }
+
+    /**
+     * @param bootstrap_method_ref int index into constant_pool of CONSTANT_MethodHandle
+     * @param bootstrap_arguments int[] indices into constant_pool of CONSTANT_<type>_info
+     */
+    public BootstrapMethod(final int bootstrap_method_ref, final int[] bootstrap_arguments) {
+        this.bootstrap_method_ref = bootstrap_method_ref;
+        this.bootstrap_arguments = bootstrap_arguments;
+    }
+
+    /**
+     * @return index into constant_pool of bootstrap_method
+     */
+    public int getBootstrapMethodRef() {
+        return bootstrap_method_ref;
+    }
+
+    /**
+     * @param bootstrap_method_ref int index into constant_pool of CONSTANT_MethodHandle
+     */
+    public void setBootstrapMethodRef(final int bootstrap_method_ref) {
+        this.bootstrap_method_ref = bootstrap_method_ref;
+    }
+
+    /**
+     * @return int[] of bootstrap_method indices into constant_pool of CONSTANT_<type>_info
+     */
+    public int[] getBootstrapArguments() {
+        return bootstrap_arguments;
+    }
+
+    /**
+     * @return count of number of boostrap arguments
+     */
+    public int getNumBootstrapArguments() {
+        return bootstrap_arguments.length;
+    }
+
+    /**
+     * @param bootstrap_arguments int[] indices into constant_pool of CONSTANT_<type>_info
+     */
+    public void setBootstrapArguments(final int[] bootstrap_arguments) {
+        this.bootstrap_arguments = bootstrap_arguments;
+    }
+
+    /**
+     * @return String representation.
+     */
+    @Override
+    public final String toString() {
+        return "BootstrapMethod(" + bootstrap_method_ref + ", " + bootstrap_arguments.length + ", "
+               + Arrays.toString(bootstrap_arguments) + ")";
+    }
+
+    /**
+     * @return Resolved string representation
+     */
+    public final String toString( final ConstantPool constant_pool ) {
+        final StringBuilder buf = new StringBuilder();
+        String bootstrap_method_name;
+        bootstrap_method_name = constant_pool.constantToString(bootstrap_method_ref,
+                Const.CONSTANT_MethodHandle);
+        buf.append(Utility.compactClassName(bootstrap_method_name));
+        final int num_bootstrap_arguments = bootstrap_arguments.length;
+        if (num_bootstrap_arguments > 0) {
+            buf.append("\n     Method Arguments:");
+            for (int i = 0; i < num_bootstrap_arguments; i++) {
+                buf.append("\n     ").append(i).append(": ");
+                buf.append(constant_pool.constantToString(constant_pool.getConstant(bootstrap_arguments[i])));
+            }
+        }
+        return buf.toString();
+    }
+
+    /**
+     * Dump object to file stream in binary format.
+     *
+     * @param file Output file stream
+     * @throws IOException
+     */
+    public final void dump(final DataOutputStream file) throws IOException {
+        file.writeShort(bootstrap_method_ref);
+        file.writeShort(bootstrap_arguments.length);
+        for (final int bootstrap_argument : bootstrap_arguments) {
+            file.writeShort(bootstrap_argument);
+        }
+    }
+
+    /**
+     * @return deep copy of this object
+     */
+    public BootstrapMethod copy() {
+        try {
+            return (BootstrapMethod) clone();
+        } catch (final CloneNotSupportedException e) {
+            // TODO should this throw?
+        }
+        return null;
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/BootstrapMethods.java	Mon Aug 28 07:53:26 2017 +0000
@@ -0,0 +1,148 @@
+/*
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
+ */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.sun.org.apache.bcel.internal.classfile;
+
+import java.io.DataInput;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import com.sun.org.apache.bcel.internal.Const;
+
+/**
+ * This class represents a BootstrapMethods attribute.
+ *
+ * @see <a href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.23">
+ * The class File Format : The BootstrapMethods Attribute</a>
+ * @since 6.0
+ */
+public class BootstrapMethods extends Attribute {
+
+    private BootstrapMethod[] bootstrap_methods;  // TODO this could be made final (setter is not used)
+
+    /**
+     * Initialize from another object. Note that both objects use the same
+     * references (shallow copy). Use clone() for a physical copy.
+     */
+    public BootstrapMethods(final BootstrapMethods c) {
+        this(c.getNameIndex(), c.getLength(), c.getBootstrapMethods(), c.getConstantPool());
+    }
+
+
+    /**
+     * @param name_index Index in constant pool to CONSTANT_Utf8
+     * @param length Content length in bytes
+     * @param bootstrap_methods array of bootstrap methods
+     * @param constant_pool Array of constants
+     */
+    public BootstrapMethods(final int name_index, final int length, final BootstrapMethod[] bootstrap_methods, final ConstantPool constant_pool) {
+        super(Const.ATTR_BOOTSTRAP_METHODS, name_index, length, constant_pool);
+        this.bootstrap_methods = bootstrap_methods;
+    }
+
+    /**
+     * Construct object from Input stream.
+     *
+     * @param name_index Index in constant pool to CONSTANT_Utf8
+     * @param length Content length in bytes
+     * @param input Input stream
+     * @param constant_pool Array of constants
+     * @throws IOException
+     */
+    BootstrapMethods(final int name_index, final int length, final DataInput input, final ConstantPool constant_pool) throws IOException {
+        this(name_index, length, (BootstrapMethod[]) null, constant_pool);
+
+        final int num_bootstrap_methods = input.readUnsignedShort();
+        bootstrap_methods = new BootstrapMethod[num_bootstrap_methods];
+        for (int i = 0; i < num_bootstrap_methods; i++) {
+            bootstrap_methods[i] = new BootstrapMethod(input);
+        }
+    }
+
+    /**
+     * @return array of bootstrap method "records"
+     */
+    public final BootstrapMethod[] getBootstrapMethods() {
+        return bootstrap_methods;
+    }
+
+    /**
+     * @param bootstrap_methods the array of bootstrap methods
+     */
+    public final void setBootstrapMethods(final BootstrapMethod[] bootstrap_methods) {
+        this.bootstrap_methods = bootstrap_methods;
+    }
+
+    /**
+     * @param v Visitor object
+     */
+    @Override
+    public void accept(final Visitor v) {
+        v.visitBootstrapMethods(this);
+    }
+
+    /**
+     * @return deep copy of this attribute
+     */
+    @Override
+    public BootstrapMethods copy(final ConstantPool _constant_pool) {
+        final BootstrapMethods c = (BootstrapMethods) clone();
+        c.bootstrap_methods = new BootstrapMethod[bootstrap_methods.length];
+
+        for (int i = 0; i < bootstrap_methods.length; i++) {
+            c.bootstrap_methods[i] = bootstrap_methods[i].copy();
+        }
+        c.setConstantPool(_constant_pool);
+        return c;
+    }
+
+    /**
+     * Dump bootstrap methods attribute to file stream in binary format.
+     *
+     * @param file Output file stream
+     * @throws IOException
+     */
+    @Override
+    public final void dump(final DataOutputStream file) throws IOException {
+        super.dump(file);
+
+        file.writeShort(bootstrap_methods.length);
+        for (final BootstrapMethod bootstrap_method : bootstrap_methods) {
+            bootstrap_method.dump(file);
+        }
+    }
+
+    /**
+     * @return String representation.
+     */
+    @Override
+    public final String toString() {
+        final StringBuilder buf = new StringBuilder();
+        buf.append("BootstrapMethods(");
+        buf.append(bootstrap_methods.length);
+        buf.append("):\n");
+        for (int i = 0; i < bootstrap_methods.length; i++) {
+            buf.append("  ").append(i).append(": ");
+            buf.append(bootstrap_methods[i].toString(super.getConstantPool())).append("\n");
+        }
+        return buf.toString();
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ClassElementValue.java	Mon Aug 28 07:53:26 2017 +0000
@@ -0,0 +1,71 @@
+/*
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
+ */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.sun.org.apache.bcel.internal.classfile;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import com.sun.org.apache.bcel.internal.Const;
+
+/**
+ * @since 6.0
+ */
+public class ClassElementValue extends ElementValue
+{
+    // For primitive types and string type, this points to the value entry in
+    // the cpool
+    // For 'class' this points to the class entry in the cpool
+    private final int idx;
+
+    public ClassElementValue(final int type, final int idx, final ConstantPool cpool)
+    {
+        super(type, cpool);
+        this.idx = idx;
+    }
+
+    public int getIndex()
+    {
+        return idx;
+    }
+
+    public String getClassString()
+    {
+        final ConstantUtf8 c = (ConstantUtf8) super.getConstantPool().getConstant(idx,
+                Const.CONSTANT_Utf8);
+        return c.getBytes();
+    }
+
+    @Override
+    public String stringifyValue()
+    {
+        final ConstantUtf8 cu8 = (ConstantUtf8) super.getConstantPool().getConstant(idx,
+                Const.CONSTANT_Utf8);
+        return cu8.getBytes();
+    }
+
+    @Override
+    public void dump(final DataOutputStream dos) throws IOException
+    {
+        dos.writeByte(super.getType()); // u1 kind of value
+        dos.writeShort(idx);
+    }
+}
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ClassFormatException.java	Mon Aug 28 00:49:06 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ClassFormatException.java	Mon Aug 28 07:53:26 2017 +0000
@@ -21,15 +21,30 @@
 
 package com.sun.org.apache.bcel.internal.classfile;
 
-
 /**
  * Thrown when the BCEL attempts to read a class file and determines
  * that the file is malformed or otherwise cannot be interpreted as a
  * class file.
  *
- * @author  <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A>
+ * @version $Id: ClassFormatException.java 1748973 2016-06-18 12:14:42Z sebb $
  */
 public class ClassFormatException extends RuntimeException {
-  public ClassFormatException() { super(); }
-  public ClassFormatException(String s) { super(s); }
+
+    private static final long serialVersionUID = -3569097343160139969L;
+
+    public ClassFormatException() {
+        super();
+    }
+
+
+    public ClassFormatException(final String s) {
+        super(s);
+    }
+
+    /**
+     * @since 6.0
+     */
+    public ClassFormatException(final String message, final Throwable cause) {
+        super(message, cause);
+    }
 }
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ClassParser.java	Mon Aug 28 00:49:06 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ClassParser.java	Mon Aug 28 07:53:26 2017 +0000
@@ -21,10 +21,15 @@
 
 package com.sun.org.apache.bcel.internal.classfile;
 
+import java.io.BufferedInputStream;
+import java.io.DataInputStream;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
 
-import  com.sun.org.apache.bcel.internal.Constants;
-import  java.io.*;
-import  java.util.zip.*;
+import com.sun.org.apache.bcel.internal.Const;
 
 /**
  * Wrapper class that parses a given Java .class file. The method <A
@@ -34,262 +39,274 @@
  * the caller.
  *
  * The structure and the names comply, except for a few conveniences,
- * exactly with the <A href="ftp://java.sun.com/docs/specs/vmspec.ps">
+ * exactly with the <A href="http://docs.oracle.com/javase/specs/">
  * JVM specification 1.0</a>. See this paper for
  * further details about the structure of a bytecode file.
  *
- * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A>
+ * @version $Id: ClassParser.java 1749603 2016-06-21 20:50:19Z ggregory $
  */
 public final class ClassParser {
-  private DataInputStream file;
-  private ZipFile         zip;
-  private String          file_name;
-  private int             class_name_index, superclass_name_index;
-  private int             major, minor; // Compiler version
-  private int             access_flags; // Access rights of parsed class
-  private int[]           interfaces; // Names of implemented interfaces
-  private ConstantPool    constant_pool; // collection of constants
-  private Field[]         fields; // class fields, i.e., its variables
-  private Method[]        methods; // methods defined in the class
-  private Attribute[]     attributes; // attributes defined in the class
-  private boolean         is_zip; // Loaded from zip file
 
-  private static final int BUFSIZE = 8192;
+    private DataInputStream dataInputStream;
+    private final boolean fileOwned;
+    private final String file_name;
+    private String zip_file;
+    private int class_name_index;
+    private int superclass_name_index;
+    private int major; // Compiler version
+    private int minor; // Compiler version
+    private int access_flags; // Access rights of parsed class
+    private int[] interfaces; // Names of implemented interfaces
+    private ConstantPool constant_pool; // collection of constants
+    private Field[] fields; // class fields, i.e., its variables
+    private Method[] methods; // methods defined in the class
+    private Attribute[] attributes; // attributes defined in the class
+    private final boolean is_zip; // Loaded from zip file
+    private static final int BUFSIZE = 8192;
 
-  /**
-   * Parse class from the given stream.
-   *
-   * @param file Input stream
-   * @param file_name File name
-   */
-  public ClassParser(InputStream file, String file_name) {
-    this.file_name = file_name;
-
-    String clazz = file.getClass().getName(); // Not a very clean solution ...
-    is_zip = clazz.startsWith("java.util.zip.") || clazz.startsWith("java.util.jar.");
 
-    if(file instanceof DataInputStream) // Is already a data stream
-      this.file = (DataInputStream)file;
-    else
-      this.file = new DataInputStream(new BufferedInputStream(file, BUFSIZE));
-  }
+    /**
+     * Parse class from the given stream.
+     *
+     * @param inputStream Input stream
+     * @param file_name File name
+     */
+    public ClassParser(final InputStream inputStream, final String file_name) {
+        this.file_name = file_name;
+        fileOwned = false;
+        final String clazz = inputStream.getClass().getName(); // Not a very clean solution ...
+        is_zip = clazz.startsWith("java.util.zip.") || clazz.startsWith("java.util.jar.");
+        if (inputStream instanceof DataInputStream) {
+            this.dataInputStream = (DataInputStream) inputStream;
+        } else {
+            this.dataInputStream = new DataInputStream(new BufferedInputStream(inputStream, BUFSIZE));
+        }
+    }
 
-  /** Parse class from given .class file.
-   *
-   * @param file_name file name
-   * @throws IOException
-   */
-  public ClassParser(String file_name) throws IOException
-  {
-    is_zip = false;
-    this.file_name = file_name;
-    file = new DataInputStream(new BufferedInputStream
-                               (new FileInputStream(file_name), BUFSIZE));
-  }
-
-  /** Parse class from given .class file in a ZIP-archive
-   *
-   * @param file_name file name
-   * @throws IOException
-   */
-  public ClassParser(String zip_file, String file_name) throws IOException
-  {
-    is_zip = true;
-    zip = new ZipFile(zip_file);
-    ZipEntry entry = zip.getEntry(file_name);
-
-    this.file_name = file_name;
 
-    file = new DataInputStream(new BufferedInputStream(zip.getInputStream(entry),
-                                                       BUFSIZE));
-  }
+    /** Parse class from given .class file.
+     *
+     * @param file_name file name
+     */
+    public ClassParser(final String file_name) {
+        is_zip = false;
+        this.file_name = file_name;
+        fileOwned = true;
+    }
+
 
-  /**
-   * Parse the given Java class file and return an object that represents
-   * the contained data, i.e., constants, methods, fields and commands.
-   * A <em>ClassFormatException</em> is raised, if the file is not a valid
-   * .class file. (This does not include verification of the byte code as it
-   * is performed by the java interpreter).
-   *
-   * @return Class object representing the parsed class file
-   * @throws  IOException
-   * @throws  ClassFormatException
-   */
-  public JavaClass parse() throws IOException, ClassFormatException
-  {
-    /****************** Read headers ********************************/
-    // Check magic tag of class file
-    readID();
-
-    // Get compiler version
-    readVersion();
-
-    /****************** Read constant pool and related **************/
-    // Read constant pool entries
-    readConstantPool();
-
-    // Get class information
-    readClassInfo();
+    /** Parse class from given .class file in a ZIP-archive
+     *
+     * @param zip_file zip file name
+     * @param file_name file name
+     */
+    public ClassParser(final String zip_file, final String file_name) {
+        is_zip = true;
+        fileOwned = true;
+        this.zip_file = zip_file;
+        this.file_name = file_name;
+    }
 
-    // Get interface information, i.e., implemented interfaces
-    readInterfaces();
-
-    /****************** Read class fields and methods ***************/
-    // Read class fields, i.e., the variables of the class
-    readFields();
-
-    // Read class methods, i.e., the functions in the class
-    readMethods();
-
-    // Read class attributes
-    readAttributes();
 
-    // Check for unknown variables
-    //Unknown[] u = Unknown.getUnknownAttributes();
-    //for(int i=0; i < u.length; i++)
-    //  System.err.println("WARNING: " + u[i]);
-
-    // Everything should have been read now
-    //      if(file.available() > 0) {
-    //        int bytes = file.available();
-    //        byte[] buf = new byte[bytes];
-    //        file.read(buf);
+    /**
+     * Parse the given Java class file and return an object that represents
+     * the contained data, i.e., constants, methods, fields and commands.
+     * A <em>ClassFormatException</em> is raised, if the file is not a valid
+     * .class file. (This does not include verification of the byte code as it
+     * is performed by the java interpreter).
+     *
+     * @return Class object representing the parsed class file
+     * @throws  IOException
+     * @throws  ClassFormatException
+     */
+    public JavaClass parse() throws IOException, ClassFormatException {
+        ZipFile zip = null;
+        try {
+            if (fileOwned) {
+                if (is_zip) {
+                    zip = new ZipFile(zip_file);
+                    final ZipEntry entry = zip.getEntry(file_name);
 
-    //        if(!(is_zip && (buf.length == 1))) {
-    //          System.err.println("WARNING: Trailing garbage at end of " + file_name);
-    //          System.err.println(bytes + " extra bytes: " + Utility.toHexString(buf));
-    //        }
-    //      }
-
-    // Read everything of interest, so close the file
-    file.close();
-    if(zip != null)
-      zip.close();
+                    if (entry == null) {
+                        throw new IOException("File " + file_name + " not found");
+                    }
 
-    // Return the information we have gathered in a new object
-    return new JavaClass(class_name_index, superclass_name_index,
-                         file_name, major, minor, access_flags,
-                         constant_pool, interfaces, fields,
-                         methods, attributes, is_zip? JavaClass.ZIP : JavaClass.FILE);
-  }
-
-  /**
-   * Read information about the attributes of the class.
-   * @throws  IOException
-   * @throws  ClassFormatException
-   */
-  private final void readAttributes() throws IOException, ClassFormatException
-  {
-    int attributes_count;
-
-    attributes_count = file.readUnsignedShort();
-    attributes       = new Attribute[attributes_count];
-
-    for(int i=0; i < attributes_count; i++)
-      attributes[i] = Attribute.readAttribute(file, constant_pool);
-  }
-
-  /**
-   * Read information about the class and its super class.
-   * @throws  IOException
-   * @throws  ClassFormatException
-   */
-  private final void readClassInfo() throws IOException, ClassFormatException
-  {
-    access_flags = file.readUnsignedShort();
+                    dataInputStream = new DataInputStream(new BufferedInputStream(zip.getInputStream(entry),
+                            BUFSIZE));
+                } else {
+                    dataInputStream = new DataInputStream(new BufferedInputStream(new FileInputStream(
+                            file_name), BUFSIZE));
+                }
+            }
+            /****************** Read headers ********************************/
+            // Check magic tag of class file
+            readID();
+            // Get compiler version
+            readVersion();
+            /****************** Read constant pool and related **************/
+            // Read constant pool entries
+            readConstantPool();
+            // Get class information
+            readClassInfo();
+            // Get interface information, i.e., implemented interfaces
+            readInterfaces();
+            /****************** Read class fields and methods ***************/
+            // Read class fields, i.e., the variables of the class
+            readFields();
+            // Read class methods, i.e., the functions in the class
+            readMethods();
+            // Read class attributes
+            readAttributes();
+            // Check for unknown variables
+            //Unknown[] u = Unknown.getUnknownAttributes();
+            //for (int i=0; i < u.length; i++)
+            //  System.err.println("WARNING: " + u[i]);
+            // Everything should have been read now
+            //      if(file.available() > 0) {
+            //        int bytes = file.available();
+            //        byte[] buf = new byte[bytes];
+            //        file.read(buf);
+            //        if(!(is_zip && (buf.length == 1))) {
+            //      System.err.println("WARNING: Trailing garbage at end of " + file_name);
+            //      System.err.println(bytes + " extra bytes: " + Utility.toHexString(buf));
+            //        }
+            //      }
+        } finally {
+            // Read everything of interest, so close the file
+            if (fileOwned) {
+                try {
+                    if (dataInputStream != null) {
+                        dataInputStream.close();
+                    }
+                } catch (final IOException ioe) {
+                    //ignore close exceptions
+                }
+            }
+            try {
+                if (zip != null) {
+                    zip.close();
+                }
+            } catch (final IOException ioe) {
+                //ignore close exceptions
+            }
+        }
+        // Return the information we have gathered in a new object
+        return new JavaClass(class_name_index, superclass_name_index, file_name, major, minor,
+                access_flags, constant_pool, interfaces, fields, methods, attributes, is_zip
+                        ? JavaClass.ZIP
+                        : JavaClass.FILE);
+    }
 
-    /* Interfaces are implicitely abstract, the flag should be set
-     * according to the JVM specification.
-     */
-    if((access_flags & Constants.ACC_INTERFACE) != 0)
-      access_flags |= Constants.ACC_ABSTRACT;
-
-    if(((access_flags & Constants.ACC_ABSTRACT) != 0) &&
-       ((access_flags & Constants.ACC_FINAL)    != 0 ))
-      throw new ClassFormatException("Class can't be both final and abstract");
 
-    class_name_index      = file.readUnsignedShort();
-    superclass_name_index = file.readUnsignedShort();
-  }
-  /**
-   * Read constant pool entries.
-   * @throws  IOException
-   * @throws  ClassFormatException
-   */
-  private final void readConstantPool() throws IOException, ClassFormatException
-  {
-    constant_pool = new ConstantPool(file);
-  }
+    /**
+     * Read information about the attributes of the class.
+     * @throws  IOException
+     * @throws  ClassFormatException
+     */
+    private void readAttributes() throws IOException, ClassFormatException {
+        final int attributes_count = dataInputStream.readUnsignedShort();
+        attributes = new Attribute[attributes_count];
+        for (int i = 0; i < attributes_count; i++) {
+            attributes[i] = Attribute.readAttribute(dataInputStream, constant_pool);
+        }
+    }
 
-  /**
-   * Read information about the fields of the class, i.e., its variables.
-   * @throws  IOException
-   * @throws  ClassFormatException
-   */
-  private final void readFields() throws IOException, ClassFormatException
-  {
-    int fields_count;
 
-    fields_count = file.readUnsignedShort();
-    fields       = new Field[fields_count];
+    /**
+     * Read information about the class and its super class.
+     * @throws  IOException
+     * @throws  ClassFormatException
+     */
+    private void readClassInfo() throws IOException, ClassFormatException {
+        access_flags = dataInputStream.readUnsignedShort();
+        /* Interfaces are implicitely abstract, the flag should be set
+         * according to the JVM specification.
+         */
+        if ((access_flags & Const.ACC_INTERFACE) != 0) {
+            access_flags |= Const.ACC_ABSTRACT;
+        }
+        if (((access_flags & Const.ACC_ABSTRACT) != 0)
+                && ((access_flags & Const.ACC_FINAL) != 0)) {
+            throw new ClassFormatException("Class " + file_name + " can't be both final and abstract");
+        }
+        class_name_index = dataInputStream.readUnsignedShort();
+        superclass_name_index = dataInputStream.readUnsignedShort();
+    }
 
-    for(int i=0; i < fields_count; i++)
-      fields[i] = new Field(file, constant_pool);
-  }
-
-  /******************** Private utility methods **********************/
 
-  /**
-   * Check whether the header of the file is ok.
-   * Of course, this has to be the first action on successive file reads.
-   * @throws  IOException
-   * @throws  ClassFormatException
-   */
-  private final void readID() throws IOException, ClassFormatException
-  {
-    int magic = 0xCAFEBABE;
+    /**
+     * Read constant pool entries.
+     * @throws  IOException
+     * @throws  ClassFormatException
+     */
+    private void readConstantPool() throws IOException, ClassFormatException {
+        constant_pool = new ConstantPool(dataInputStream);
+    }
+
 
-    if(file.readInt() != magic)
-      throw new ClassFormatException(file_name + " is not a Java .class file");
-  }
-  /**
-   * Read information about the interfaces implemented by this class.
-   * @throws  IOException
-   * @throws  ClassFormatException
-   */
-  private final void readInterfaces() throws IOException, ClassFormatException
-  {
-    int interfaces_count;
+    /**
+     * Read information about the fields of the class, i.e., its variables.
+     * @throws  IOException
+     * @throws  ClassFormatException
+     */
+    private void readFields() throws IOException, ClassFormatException {
+        final int fields_count = dataInputStream.readUnsignedShort();
+        fields = new Field[fields_count];
+        for (int i = 0; i < fields_count; i++) {
+            fields[i] = new Field(dataInputStream, constant_pool);
+        }
+    }
+
 
-    interfaces_count = file.readUnsignedShort();
-    interfaces       = new int[interfaces_count];
+    /******************** Private utility methods **********************/
+    /**
+     * Check whether the header of the file is ok.
+     * Of course, this has to be the first action on successive file reads.
+     * @throws  IOException
+     * @throws  ClassFormatException
+     */
+    private void readID() throws IOException, ClassFormatException {
+        if (dataInputStream.readInt() != Const.JVM_CLASSFILE_MAGIC) {
+            throw new ClassFormatException(file_name + " is not a Java .class file");
+        }
+    }
 
-    for(int i=0; i < interfaces_count; i++)
-      interfaces[i] = file.readUnsignedShort();
-  }
-  /**
-   * Read information about the methods of the class.
-   * @throws  IOException
-   * @throws  ClassFormatException
-   */
-  private final void readMethods() throws IOException, ClassFormatException
-  {
-    int methods_count;
 
-    methods_count = file.readUnsignedShort();
-    methods       = new Method[methods_count];
+    /**
+     * Read information about the interfaces implemented by this class.
+     * @throws  IOException
+     * @throws  ClassFormatException
+     */
+    private void readInterfaces() throws IOException, ClassFormatException {
+        final int interfaces_count = dataInputStream.readUnsignedShort();
+        interfaces = new int[interfaces_count];
+        for (int i = 0; i < interfaces_count; i++) {
+            interfaces[i] = dataInputStream.readUnsignedShort();
+        }
+    }
+
 
-    for(int i=0; i < methods_count; i++)
-      methods[i] = new Method(file, constant_pool);
-  }
-  /**
-   * Read major and minor version of compiler which created the file.
-   * @throws  IOException
-   * @throws  ClassFormatException
-   */
-  private final void readVersion() throws IOException, ClassFormatException
-  {
-    minor = file.readUnsignedShort();
-    major = file.readUnsignedShort();
-  }
+    /**
+     * Read information about the methods of the class.
+     * @throws  IOException
+     * @throws  ClassFormatException
+     */
+    private void readMethods() throws IOException, ClassFormatException {
+        final int methods_count = dataInputStream.readUnsignedShort();
+        methods = new Method[methods_count];
+        for (int i = 0; i < methods_count; i++) {
+            methods[i] = new Method(dataInputStream, constant_pool);
+        }
+    }
+
+
+    /**
+     * Read major and minor version of compiler which created the file.
+     * @throws  IOException
+     * @throws  ClassFormatException
+     */
+    private void readVersion() throws IOException, ClassFormatException {
+        minor = dataInputStream.readUnsignedShort();
+        major = dataInputStream.readUnsignedShort();
+    }
 }
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Code.java	Mon Aug 28 00:49:06 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Code.java	Mon Aug 28 07:53:26 2017 +0000
@@ -21,9 +21,11 @@
 
 package com.sun.org.apache.bcel.internal.classfile;
 
+import java.io.DataInput;
+import java.io.DataOutputStream;
+import java.io.IOException;
 
-import  com.sun.org.apache.bcel.internal.Constants;
-import  java.io.*;
+import com.sun.org.apache.bcel.internal.Const;
 
 /**
  * This class represents a chunk of Java byte code contained in a
@@ -37,304 +39,321 @@
  * is used for debugging purposes and <em>LocalVariableTable</em> which
  * contains information about the local variables.
  *
- * @author  <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A>
+ * @version $Id: Code.java 1749603 2016-06-21 20:50:19Z ggregory $
  * @see     Attribute
  * @see     CodeException
  * @see     LineNumberTable
  * @see LocalVariableTable
  */
 public final class Code extends Attribute {
-  private int             max_stack;   // Maximum size of stack used by this method
-  private int             max_locals;  // Number of local variables
-  private int             code_length; // Length of code in bytes
-  private byte[]          code;        // Actual byte code
-
-  private int             exception_table_length;
-  private CodeException[] exception_table;  // Table of handled exceptions
-  private int             attributes_count; // Attributes of code: LineNumber
-  private Attribute[]     attributes;       // or LocalVariable
 
-  /**
-   * Initialize from another object. Note that both objects use the same
-   * references (shallow copy). Use copy() for a physical copy.
-   */
-  public Code(Code c) {
-    this(c.getNameIndex(), c.getLength(), c.getMaxStack(), c.getMaxLocals(),
-         c.getCode(), c.getExceptionTable(), c.getAttributes(),
-         c.getConstantPool());
-  }
+    private int max_stack; // Maximum size of stack used by this method  // TODO this could be made final (setter is not used)
+    private int max_locals; // Number of local variables  // TODO this could be made final (setter is not used)
+    private byte[] code; // Actual byte code
+    private CodeException[] exception_table; // Table of handled exceptions
+    private Attribute[] attributes; // or LocalVariable
+
 
-  /**
-   * @param name_index Index pointing to the name <em>Code</em>
-   * @param length Content length in bytes
-   * @param file Input stream
-   * @param constant_pool Array of constants
-   */
-  Code(int name_index, int length, DataInputStream file,
-       ConstantPool constant_pool) throws IOException
-  {
-    // Initialize with some default values which will be overwritten later
-    this(name_index, length,
-         file.readUnsignedShort(), file.readUnsignedShort(),
-         (byte[])null, (CodeException[])null, (Attribute[])null,
-         constant_pool);
-
-    code_length = file.readInt();
-    code = new byte[code_length]; // Read byte code
-    file.readFully(code);
+    /**
+     * Initialize from another object. Note that both objects use the same
+     * references (shallow copy). Use copy() for a physical copy.
+     */
+    public Code(final Code c) {
+        this(c.getNameIndex(), c.getLength(), c.getMaxStack(), c.getMaxLocals(), c.getCode(), c
+                .getExceptionTable(), c.getAttributes(), c.getConstantPool());
+    }
 
-    /* Read exception table that contains all regions where an exception
-     * handler is active, i.e., a try { ... } catch() block.
-     */
-    exception_table_length = file.readUnsignedShort();
-    exception_table        = new CodeException[exception_table_length];
 
-    for(int i=0; i < exception_table_length; i++)
-      exception_table[i] = new CodeException(file);
-
-    /* Read all attributes, currently `LineNumberTable' and
-     * `LocalVariableTable'
-     */
-    attributes_count = file.readUnsignedShort();
-    attributes = new Attribute[attributes_count];
-    for(int i=0; i < attributes_count; i++)
-      attributes[i] = Attribute.readAttribute(file, constant_pool);
-
-    /* Adjust length, because of setAttributes in this(), s.b.  length
-     * is incorrect, because it didn't take the internal attributes
-     * into account yet! Very subtle bug, fixed in 3.1.1.
+    /**
+     * @param name_index Index pointing to the name <em>Code</em>
+     * @param length Content length in bytes
+     * @param file Input stream
+     * @param constant_pool Array of constants
      */
-    this.length = length;
-  }
-
-  /**
-   * @param name_index Index pointing to the name <em>Code</em>
-   * @param length Content length in bytes
-   * @param max_stack Maximum size of stack
-   * @param max_locals Number of local variables
-   * @param code Actual byte code
-   * @param exception_table Table of handled exceptions
-   * @param attributes Attributes of code: LineNumber or LocalVariable
-   * @param constant_pool Array of constants
-   */
-  public Code(int name_index, int length,
-              int max_stack,  int max_locals,
-              byte[]          code,
-              CodeException[] exception_table,
-              Attribute[]     attributes,
-              ConstantPool    constant_pool)
-  {
-    super(Constants.ATTR_CODE, name_index, length, constant_pool);
-
-    this.max_stack         = max_stack;
-    this.max_locals        = max_locals;
-
-    setCode(code);
-    setExceptionTable(exception_table);
-    setAttributes(attributes); // Overwrites length!
-  }
+    Code(final int name_index, final int length, final DataInput file, final ConstantPool constant_pool)
+            throws IOException {
+        // Initialize with some default values which will be overwritten later
+        this(name_index, length, file.readUnsignedShort(), file.readUnsignedShort(), (byte[]) null,
+                (CodeException[]) null, (Attribute[]) null, constant_pool);
+        final int code_length = file.readInt();
+        code = new byte[code_length]; // Read byte code
+        file.readFully(code);
+        /* Read exception table that contains all regions where an exception
+         * handler is active, i.e., a try { ... } catch() block.
+         */
+        final int exception_table_length = file.readUnsignedShort();
+        exception_table = new CodeException[exception_table_length];
+        for (int i = 0; i < exception_table_length; i++) {
+            exception_table[i] = new CodeException(file);
+        }
+        /* Read all attributes, currently `LineNumberTable' and
+         * `LocalVariableTable'
+         */
+        final int attributes_count = file.readUnsignedShort();
+        attributes = new Attribute[attributes_count];
+        for (int i = 0; i < attributes_count; i++) {
+            attributes[i] = Attribute.readAttribute(file, constant_pool);
+        }
+        /* Adjust length, because of setAttributes in this(), s.b.  length
+         * is incorrect, because it didn't take the internal attributes
+         * into account yet! Very subtle bug, fixed in 3.1.1.
+         */
+        super.setLength(length);
+    }
 
-  /**
-   * Called by objects that are traversing the nodes of the tree implicitely
-   * defined by the contents of a Java class. I.e., the hierarchy of methods,
-   * fields, attributes, etc. spawns a tree of objects.
-   *
-   * @param v Visitor object
-   */
-  public void accept(Visitor v) {
-    v.visitCode(this);
-  }
-
-  /**
-   * Dump code attribute to file stream in binary format.
-   *
-   * @param file Output file stream
-   * @throws IOException
-   */
-  public final void dump(DataOutputStream file) throws IOException
-  {
-    super.dump(file);
-
-    file.writeShort(max_stack);
-    file.writeShort(max_locals);
-    file.writeInt(code_length);
-    file.write(code, 0, code_length);
-
-    file.writeShort(exception_table_length);
-    for(int i=0; i < exception_table_length; i++)
-      exception_table[i].dump(file);
-
-    file.writeShort(attributes_count);
-    for(int i=0; i < attributes_count; i++)
-      attributes[i].dump(file);
-  }
 
-  /**
-   * @return Collection of code attributes.
-   * @see Attribute
-   */
-  public final Attribute[] getAttributes()         { return attributes; }
-
-  /**
-   * @return LineNumberTable of Code, if it has one
-   */
-  public LineNumberTable getLineNumberTable() {
-    for(int i=0; i < attributes_count; i++)
-      if(attributes[i] instanceof LineNumberTable)
-        return (LineNumberTable)attributes[i];
-
-    return null;
-  }
-
-  /**
-   * @return LocalVariableTable of Code, if it has one
-   */
-  public LocalVariableTable getLocalVariableTable() {
-    for(int i=0; i < attributes_count; i++)
-      if(attributes[i] instanceof LocalVariableTable)
-        return (LocalVariableTable)attributes[i];
-
-    return null;
-  }
+    /**
+     * @param name_index Index pointing to the name <em>Code</em>
+     * @param length Content length in bytes
+     * @param max_stack Maximum size of stack
+     * @param max_locals Number of local variables
+     * @param code Actual byte code
+     * @param exception_table Table of handled exceptions
+     * @param attributes Attributes of code: LineNumber or LocalVariable
+     * @param constant_pool Array of constants
+     */
+    public Code(final int name_index, final int length, final int max_stack, final int max_locals, final byte[] code,
+            final CodeException[] exception_table, final Attribute[] attributes, final ConstantPool constant_pool) {
+        super(Const.ATTR_CODE, name_index, length, constant_pool);
+        this.max_stack = max_stack;
+        this.max_locals = max_locals;
+        this.code = code != null ? code : new byte[0];
+        this.exception_table = exception_table != null ? exception_table : new CodeException[0];
+        this.attributes = attributes != null ? attributes : new Attribute[0];
+        super.setLength(calculateLength()); // Adjust length
+    }
 
-  /**
-   * @return Actual byte code of the method.
-   */
-  public final byte[] getCode()      { return code; }
-
-  /**
-   * @return Table of handled exceptions.
-   * @see CodeException
-   */
-  public final CodeException[] getExceptionTable() { return exception_table; }
-
-  /**
-   * @return Number of local variables.
-   */
-  public final int  getMaxLocals() { return max_locals; }
 
-  /**
-   * @return Maximum size of stack used by this method.
-   */
-
-  public final int  getMaxStack()  { return max_stack; }
+    /**
+     * Called by objects that are traversing the nodes of the tree implicitely
+     * defined by the contents of a Java class. I.e., the hierarchy of methods,
+     * fields, attributes, etc. spawns a tree of objects.
+     *
+     * @param v Visitor object
+     */
+    @Override
+    public void accept( final Visitor v ) {
+        v.visitCode(this);
+    }
 
-  /**
-   * @return the internal length of this code attribute (minus the first 6 bytes)
-   * and excluding all its attributes
-   */
-  private final int getInternalLength() {
-    return 2 /*max_stack*/ + 2 /*max_locals*/ + 4 /*code length*/
-      + code_length /*byte-code*/
-      + 2 /*exception-table length*/
-      + 8 * exception_table_length /* exception table */
-      + 2 /* attributes count */;
-  }
 
-  /**
-   * @return the full size of this code attribute, minus its first 6 bytes,
-   * including the size of all its contained attributes
-   */
-  private final int calculateLength() {
-    int len = 0;
-
-    for(int i=0; i < attributes_count; i++)
-      len += attributes[i].length + 6 /*attribute header size*/;
-
-    return len + getInternalLength();
-  }
+    /**
+     * Dump code attribute to file stream in binary format.
+     *
+     * @param file Output file stream
+     * @throws IOException
+     */
+    @Override
+    public final void dump( final DataOutputStream file ) throws IOException {
+        super.dump(file);
+        file.writeShort(max_stack);
+        file.writeShort(max_locals);
+        file.writeInt(code.length);
+        file.write(code, 0, code.length);
+        file.writeShort(exception_table.length);
+        for (final CodeException exception : exception_table) {
+            exception.dump(file);
+        }
+        file.writeShort(attributes.length);
+        for (final Attribute attribute : attributes) {
+            attribute.dump(file);
+        }
+    }
 
-  /**
-   * @param attributes.
-   */
-  public final void setAttributes(Attribute[] attributes) {
-    this.attributes  = attributes;
-    attributes_count = (attributes == null)? 0 : attributes.length;
-    length = calculateLength(); // Adjust length
-  }
-
-  /**
-   * @param code byte code
-   */
-  public final void setCode(byte[] code) {
-    this.code   = code;
-    code_length = (code == null)? 0 : code.length;
-  }
 
-  /**
-   * @param exception_table exception table
-   */
-  public final void setExceptionTable(CodeException[] exception_table) {
-    this.exception_table   = exception_table;
-    exception_table_length = (exception_table == null)? 0 :
-      exception_table.length;
-  }
+    /**
+     * @return Collection of code attributes.
+     * @see Attribute
+     */
+    public final Attribute[] getAttributes() {
+        return attributes;
+    }
 
-  /**
-   * @param max_locals maximum number of local variables
-   */
-  public final void setMaxLocals(int max_locals) {
-    this.max_locals = max_locals;
-  }
 
-  /**
-   * @param max_stack maximum stack size
-   */
-  public final void setMaxStack(int max_stack) {
-    this.max_stack = max_stack;
-  }
+    /**
+     * @return LineNumberTable of Code, if it has one
+     */
+    public LineNumberTable getLineNumberTable() {
+        for (final Attribute attribute : attributes) {
+            if (attribute instanceof LineNumberTable) {
+                return (LineNumberTable) attribute;
+            }
+        }
+        return null;
+    }
 
-  /**
-   * @return String representation of code chunk.
-   */
-  public final String toString(boolean verbose) {
-    StringBuffer buf;
 
-    buf = new StringBuffer("Code(max_stack = " + max_stack +
-                           ", max_locals = " + max_locals +
-                           ", code_length = " + code_length + ")\n" +
-                           Utility.codeToString(code, constant_pool, 0, -1, verbose));
-
-    if(exception_table_length > 0) {
-      buf.append("\nException handler(s) = \n" + "From\tTo\tHandler\tType\n");
-
-      for(int i=0; i < exception_table_length; i++)
-        buf.append(exception_table[i].toString(constant_pool, verbose) + "\n");
+    /**
+     * @return LocalVariableTable of Code, if it has one
+     */
+    public LocalVariableTable getLocalVariableTable() {
+        for (final Attribute attribute : attributes) {
+            if (attribute instanceof LocalVariableTable) {
+                return (LocalVariableTable) attribute;
+            }
+        }
+        return null;
     }
 
-    if(attributes_count > 0) {
-      buf.append("\nAttribute(s) = \n");
+
+    /**
+     * @return Actual byte code of the method.
+     */
+    public final byte[] getCode() {
+        return code;
+    }
+
+
+    /**
+     * @return Table of handled exceptions.
+     * @see CodeException
+     */
+    public final CodeException[] getExceptionTable() {
+        return exception_table;
+    }
+
+
+    /**
+     * @return Number of local variables.
+     */
+    public final int getMaxLocals() {
+        return max_locals;
+    }
+
+
+    /**
+     * @return Maximum size of stack used by this method.
+     */
+    public final int getMaxStack() {
+        return max_stack;
+    }
+
 
-      for(int i=0; i < attributes_count; i++)
-        buf.append(attributes[i].toString() + "\n");
+    /**
+     * @return the internal length of this code attribute (minus the first 6 bytes)
+     * and excluding all its attributes
+     */
+    private int getInternalLength() {
+        return 2 /*max_stack*/+ 2 /*max_locals*/+ 4 /*code length*/
+                + code.length /*byte-code*/
+                + 2 /*exception-table length*/
+                + 8 * (exception_table == null ? 0 : exception_table.length) /* exception table */
+                + 2 /* attributes count */;
+    }
+
+
+    /**
+     * @return the full size of this code attribute, minus its first 6 bytes,
+     * including the size of all its contained attributes
+     */
+    private int calculateLength() {
+        int len = 0;
+        if (attributes != null) {
+            for (final Attribute attribute : attributes) {
+                len += attribute.getLength() + 6 /*attribute header size*/;
+            }
+        }
+        return len + getInternalLength();
+    }
+
+
+    /**
+     * @param attributes the attributes to set for this Code
+     */
+    public final void setAttributes( final Attribute[] attributes ) {
+        this.attributes = attributes != null ? attributes : new Attribute[0];
+        super.setLength(calculateLength()); // Adjust length
+    }
+
+
+    /**
+     * @param code byte code
+     */
+    public final void setCode( final byte[] code ) {
+        this.code = code != null ? code : new byte[0];
+        super.setLength(calculateLength()); // Adjust length
     }
 
-    return buf.toString();
-  }
+
+    /**
+     * @param exception_table exception table
+     */
+    public final void setExceptionTable( final CodeException[] exception_table ) {
+        this.exception_table = exception_table != null ? exception_table : new CodeException[0];
+        super.setLength(calculateLength()); // Adjust length
+    }
+
 
-  /**
-   * @return String representation of code chunk.
-   */
-  public final String toString() {
-    return toString(true);
-  }
+    /**
+     * @param max_locals maximum number of local variables
+     */
+    public final void setMaxLocals( final int max_locals ) {
+        this.max_locals = max_locals;
+    }
+
+
+    /**
+     * @param max_stack maximum stack size
+     */
+    public final void setMaxStack( final int max_stack ) {
+        this.max_stack = max_stack;
+    }
+
 
-  /**
-   * @return deep copy of this attribute
-   */
-  public Attribute copy(ConstantPool constant_pool) {
-    Code c = (Code)clone();
-    c.code          = (byte[])code.clone();
-    c.constant_pool = constant_pool;
+    /**
+     * @return String representation of code chunk.
+     */
+    public final String toString( final boolean verbose ) {
+        final StringBuilder buf = new StringBuilder(100); // CHECKSTYLE IGNORE MagicNumber
+        buf.append("Code(max_stack = ").append(max_stack).append(", max_locals = ").append(
+                max_locals).append(", code_length = ").append(code.length).append(")\n").append(
+                Utility.codeToString(code, super.getConstantPool(), 0, -1, verbose));
+        if (exception_table.length > 0) {
+            buf.append("\nException handler(s) = \n").append("From\tTo\tHandler\tType\n");
+            for (final CodeException exception : exception_table) {
+                buf.append(exception.toString(super.getConstantPool(), verbose)).append("\n");
+            }
+        }
+        if (attributes.length > 0) {
+            buf.append("\nAttribute(s) = ");
+            for (final Attribute attribute : attributes) {
+                buf.append("\n").append(attribute);
+            }
+        }
+        return buf.toString();
+    }
+
 
-    c.exception_table = new CodeException[exception_table_length];
-    for(int i=0; i < exception_table_length; i++)
-      c.exception_table[i] = exception_table[i].copy();
+    /**
+     * @return String representation of code chunk.
+     */
+    @Override
+    public final String toString() {
+        return toString(true);
+    }
+
 
-    c.attributes = new Attribute[attributes_count];
-    for(int i=0; i < attributes_count; i++)
-      c.attributes[i] = attributes[i].copy(constant_pool);
-
-    return c;
-  }
+    /**
+     * @return deep copy of this attribute
+     *
+     * @param _constant_pool the constant pool to duplicate
+     */
+    @Override
+    public Attribute copy( final ConstantPool _constant_pool ) {
+        final Code c = (Code) clone();
+        if (code != null) {
+            c.code = new byte[code.length];
+            System.arraycopy(code, 0, c.code, 0, code.length);
+        }
+        c.setConstantPool(_constant_pool);
+        c.exception_table = new CodeException[exception_table.length];
+        for (int i = 0; i < exception_table.length; i++) {
+            c.exception_table[i] = exception_table[i].copy();
+        }
+        c.attributes = new Attribute[attributes.length];
+        for (int i = 0; i < attributes.length; i++) {
+            c.attributes[i] = attributes[i].copy(_constant_pool);
+        }
+        return c;
+    }
 }
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/CodeException.java	Mon Aug 28 00:49:06 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/CodeException.java	Mon Aug 28 07:53:26 2017 +0000
@@ -1,6 +1,5 @@
 /*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -21,176 +20,201 @@
 
 package com.sun.org.apache.bcel.internal.classfile;
 
+import java.io.DataInput;
+import java.io.DataOutputStream;
+import java.io.IOException;
 
-import  com.sun.org.apache.bcel.internal.Constants;
-import  java.io.*;
+import com.sun.org.apache.bcel.internal.Const;
 
 /**
  * This class represents an entry in the exception table of the <em>Code</em>
  * attribute and is used only there. It contains a range in which a
  * particular exception handler is active.
  *
- * @author  <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A>
+ * @version $Id: CodeException.java 1749603 2016-06-21 20:50:19Z ggregory $
  * @see     Code
  */
-public final class CodeException
-  implements Cloneable, Constants, Node, Serializable
-{
-  private int start_pc;   // Range in the code the exception handler is
-  private int end_pc;     // active. start_pc is inclusive, end_pc exclusive
-  private int handler_pc; /* Starting address of exception handler, i.e.,
-                           * an offset from start of code.
-                           */
-  private int catch_type; /* If this is zero the handler catches any
-                           * exception, otherwise it points to the
-                           * exception class which is to be caught.
-                           */
-  /**
-   * Initialize from another object.
-   */
-  public CodeException(CodeException c) {
-    this(c.getStartPC(), c.getEndPC(), c.getHandlerPC(), c.getCatchType());
-  }
+public final class CodeException implements Cloneable, Node {
+
+    private int start_pc; // Range in the code the exception handler is
+    private int end_pc; // active. start_pc is inclusive, end_pc exclusive
+    private int handler_pc; /* Starting address of exception handler, i.e.,
+     * an offset from start of code.
+     */
+    private int catch_type; /* If this is zero the handler catches any
+     * exception, otherwise it points to the
+     * exception class which is to be caught.
+     */
+
 
-  /**
-   * Construct object from file stream.
-   * @param file Input stream
-   * @throws IOException
-   */
-  CodeException(DataInputStream file) throws IOException
-  {
-    this(file.readUnsignedShort(), file.readUnsignedShort(),
-         file.readUnsignedShort(), file.readUnsignedShort());
-  }
+    /**
+     * Initialize from another object.
+     */
+    public CodeException(final CodeException c) {
+        this(c.getStartPC(), c.getEndPC(), c.getHandlerPC(), c.getCatchType());
+    }
+
+
+    /**
+     * Construct object from file stream.
+     * @param file Input stream
+     * @throws IOException
+     */
+    CodeException(final DataInput file) throws IOException {
+        this(file.readUnsignedShort(), file.readUnsignedShort(), file.readUnsignedShort(), file
+                .readUnsignedShort());
+    }
+
 
-  /**
-   * @param start_pc Range in the code the exception handler is active,
-   * start_pc is inclusive while
-   * @param end_pc is exclusive
-   * @param handler_pc Starting address of exception handler, i.e.,
-   * an offset from start of code.
-   * @param catch_type If zero the handler catches any
-   * exception, otherwise it points to the exception class which is
-   * to be caught.
-   */
-  public CodeException(int start_pc, int end_pc, int handler_pc,
-                       int catch_type)
-  {
-    this.start_pc   = start_pc;
-    this.end_pc     = end_pc;
-    this.handler_pc = handler_pc;
-    this.catch_type = catch_type;
-  }
+    /**
+     * @param start_pc Range in the code the exception handler is active,
+     * start_pc is inclusive while
+     * @param end_pc is exclusive
+     * @param handler_pc Starting address of exception handler, i.e.,
+     * an offset from start of code.
+     * @param catch_type If zero the handler catches any
+     * exception, otherwise it points to the exception class which is
+     * to be caught.
+     */
+    public CodeException(final int start_pc, final int end_pc, final int handler_pc, final int catch_type) {
+        this.start_pc = start_pc;
+        this.end_pc = end_pc;
+        this.handler_pc = handler_pc;
+        this.catch_type = catch_type;
+    }
+
 
-  /**
-   * Called by objects that are traversing the nodes of the tree implicitely
-   * defined by the contents of a Java class. I.e., the hierarchy of methods,
-   * fields, attributes, etc. spawns a tree of objects.
-   *
-   * @param v Visitor object
-   */
-  public void accept(Visitor v) {
-    v.visitCodeException(this);
-  }
-  /**
-   * Dump code exception to file stream in binary format.
-   *
-   * @param file Output file stream
-   * @throws IOException
-   */
-  public final void dump(DataOutputStream file) throws IOException
-  {
-    file.writeShort(start_pc);
-    file.writeShort(end_pc);
-    file.writeShort(handler_pc);
-    file.writeShort(catch_type);
-  }
+    /**
+     * Called by objects that are traversing the nodes of the tree implicitely
+     * defined by the contents of a Java class. I.e., the hierarchy of methods,
+     * fields, attributes, etc. spawns a tree of objects.
+     *
+     * @param v Visitor object
+     */
+    @Override
+    public void accept( final Visitor v ) {
+        v.visitCodeException(this);
+    }
+
 
-  /**
-   * @return 0, if the handler catches any exception, otherwise it points to
-   * the exception class which is to be caught.
-   */
-  public final int getCatchType() { return catch_type; }
+    /**
+     * Dump code exception to file stream in binary format.
+     *
+     * @param file Output file stream
+     * @throws IOException
+     */
+    public final void dump( final DataOutputStream file ) throws IOException {
+        file.writeShort(start_pc);
+        file.writeShort(end_pc);
+        file.writeShort(handler_pc);
+        file.writeShort(catch_type);
+    }
+
+
+    /**
+     * @return 0, if the handler catches any exception, otherwise it points to
+     * the exception class which is to be caught.
+     */
+    public final int getCatchType() {
+        return catch_type;
+    }
+
 
-  /**
-   * @return Exclusive end index of the region where the handler is active.
-   */
-  public final int getEndPC() { return end_pc; }
+    /**
+     * @return Exclusive end index of the region where the handler is active.
+     */
+    public final int getEndPC() {
+        return end_pc;
+    }
+
 
-  /**
-   * @return Starting address of exception handler, relative to the code.
-   */
-  public final int getHandlerPC() { return handler_pc; }
+    /**
+     * @return Starting address of exception handler, relative to the code.
+     */
+    public final int getHandlerPC() {
+        return handler_pc;
+    }
+
 
-  /**
-   * @return Inclusive start index of the region where the handler is active.
-   */
-  public final int getStartPC() { return start_pc; }
+    /**
+     * @return Inclusive start index of the region where the handler is active.
+     */
+    public final int getStartPC() {
+        return start_pc;
+    }
+
 
-  /**
-   * @param catch_type.
-   */
-  public final void setCatchType(int catch_type) {
-    this.catch_type = catch_type;
-  }
+    /**
+     * @param catch_type the type of exception that is caught
+     */
+    public final void setCatchType( final int catch_type ) {
+        this.catch_type = catch_type;
+    }
+
 
-  /**
-   * @param end_pc end of handled block
-   */
-  public final void setEndPC(int end_pc) {
-    this.end_pc = end_pc;
-  }
+    /**
+     * @param end_pc end of handled block
+     */
+    public final void setEndPC( final int end_pc ) {
+        this.end_pc = end_pc;
+    }
+
 
-  /**
-   * @param handler_pc where the actual code is
-   */
-  public final void setHandlerPC(int handler_pc) {
-    this.handler_pc = handler_pc;
-  }
+    /**
+     * @param handler_pc where the actual code is