Merge "Fix javadoc issues"

src/main/java/com/android/tools/r8/graph/IndexedDexItem.java

diff --git a/src/main/java/com/android/tools/r8/graph/IndexedDexItem.java b/src/main/java/com/android/tools/r8/graph/IndexedDexItem.java
index 6c7f3b3..d3d36e5 100644
--- a/src/main/java/com/android/tools/r8/graph/IndexedDexItem.java
+++ b/src/main/java/com/android/tools/r8/graph/IndexedDexItem.java
@@ -30,7 +30,7 @@
    * as many entries in the index as there are files (we only expand when we need to). If we lookup
    * the value of an entry that is out of bounds it is equivalent to {@link #UNASSOCIATED_VALUE}
    *
-   * <p>This field is initialized on first write in {@link #updateVirtualFileData(int, int)}}. It
+   * <p>This field is initialized on first write in {@link #updateVirtualFileData(int)}}. It
    * is assumed that multiple files are processed concurrently and thus the allocation of the
    * array is synchronized. However, for any a given file id, sequential access is assumed.
    */
@@ -106,7 +106,7 @@
    * Assigns an actual index for this item in the given file.
    *
    * <p>May only be used after this item has been assigned to the file using {@link
-   * #assignToVirtualFile(int, int)}.
+   * #assignToVirtualFile(int)}.
    */
   public void assignVirtualFileIndex(int virtualFileId, int index) {
     assert virtualFileIndexes != null;

src/main/java/com/android/tools/r8/ir/code/BasicBlock.java

diff --git a/src/main/java/com/android/tools/r8/ir/code/BasicBlock.java b/src/main/java/com/android/tools/r8/ir/code/BasicBlock.java
index 9830dcd..290a1a2 100644
--- a/src/main/java/com/android/tools/r8/ir/code/BasicBlock.java
+++ b/src/main/java/com/android/tools/r8/ir/code/BasicBlock.java
@@ -1171,7 +1171,7 @@
    * this method should only be called from either {@link #moveCatchHandlers} or
    * {@link #copyCatchHandlers} which know how to handle phis.
    *
-   * @returns the catch successors that are reused in both blocks after appending.
+   * @return the catch successors that are reused in both blocks after appending.
    */
   private List<BasicBlock> appendCatchHandlers(BasicBlock fromBlock) {
     assert fromBlock.hasCatchHandlers();

src/main/java/com/android/tools/r8/ir/code/InstructionListIterator.java

diff --git a/src/main/java/com/android/tools/r8/ir/code/InstructionListIterator.java b/src/main/java/com/android/tools/r8/ir/code/InstructionListIterator.java
index ac4781d..bb88b64 100644
--- a/src/main/java/com/android/tools/r8/ir/code/InstructionListIterator.java
+++ b/src/main/java/com/android/tools/r8/ir/code/InstructionListIterator.java
@@ -45,7 +45,7 @@
   /**
    * Continue to call {@link #next} while {@code predicate} tests {@code false}.
    *
-   * @returns the instruction that matched the predicate or {@code null} if all instructions fails
+   * @return the instruction that matched the predicate or {@code null} if all instructions fails
    * the predicate test
    */
   default Instruction nextUntil(Predicate<Instruction> predicate) {
@@ -168,7 +168,7 @@
       List<BasicBlock> blocksToRemove, DexType downcast);
 
   /**
-   * See {@link #inlineInvoke(IRCode, IRCode, ListIterator<BasicBlock>, List<BasicBlock>, DexType)}.
+   * See {@link #inlineInvoke(IRCode, IRCode, ListIterator, List, DexType)}.
    */
   default BasicBlock inlineInvoke(IRCode code, IRCode inlinee) {
     List<BasicBlock> blocksToRemove = new ArrayList<>();