diff options
author | Kurt Alfred Kluever <kak@google.com> | 2022-06-15 11:51:26 -0700 |
---|---|---|
committer | Javac Team <javac-team+copybara@google.com> | 2022-06-15 11:52:16 -0700 |
commit | f6fa271dac7402cb5e59bc9e2c48ca252254d6fe (patch) | |
tree | c432618013464e3c66ae94f20cab37b20e0f4970 | |
parent | f42d03f5b18a61a3cdaf2f903e54618771c8797a (diff) | |
download | turbine-f6fa271dac7402cb5e59bc9e2c48ca252254d6fe.tar.gz |
Automatic code cleanup.
PiperOrigin-RevId: 455184757
-rw-r--r-- | java/com/google/turbine/bytecode/ByteReader.java | 2 | ||||
-rw-r--r-- | java/com/google/turbine/bytecode/ClassReader.java | 20 | ||||
-rw-r--r-- | javatests/com/google/turbine/lower/LowerTest.java | 2 |
3 files changed, 11 insertions, 13 deletions
diff --git a/java/com/google/turbine/bytecode/ByteReader.java b/java/com/google/turbine/bytecode/ByteReader.java index a9deff2..5458b49 100644 --- a/java/com/google/turbine/bytecode/ByteReader.java +++ b/java/com/google/turbine/bytecode/ByteReader.java @@ -20,11 +20,9 @@ import static com.google.common.base.Verify.verify; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteStreams; -import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.io.ByteArrayInputStream; /** A {@link ByteArrayDataInput} wrapper that tracks the current byte array index. */ -@CanIgnoreReturnValue public class ByteReader { private final byte[] bytes; diff --git a/java/com/google/turbine/bytecode/ClassReader.java b/java/com/google/turbine/bytecode/ClassReader.java index 740026a..da35196 100644 --- a/java/com/google/turbine/bytecode/ClassReader.java +++ b/java/com/google/turbine/bytecode/ClassReader.java @@ -159,7 +159,7 @@ public class ClassReader { /** Reads a JVMS 4.7.9 Signature attribute. */ private String readSignature(ConstantPoolReader constantPool) { String signature; - reader.u4(); // length + int unusedLength = reader.u4(); signature = constantPool.utf8(reader.u2()); return signature; } @@ -167,7 +167,7 @@ public class ClassReader { /** Reads JVMS 4.7.6 InnerClasses attributes. */ private List<ClassFile.InnerClass> readInnerClasses( ConstantPoolReader constantPool, String thisClass) { - reader.u4(); // length + int unusedLength = reader.u4(); int numberOfClasses = reader.u2(); List<ClassFile.InnerClass> innerclasses = new ArrayList<>(); for (int i = 0; i < numberOfClasses; i++) { @@ -197,7 +197,7 @@ public class ClassReader { private void readAnnotations( ImmutableList.Builder<ClassFile.AnnotationInfo> annotations, ConstantPoolReader constantPool) { - reader.u4(); // length + int unusedLength = reader.u4(); int numAnnotations = reader.u2(); for (int n = 0; n < numAnnotations; n++) { annotations.add(readAnnotation(constantPool)); @@ -207,7 +207,7 @@ public class ClassReader { /** Processes a JVMS 4.7.18 RuntimeVisibleParameterAnnotations attribute */ public void readParameterAnnotations( List<ImmutableList.Builder<AnnotationInfo>> annotations, ConstantPoolReader constantPool) { - reader.u4(); // length + int unusedLength = reader.u4(); int numParameters = reader.u1(); while (annotations.size() < numParameters) { annotations.add(ImmutableList.builder()); @@ -223,7 +223,7 @@ public class ClassReader { /** Processes a JVMS 4.7.24 MethodParameters attribute. */ private void readMethodParameters( ImmutableList.Builder<ParameterInfo> parameters, ConstantPoolReader constantPool) { - reader.u4(); // length + int unusedLength = reader.u4(); int numParameters = reader.u1(); for (int i = 0; i < numParameters; i++) { String name = constantPool.utf8(reader.u2()); @@ -239,7 +239,7 @@ public class ClassReader { /** Processes a JVMS 4.7.25 Module attribute. */ private ModuleInfo readModule(ConstantPoolReader constantPool) { - reader.u4(); // length + int unusedLength = reader.u4(); String name = constantPool.moduleInfo(reader.u2()); int flags = reader.u2(); int versionIndex = reader.u2(); @@ -423,7 +423,7 @@ public class ClassReader { signature = readSignature(constantPool); break; case "AnnotationDefault": - reader.u4(); // length + int unusedLength = reader.u4(); defaultValue = readElementValue(constantPool); break; case "RuntimeInvisibleAnnotations": @@ -470,7 +470,7 @@ public class ClassReader { /** Reads an Exceptions attribute. */ private ImmutableList<String> readExceptions(ConstantPoolReader constantPool) { ImmutableList.Builder<String> exceptions = ImmutableList.builder(); - reader.u4(); // length + int unusedLength = reader.u4(); int numberOfExceptions = reader.u2(); for (int exceptionIndex = 0; exceptionIndex < numberOfExceptions; exceptionIndex++) { exceptions.add(constantPool.classInfo(reader.u2())); @@ -496,7 +496,7 @@ public class ClassReader { String attributeName = constantPool.utf8(reader.u2()); switch (attributeName) { case "ConstantValue": - reader.u4(); // length + int unusedLength = reader.u4(); value = constantPool.constant(reader.u2()); break; case "RuntimeInvisibleAnnotations": @@ -525,7 +525,7 @@ public class ClassReader { } private String readTurbineTransitiveJar(ConstantPoolReader constantPool) { - reader.u4(); // length + int unusedLength = reader.u4(); return constantPool.utf8(reader.u2()); } } diff --git a/javatests/com/google/turbine/lower/LowerTest.java b/javatests/com/google/turbine/lower/LowerTest.java index 6d3a6df..a6410db 100644 --- a/javatests/com/google/turbine/lower/LowerTest.java +++ b/javatests/com/google/turbine/lower/LowerTest.java @@ -312,7 +312,7 @@ public class LowerTest { String attributeName = pool.utf8(reader.u2()); switch (attributeName) { case "Signature": - reader.u4(); // length + int unusedLength = reader.u4(); signature = pool.utf8(reader.u2()); break; default: |