Changes in Javadoc comments and @nonnegative annotations only.

Author: rliesenfeld

main/src/mockit/asm/util/BytecodeReader.java

@@ -19,9 +19,9 @@ public class BytecodeReader
    @Nonnull public final int[] items;
 
    /**
-    * The String objects corresponding to the CONSTANT_Utf8 items. This cache avoids multiple parsing of a given CONSTANT_Utf8 constant pool
-    * item, which GREATLY improves performances (by a factor 2 to 3). This caching strategy could be extended to all constant pool items,
-    * but its benefit would not be so great for these items (because they are much less expensive to parse than CONSTANT_Utf8 items).
+    * The String objects corresponding to the CONSTANT_Utf8 items. This cache avoids multiple parsing of a given CONSTANT_Utf8 constant pool item,
+    * which GREATLY improves performances (by a factor 2 to 3). This caching strategy could be extended to all constant pool items, but its benefit
+    * would not be so great for these items (because they are much less expensive to parse than CONSTANT_Utf8 items).
     */
    @Nonnull private final String[] strings;
 
@@ -91,16 +91,17 @@ protected BytecodeReader(@Nonnull BytecodeReader another) {
    /**
     * Reads an unsigned <tt>byte</tt> value in {@link #code}, incrementing {@link #codeIndex} by 1.
     */
+   @Nonnegative
    public final int readUnsignedByte() {
       return code[codeIndex++] & 0xFF;
    }
 
    /**
     * Reads an unsigned byte value in {@link #code}.
     *
-    * @param u1CodeIndex the start index of the value to be read in {@link #code}.
-    * @return the read value.
+    * @param u1CodeIndex the start index of the value to be read in {@link #code}
     */
+   @Nonnegative
    protected final int readUnsignedByte(@Nonnegative int u1CodeIndex) {
       return code[u1CodeIndex] & 0xFF;
    }
@@ -136,13 +137,14 @@ public final int readUnsignedShort() {
    /**
     * Reads an unsigned short value in {@link #code}.
     *
-    * @param u2CodeIndex the start index of the value to be read in {@link #code}.
-    * @return the read value.
+    * @param u2CodeIndex the start index of the value to be read in {@link #code}
     */
    @Nonnegative
    protected final int readUnsignedShort(@Nonnegative int u2CodeIndex) {
       byte[] b = code;
-      return ((b[u2CodeIndex] & 0xFF) << 8) | (b[u2CodeIndex + 1] & 0xFF);
+      int byte0 = (b[u2CodeIndex] & 0xFF) << 8;
+      int byte1 =  b[u2CodeIndex + 1] & 0xFF;
+      return byte0 | byte1;
    }
 
    /**
@@ -156,8 +158,7 @@ protected final short readShort() {
    /**
     * Reads a signed short value in {@link #code}.
     *
-    * @param u2CodeIndex the start index of the value to be read in {@link #code}.
-    * @return the read value.
+    * @param u2CodeIndex the start index of the value to be read in {@link #code}
     */
    protected final short readShort(@Nonnegative int u2CodeIndex) {
       //noinspection NumericCastThatLosesPrecision
@@ -181,8 +182,7 @@ public final int readInt() {
    /**
     * Reads a signed int value in {@link #code}.
     *
-    * @param s4CodeIndex the start index of the value to be read in {@link #code}.
-    * @return the read value.
+    * @param s4CodeIndex the start index of the value to be read in {@link #code}
     */
    protected final int readInt(@Nonnegative int s4CodeIndex) {
       byte[] b = code;
@@ -203,8 +203,7 @@ public final long readLong() {
    /**
     * Reads a signed long value in {@link #code}.
     *
-    * @param s8CodeIndex the start index of the value to be read in {@link #code}.
-    * @return the read value.
+    * @param s8CodeIndex the start index of the value to be read in {@link #code}
     */
    protected final long readLong(@Nonnegative int s8CodeIndex) {
       long l1 = readInt(s8CodeIndex);
@@ -235,8 +234,7 @@ protected final float readFloat(@Nonnegative int s4CodeIndex) {
    /**
     * Reads an UTF8 string in {@link #code}.
     *
-    * @param itemIndex index in {@link #items} for the UTF8 string to be read.
-    * @return the String corresponding to the specified UTF8 string.
+    * @param itemIndex index in {@link #items} for the UTF8 string to be read
     */
    @Nonnull @SuppressWarnings("CharUsedInArithmeticContext")
    private String readUTF(@Nonnegative int itemIndex) {
@@ -282,7 +280,7 @@ else if (st == 1) { // byte 2 of 2-byte char or byte 3 of 3-byte char
    /**
     * Reads an UTF8 string constant pool item in {@link #code}, incrementing {@link #codeIndex} by 2.
     *
-    * @return the String corresponding to the UTF8 item, or <tt>null</tt> if {@link #codeIndex} points to an item whose value is zero.
+    * @return the String corresponding to the UTF8 item, or <tt>null</tt> if {@link #codeIndex} points to an item whose value is zero
     */
    @Nullable
    protected final String readUTF8() {
@@ -298,8 +296,8 @@ protected final String readUTF8() {
    /**
     * Reads an UTF8 string constant pool item in {@link #code}.
     *
-    * @param u2CodeIndex the index of an unsigned short value in {@link #code}, whose value is the index of an UTF8 constant pool item.
-    * @return the String corresponding to the UTF8 item, or <tt>null</tt> if index is zero or points to an item whose value is zero.
+    * @param u2CodeIndex the index of an unsigned short value in {@link #code}, whose value is the index of an UTF8 constant pool item
+    * @return the String corresponding to the UTF8 item, or <tt>null</tt> if index is zero or points to an item whose value is zero
     */
    @Nullable
    protected final String readUTF8(@Nonnegative int u2CodeIndex) {
@@ -375,9 +373,9 @@ protected final Object readConstItem(@Nonnegative int u2CodeIndex) {
    /**
     * Reads a numeric or string constant pool item in {@link #code}.
     *
-    * @param itemIndex the index of a constant pool item.
+    * @param itemIndex the index of a constant pool item
     * @return the {@link Integer}, {@link Float}, {@link Long}, {@link Double}, {@link String}, {@link JavaType} or {@link MethodHandle}
-    * corresponding to the given constant pool item.
+    * corresponding to the given constant pool item
     */
    @Nonnull
    protected final Object readConst(@Nonnegative int itemIndex) {
@@ -471,4 +469,4 @@ public final int readItem(@Nonnegative int u2CodeIndex) {
       int itemIndex = readUnsignedShort(u2CodeIndex);
       return items[itemIndex];
    }
-}
+}