Use LinkedHash(Map|Set) to guarantee deterministic iteration order

instrumentation

PiperOrigin-RevId: 624959325

Author: brad4d

src/com/google/javascript/jscomp/instrumentation/FileInstrumentationData.java

@@ -22,13 +22,12 @@
 import com.google.common.primitives.UnsignedBytes;
 import com.google.javascript.rhino.Node;
 import java.util.BitSet;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 /**
- * Holds instrumentation details related to a file, namely, the filename,
- * the array name used in instrumentation, and the lines which were
- * instrumented (in encoded form).
+ * Holds instrumentation details related to a file, namely, the filename, the array name used in
+ * instrumentation, and the lines which were instrumented (in encoded form).
  */
 @GwtIncompatible("com.google.common.primitives.UnsignedBytes")
 class FileInstrumentationData {
@@ -67,8 +66,7 @@ public int hashCode() {
     public boolean equals(Object object) {
       if (object instanceof BranchIndexPair) {
         BranchIndexPair that = (BranchIndexPair) object;
-        return this.getLine() == that.getLine()
-            && this.getBranch() == that.getBranch();
+        return this.getLine() == that.getLine() && this.getBranch() == that.getBranch();
       }
       return false;
     }
@@ -94,11 +92,11 @@ public boolean equals(Object object) {
     instrumentedBits = new BitSet();
 
     branchPresent = new BitSet();
-    branchesInLine = new HashMap<>();
-    branchNodes = new HashMap<>();
+    branchesInLine = new LinkedHashMap<>();
+    branchNodes = new LinkedHashMap<>();
   }
 
-   String getArrayName() {
+  String getArrayName() {
     return arrayName;
   }
 
@@ -116,6 +114,7 @@ int maxBranchPresentLine() {
 
   /**
    * Store a node to be instrumented later for branch coverage.
+   *
    * @param lineNumber 1-based line number
    * @param branchNumber 1-based branch number
    * @param block the node of the conditional block.
@@ -131,6 +130,7 @@ void putBranchNode(int lineNumber, int branchNumber, Node block) {
 
   /**
    * Get the block node to be instrumented for branch coverage.
+   *
    * @param lineNumber 1-based line number
    * @param branchNumber 1-based branch number
    * @return the node of the conditional block.
@@ -145,10 +145,9 @@ Node getBranchNode(int lineNumber, int branchNumber) {
   }
 
   /**
-   * Returns a byte-wise hex string representation of the BitField from
-   * MSB (Most Significant Byte) to LSB (Least Significant Byte).
-   * Eg. Single byte: a setting of "0001 1111", returns "1f"
-   * Eg. Multiple bytes: a setting of "0000 0010 0001 1111", returns "1f02"
+   * Returns a byte-wise hex string representation of the BitField from MSB (Most Significant Byte)
+   * to LSB (Least Significant Byte). Eg. Single byte: a setting of "0001 1111", returns "1f" Eg.
+   * Multiple bytes: a setting of "0000 0010 0001 1111", returns "1f02"
    *
    * @return string representation of bits set
    */
@@ -181,8 +180,8 @@ String getBranchPresentAsHexString() {
   }
 
   /**
-   * Mark given 1-based line number as instrumented. Zero, Negative numbers
-   * are not allowed.
+   * Mark given 1-based line number as instrumented. Zero, Negative numbers are not allowed.
+   *
    * @param lineNumber the line number which was instrumented
    */
   void setLineAsInstrumented(int lineNumber) {
@@ -195,6 +194,7 @@ void setLineAsInstrumented(int lineNumber) {
 
   /**
    * Mark a given 1-based line number has branch presented.
+   *
    * @param lineNumber the line number which has conditional branches.
    */
   void setBranchPresent(int lineNumber) {
@@ -207,6 +207,7 @@ void setBranchPresent(int lineNumber) {
 
   /**
    * Add a number of branches to a line.
+   *
    * @param lineNumber the line number that contains the branch statement.
    * @param numberOfBranches the number of branches to add to the record.
    */
@@ -222,6 +223,7 @@ void addBranches(int lineNumber, int numberOfBranches) {
 
   /**
    * Get the number of branches on a line
+   *
    * @param lineNumber - the 1-based line number
    * @return the number of branches on the line.
    */
@@ -233,5 +235,4 @@ int getNumBranches(int lineNumber) {
       return numBranches;
     }
   }
-
 }

src/com/google/javascript/jscomp/instrumentation/ProductionCoverageInstrumentationCallback.java

@@ -33,7 +33,6 @@
 import java.io.IOException;
 import java.util.ArrayDeque;
 import java.util.Deque;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -286,7 +285,7 @@ private static final class ParameterMapping {
     ParameterMapping() {
       nextUniqueIdentifier = 0;
 
-      paramValueEncodings = new HashMap<>();
+      paramValueEncodings = new LinkedHashMap<>();
 
       // A LinkedHashMap is used so that when keys are printed, keySet() will obtain them in the
       // insertion order which corroborates to the index. This helps to avoid the need of sorting