Fix #3570 by resetting expandTableThreshold and

maxRunBeforeFallback after resizing the hashTable.

Fixes #3571

[]

RELNOTES=Fixed a bug in `ImmutableSet.Builder` that could lead to infinite loops when building multiple sets from the same builder.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=264648412

android/guava-tests/test/com/google/common/collect/ImmutableSetTest.java

@@ -366,4 +366,12 @@ public void testReusedBuilder() {
     builder.add("baz");
     assertTrue(set.elements != builder.contents);
   }
+
+  public void testReuseBuilderReducingHashTableSizeWithPowerOfTwoTotalElements() {
+    ImmutableSet.Builder<Object> builder = ImmutableSet.builderWithExpectedSize(6);
+    builder.add(0);
+    ImmutableSet<Object> unused = builder.build();
+    ImmutableSet<Object> subject = builder.add(1).add(2).add(3).build();
+    assertFalse(subject.contains(4));
+  }
 }

guava-gwt/test/com/google/common/collect/ImmutableSetTest_gwt.java

@@ -233,6 +233,11 @@ public void testEquals_sameType() throws Exception {
   testCase.testEquals_sameType();
 }
 
+public void testReuseBuilderReducingHashTableSizeWithPowerOfTwoTotalElements() throws Exception {
+  com.google.common.collect.ImmutableSetTest testCase = new com.google.common.collect.ImmutableSetTest();
+  testCase.testReuseBuilderReducingHashTableSizeWithPowerOfTwoTotalElements();
+}
+
 public void testReuseBuilderWithDuplicateElements() throws Exception {
   com.google.common.collect.ImmutableSetTest testCase = new com.google.common.collect.ImmutableSetTest();
   testCase.testReuseBuilderWithDuplicateElements();

guava-tests/test/com/google/common/collect/ImmutableSetTest.java

@@ -582,4 +582,12 @@ private static long worstCaseQueryOperations(Set<?> set, CallsCounter counter) {
     }
     return worstCalls;
   }
+
+  public void testReuseBuilderReducingHashTableSizeWithPowerOfTwoTotalElements() {
+    ImmutableSet.Builder<Object> builder = ImmutableSet.builderWithExpectedSize(6);
+    builder.add(0);
+    ImmutableSet<Object> unused = builder.build();
+    ImmutableSet<Object> subject = builder.add(1).add(2).add(3).build();
+    assertFalse(subject.contains(4));
+  }
 }

guava/src/com/google/common/collect/ImmutableSet.java

@@ -813,6 +813,8 @@ SetBuilderImpl<E> review() {
       int targetTableSize = chooseTableSize(distinct);
       if (targetTableSize * 2 < hashTable.length) {
         hashTable = rebuildHashTable(targetTableSize, dedupedElements, distinct);
+        maxRunBeforeFallback = maxRunBeforeFallback(targetTableSize);
+        expandTableThreshold = (int) (DESIRED_LOAD_FACTOR * targetTableSize);
       }
       return hashFloodingDetected(hashTable) ? new JdkBackedSetBuilderImpl<E>(this) : this;
     }