src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ANEWARRAY.java

*** 19,81 ****
   * limitations under the License.
   */
  
  package com.sun.org.apache.bcel.internal.generic;
  
! import com.sun.org.apache.bcel.internal.ExceptionConstants;
  
  /**
   * ANEWARRAY -  Create new array of references
   * <PRE>Stack: ..., count -&gt; ..., arrayref</PRE>
   *
!  * @author  <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A>
   */
! public class ANEWARRAY extends CPInstruction
!   implements LoadClass, AllocationInstruction, ExceptionThrower, StackProducer {
    /**
     * Empty constructor needed for the Class.newInstance() statement in
     * Instruction.readInstruction(). Not to be used otherwise.
     */
!   ANEWARRAY() {}
  
!   public ANEWARRAY(int index) {
!     super(com.sun.org.apache.bcel.internal.Constants.ANEWARRAY, index);
    }
  
-   public Class[] getExceptions(){
-     Class[] cs = new Class[1 + ExceptionConstants.EXCS_CLASS_AND_INTERFACE_RESOLUTION.length];
  
!     System.arraycopy(ExceptionConstants.EXCS_CLASS_AND_INTERFACE_RESOLUTION, 0,
!                      cs, 0, ExceptionConstants.EXCS_CLASS_AND_INTERFACE_RESOLUTION.length);
!     cs[ExceptionConstants.EXCS_CLASS_AND_INTERFACE_RESOLUTION.length] =
!       ExceptionConstants.NEGATIVE_ARRAY_SIZE_EXCEPTION;
!     return cs;
    }
  
    /**
     * Call corresponding visitor method(s). The order is:
     * Call visitor methods of implemented interfaces first, then
     * call methods according to the class hierarchy in descending order,
     * i.e., the most specific visitXXX() call comes last.
     *
     * @param v Visitor object
     */
!   public void accept(Visitor v) {
      v.visitLoadClass(this);
      v.visitAllocationInstruction(this);
      v.visitExceptionThrower(this);
      v.visitStackProducer(this);
      v.visitTypedInstruction(this);
      v.visitCPInstruction(this);
      v.visitANEWARRAY(this);
    }
  
-   public ObjectType getLoadClassType(ConstantPoolGen cpg) {
-     Type t = getType(cpg);
  
!     if (t instanceof ArrayType){
        t = ((ArrayType) t).getBasicType();
      }
! 
!     return (t instanceof ObjectType)? (ObjectType) t : null;
    }
  }
--- 19,83 ----
   * limitations under the License.
   */
  
  package com.sun.org.apache.bcel.internal.generic;
  
! import com.sun.org.apache.bcel.internal.ExceptionConst;
  
  /**
   * ANEWARRAY -  Create new array of references
   * <PRE>Stack: ..., count -&gt; ..., arrayref</PRE>
   *
!  * @version $Id: ANEWARRAY.java 1747278 2016-06-07 17:28:43Z britter $
   */
! public class ANEWARRAY extends CPInstruction implements LoadClass, AllocationInstruction,
!         ExceptionThrower, StackConsumer, StackProducer {
! 
      /**
       * Empty constructor needed for the Class.newInstance() statement in
       * Instruction.readInstruction(). Not to be used otherwise.
       */
!     ANEWARRAY() {
!     }
  
! 
!     public ANEWARRAY(final int index) {
!         super(com.sun.org.apache.bcel.internal.Const.ANEWARRAY, index);
      }
  
  
!     @Override
!     public Class<?>[] getExceptions() {
!         return ExceptionConst.createExceptions(ExceptionConst.EXCS.EXCS_CLASS_AND_INTERFACE_RESOLUTION,
!             ExceptionConst.NEGATIVE_ARRAY_SIZE_EXCEPTION);
      }
  
+ 
      /**
       * Call corresponding visitor method(s). The order is:
       * Call visitor methods of implemented interfaces first, then
       * call methods according to the class hierarchy in descending order,
       * i.e., the most specific visitXXX() call comes last.
       *
       * @param v Visitor object
       */
!     @Override
!     public void accept( final Visitor v ) {
          v.visitLoadClass(this);
          v.visitAllocationInstruction(this);
          v.visitExceptionThrower(this);
          v.visitStackProducer(this);
          v.visitTypedInstruction(this);
          v.visitCPInstruction(this);
          v.visitANEWARRAY(this);
      }
  
  
!     @Override
!     public ObjectType getLoadClassType( final ConstantPoolGen cpg ) {
!         Type t = getType(cpg);
!         if (t instanceof ArrayType) {
              t = ((ArrayType) t).getBasicType();
          }
!         return (t instanceof ObjectType) ? (ObjectType) t : null;
      }
  }