TRegex: fix possible duplicate entries in CounterTrackerList

Author: djoooooe

regex/src/com.oracle.truffle.regex.test/src/com/oracle/truffle/regex/tregex/test/OracleDBTests.java

@@ -1615,6 +1615,7 @@ public void generatedTests() {
                         "axaxeageagageaxeaxeaxageaxagageaxeaxagageagaxaxeagaxeaxagagaxeagageaxeaxeagageaxeaxagaxaxaxageageagageagaxaxaxageaxageaxeageaxaxaxaxaxagaxagageaxeageageageaxeaxeaxageaxaxeaxeagaxagageaxeageaxeaxaxeaxageaxaxeagaxageageaz",
                         0, false);
         test("((b\\2{1400,1400})+|)*a", "", "a", 0, true, 0, 1, 0, 0, -1, -1);
+        test("\\S(\\w?\\W){8,9}\\Z", "", "-a---------  ---------", 0, true, 13, 22, 21, 22);
         test("(a{1100,1100})\\1", "i", "a".repeat(2400), 0, true, 0, 2200, 0, 1100);
         test("[a]\\S{213,213}bcdz", "", "a".repeat(215) + ("bcxd" + "a".repeat(213)).repeat(3), 0, false);
 

regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/nodes/dfa/CounterTrackerList.java

@@ -262,14 +262,6 @@ private void swap(int from, int to, long[] fixedData) {
         }
     }
 
-    private void ensureCanAlloc1(int sId, long[] fixedData, int[][] intArrays) {
-        int bufferPointer = getBufferPointer(sId, fixedData);
-        int[] buf = intArrays[bufferPointer];
-        if (getStart(sId, fixedData) + getSize(sId, fixedData) == buf.length) {
-            intArrays[bufferPointer] = Arrays.copyOf(buf, buf.length << 1);
-        }
-    }
-
     private void incAll(int sId, long[] fixedData, int[][] intArrays) {
         int[] buffer = getBuffer(sId, fixedData, intArrays);
         int offset = getOffset(sId, fixedData) + 1;
@@ -306,11 +298,20 @@ private void removeMaxValue(int sId, long[] fixedData, int[] buffer, int start,
     }
 
     private void set1(int sId, long[] fixedData, int[][] intArrays) {
-        ensureCanAlloc1(sId, fixedData, intArrays);
-        int[] buf = getBuffer(sId, fixedData, intArrays);
+        int bufferPointer = getBufferPointer(sId, fixedData);
+        int[] buf = intArrays[bufferPointer];
+        int start = getStart(sId, fixedData);
         int size = getSize(sId, fixedData);
-        buf[getStart(sId, fixedData) + size] = getOffset(sId, fixedData) - 1;
-        setSize(sId, fixedData, size + 1);
+        int offset = getOffset(sId, fixedData);
+        int insert1Value = offset - 1;
+        if (size == 0 || buf[start + size - 1] != insert1Value) {
+            if (start + size == buf.length) {
+                buf = Arrays.copyOf(buf, buf.length << 1);
+                intArrays[bufferPointer] = buf;
+            }
+            buf[start + size] = insert1Value;
+            setSize(sId, fixedData, size + 1);
+        }
     }
 
     @TruffleBoundary

regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/nodes/dfa/CounterTrackerLong.java

@@ -158,7 +158,7 @@ private boolean intersect(int sId, long[] fixedData, long mask) {
 
     @Override
     public String dumpState(int sId, long[] fixedData, int[][] intArrays) {
-        long[] bs = {fixedData[mapId(sId)]};
+        long[] bs = {fixedData[mapId(sId)] & BitSets.getRange(0, max - 1)};
         int[] values = new int[BitSets.size(bs)];
         PrimitiveIterator.OfInt it = BitSets.iterator(bs);
         for (int i = values.length - 1; i >= 0; i--) {