Fix increment on nullable

test/codegen/expect/dart/_internal.js

 var _internal;
 (function(exports) {
   'use strict';
   let POWERS_OF_TEN = /* Unimplemented const */new List.from([1.0, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, 10000000.0, 100000000.0, 1000000000.0, 10000000000.0, 100000000000.0, 1000000000000.0, 10000000000000.0, 100000000000000.0, 1000000000000000.0, 10000000000000000.0, 100000000000000000.0, 1000000000000000000.0, 10000000000000000000.0, 100000000000000000000.0, 1e+21, 1e+22]);
   class EfficientLength extends dart.Object {
   }
   let ListIterable$ = dart.generic(function(E) {
     class ListIterable extends collection.IterableBase$(E) {
       ListIterable() {
         super.IterableBase();
       }
       get iterator() {
         return new ListIterator(this);
       }
       forEach(action) {
         let length = this.length;
-        for (let i = 0; dart.notNull(i) < dart.notNull(length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
           action(this.elementAt(i));
           if (length !== this.length) {
             throw new core.ConcurrentModificationError(this);
           }
         }
       }
       get isEmpty() {
         return this.length === 0;
       }
       get first() {
         if (this.length === 0)
           throw IterableElementError.noElement();
         return this.elementAt(0);
       }
       get last() {
         if (this.length === 0)
           throw IterableElementError.noElement();
         return this.elementAt(dart.notNull(this.length) - 1);
       }
       get single() {
         if (this.length === 0)
           throw IterableElementError.noElement();
         if (dart.notNull(this.length) > 1)
           throw IterableElementError.tooMany();
         return this.elementAt(0);
       }
       contains(element) {
         let length = this.length;
-        for (let i = 0; dart.notNull(i) < dart.notNull(length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
           if (dart.equals(this.elementAt(i), element))
             return true;
           if (length !== this.length) {
             throw new core.ConcurrentModificationError(this);
           }
         }
         return false;
       }
       every(test) {
         let length = this.length;
-        for (let i = 0; dart.notNull(i) < dart.notNull(length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
           if (!dart.notNull(test(this.elementAt(i))))
             return false;
           if (length !== this.length) {
             throw new core.ConcurrentModificationError(this);
           }
         }
         return true;
       }
       any(test) {
         let length = this.length;
-        for (let i = 0; dart.notNull(i) < dart.notNull(length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
           if (test(this.elementAt(i)))
             return true;
           if (length !== this.length) {
             throw new core.ConcurrentModificationError(this);
           }
         }
         return false;
       }
       firstWhere(test, opt$) {
         let orElse = opt$.orElse === void 0 ? null : opt$.orElse;
         let length = this.length;
-        for (let i = 0; dart.notNull(i) < dart.notNull(length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
           let element = this.elementAt(i);
           if (test(element))
             return element;
           if (length !== this.length) {
             throw new core.ConcurrentModificationError(this);
           }
         }
         if (orElse !== null)
           return orElse();
         throw IterableElementError.noElement();
       }
       lastWhere(test, opt$) {
         let orElse = opt$.orElse === void 0 ? null : opt$.orElse;
         let length = this.length;
-        for (let i = dart.notNull(length) - 1; dart.notNull(i) >= 0; dart.notNull(i)--) {
+        for (let i = dart.notNull(length) - 1; dart.notNull(i) >= 0; i = dart.notNull(i) - 1) {
           let element = this.elementAt(i);
           if (test(element))
             return element;
           if (length !== this.length) {
             throw new core.ConcurrentModificationError(this);
           }
         }
         if (orElse !== null)
           return orElse();
         throw IterableElementError.noElement();
       }
       singleWhere(test) {
         let length = this.length;
         let match = null;
         let matchFound = false;
-        for (let i = 0; dart.notNull(i) < dart.notNull(length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
           let element = this.elementAt(i);
           if (test(element)) {
             if (matchFound) {
               throw IterableElementError.tooMany();
             }
             matchFound = true;
             match = element;
           }
           if (length !== this.length) {
             throw new core.ConcurrentModificationError(this);
           }
         }
         if (matchFound)
           return match;
         throw IterableElementError.noElement();
       }
       join(separator) {
         if (separator === void 0)
           separator = "";
         let length = this.length;
         if (!dart.notNull(separator.isEmpty)) {
           if (length === 0)
             return "";
           let first = `${this.elementAt(0)}`;
           if (length !== this.length) {
             throw new core.ConcurrentModificationError(this);
           }
           let buffer = new core.StringBuffer(first);
-          for (let i = 1; dart.notNull(i) < dart.notNull(length); dart.notNull(i)++) {
+          for (let i = 1; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
             buffer.write(separator);
             buffer.write(this.elementAt(i));
             if (length !== this.length) {
               throw new core.ConcurrentModificationError(this);
             }
           }
           return buffer.toString();
         } else {
           let buffer = new core.StringBuffer();
-          for (let i = 0; dart.notNull(i) < dart.notNull(length); dart.notNull(i)++) {
+          for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
             buffer.write(this.elementAt(i));
             if (length !== this.length) {
               throw new core.ConcurrentModificationError(this);
             }
           }
           return buffer.toString();
         }
       }
       where(test) {
         return super.where(test);
       }
       map(f) {
         return new MappedListIterable(this, dart.as(f, dart.throw_("Unimplemented type (dynamic) → dynamic")));
       }
       reduce(combine) {
         let length = this.length;
         if (length === 0)
           throw IterableElementError.noElement();
         let value = this.elementAt(0);
-        for (let i = 1; dart.notNull(i) < dart.notNull(length); dart.notNull(i)++) {
+        for (let i = 1; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
           value = combine(value, this.elementAt(i));
           if (length !== this.length) {
             throw new core.ConcurrentModificationError(this);
           }
         }
         return value;
       }
       fold(initialValue, combine) {
         let value = initialValue;
         let length = this.length;
-        for (let i = 0; dart.notNull(i) < dart.notNull(length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
           value = combine(value, this.elementAt(i));
           if (length !== this.length) {
             throw new core.ConcurrentModificationError(this);
           }
         }
         return value;
       }
       skip(count) {
         return new SubListIterable(this, count, null);
       }
@@ skipping 10 matching lines @@
         let growable = opt$.growable === void 0 ? true : opt$.growable;
         let result = null;
         if (growable) {
           result = ((_) => {
             _.length = this.length;
             return _;
           }).bind(this)(new core.List());
         } else {
           result = new core.List(this.length);
         }
-        for (let i = 0; dart.notNull(i) < dart.notNull(this.length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(this.length); i = dart.notNull(i) + 1) {
           result.set(i, this.elementAt(i));
         }
         return result;
       }
       toSet() {
         let result = new core.Set();
-        for (let i = 0; dart.notNull(i) < dart.notNull(this.length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(this.length); i = dart.notNull(i) + 1) {
           result.add(this.elementAt(i));
         }
         return result;
       }
     }
     return ListIterable;
   });
   let ListIterable = ListIterable$(dynamic);
   let _iterable = Symbol('_iterable');
   let _start = Symbol('_start');
@@ skipping 68 matching lines @@
         let end = this[_iterable].length;
         if (this[_endOrLength] !== null && dart.notNull(this[_endOrLength]) < dart.notNull(end))
           end = this[_endOrLength];
         let length = dart.notNull(end) - dart.notNull(start);
         if (dart.notNull(length) < 0)
           length = 0;
         let result = growable ? ((_) => {
           _.length = length;
           return _;
         }).bind(this)(new core.List()) : new core.List(length);
-        for (let i = 0; dart.notNull(i) < dart.notNull(length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
           result.set(i, this[_iterable].elementAt(dart.notNull(start) + dart.notNull(i)));
           if (dart.notNull(this[_iterable].length) < dart.notNull(end))
             throw new core.ConcurrentModificationError(this);
         }
         return dart.as(result, core.List$(E));
       }
     }
     return SubListIterable;
   });
   let SubListIterable = SubListIterable$(dynamic);
@@ skipping 14 matching lines @@
       moveNext() {
         let length = this[_iterable].length;
         if (this[_length] !== length) {
           throw new core.ConcurrentModificationError(this[_iterable]);
         }
         if (dart.notNull(this[_index]) >= dart.notNull(length)) {
           this[_current] = null;
           return false;
         }
         this[_current] = this[_iterable].elementAt(this[_index]);
-        dart.notNull(this[_index])++;
+        this[_index] = dart.notNull(this[_index]) + 1;
         return true;
       }
     }
     return ListIterator;
   });
   let ListIterator = ListIterator$(dynamic);
   let _f = Symbol('_f');
   let MappedIterable$ = dart.generic(function(S, T) {
     class MappedIterable extends collection.IterableBase$(T) {
       MappedIterable(iterable, function) {
@@ skipping 210 matching lines @@
   let _remaining = Symbol('_remaining');
   let TakeIterator$ = dart.generic(function(E) {
     class TakeIterator extends core.Iterator$(E) {
       TakeIterator($_iterator, $_remaining) {
         this[_iterator] = $_iterator;
         this[_remaining] = $_remaining;
         super.Iterator();
         dart.assert(dart.notNull(typeof this[_remaining] == number) && dart.notNull(this[_remaining]) >= 0);
       }
       moveNext() {
-        dart.notNull(this[_remaining])--;
+        this[_remaining] = dart.notNull(this[_remaining]) - 1;
         if (dart.notNull(this[_remaining]) >= 0) {
           return this[_iterator].moveNext();
         }
         this[_remaining] = -1;
         return false;
       }
       get current() {
         if (dart.notNull(this[_remaining]) < 0)
           return null;
         return this[_iterator].current;
@@ skipping 93 matching lines @@
   let EfficientLengthSkipIterable = EfficientLengthSkipIterable$(dynamic);
   let SkipIterator$ = dart.generic(function(E) {
     class SkipIterator extends core.Iterator$(E) {
       SkipIterator($_iterator, $_skipCount) {
         this[_iterator] = $_iterator;
         this[_skipCount] = $_skipCount;
         super.Iterator();
         dart.assert(dart.notNull(typeof this[_skipCount] == number) && dart.notNull(this[_skipCount]) >= 0);
       }
       moveNext() {
-        for (let i = 0; dart.notNull(i) < dart.notNull(this[_skipCount]); dart.notNull(i)++)
+        for (let i = 0; dart.notNull(i) < dart.notNull(this[_skipCount]); i = dart.notNull(i) + 1)
           this[_iterator].moveNext();
         this[_skipCount] = 0;
         return this[_iterator].moveNext();
       }
       get current() {
         return this[_iterator].current;
       }
     }
     return SkipIterator;
   });
@@ skipping 195 matching lines @@
       }
       static fold(iterable, initialValue, combine) {
         for (let element of iterable) {
           initialValue = combine(initialValue, element);
         }
         return initialValue;
       }
       static removeWhereList(list, test) {
         let retained = new List.from([]);
         let length = list.length;
-        for (let i = 0; dart.notNull(i) < dart.notNull(length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
           let element = list.get(i);
           if (!dart.notNull(test(element))) {
             retained.add(element);
           }
           if (length !== list.length) {
             throw new core.ConcurrentModificationError(list);
           }
         }
         if (retained.length === length)
           return;
         list.length = retained.length;
-        for (let i = 0; dart.notNull(i) < dart.notNull(retained.length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(retained.length); i = dart.notNull(i) + 1) {
           list.set(i, retained.get(i));
         }
       }
       static isEmpty(iterable) {
         return !dart.notNull(iterable.iterator.moveNext());
       }
       static first(iterable) {
         let it = iterable.iterator;
         if (!dart.notNull(it.moveNext())) {
           throw IterableElementError.noElement();
@@ skipping 38 matching lines @@
             foundMatching = true;
           }
         }
         if (foundMatching)
           return result;
         if (orElse !== null)
           return orElse();
         throw IterableElementError.noElement();
       }
       static lastWhereList(list, test, orElse) {
-        for (let i = dart.notNull(list.length) - 1; dart.notNull(i) >= 0; dart.notNull(i)--) {
+        for (let i = dart.notNull(list.length) - 1; dart.notNull(i) >= 0; i = dart.notNull(i) - 1) {
           let element = list.get(i);
           if (test(element))
             return element;
         }
         if (orElse !== null)
           return orElse();
         throw IterableElementError.noElement();
       }
       static singleWhere(iterable, test) {
         let result = null;
@@ skipping 12 matching lines @@
         throw IterableElementError.noElement();
       }
       static elementAt(iterable, index) {
         if (!(typeof index == number))
           throw new core.ArgumentError.notNull("index");
         core.RangeError.checkNotNegative(index, "index");
         let elementIndex = 0;
         for (let element of iterable) {
           if (index === elementIndex)
             return element;
-          dart.notNull(elementIndex)++;
+          elementIndex = dart.notNull(elementIndex) + 1;
         }
         throw new core.RangeError.index(index, iterable, "index", null, elementIndex);
       }
       static join(iterable, separator) {
         if (separator === void 0)
           separator = null;
         let buffer = new core.StringBuffer();
         buffer.writeAll(iterable, separator);
         return buffer.toString();
       }
       static joinList(list, separator) {
         if (separator === void 0)
           separator = null;
         if (list.isEmpty)
           return "";
         if (list.length === 1)
           return `${list.get(0)}`;
         let buffer = new core.StringBuffer();
         if (separator.isEmpty) {
-          for (let i = 0; dart.notNull(i) < dart.notNull(list.length); dart.notNull(i)++) {
+          for (let i = 0; dart.notNull(i) < dart.notNull(list.length); i = dart.notNull(i) + 1) {
             buffer.write(list.get(i));
           }
         } else {
           buffer.write(list.get(0));
-          for (let i = 1; dart.notNull(i) < dart.notNull(list.length); dart.notNull(i)++) {
+          for (let i = 1; dart.notNull(i) < dart.notNull(list.length); i = dart.notNull(i) + 1) {
             buffer.write(separator);
             buffer.write(list.get(i));
           }
         }
         return buffer.toString();
       }
       where(iterable, f) {
         return new WhereIterable(dart.as(iterable, core.Iterable$(T)), f);
       }
       static map(iterable, f) {
@@ skipping 93 matching lines @@
           let delta = dart.notNull(insertLength) - dart.notNull(removeLength);
           let newLength = dart.notNull(list.length) + dart.notNull(delta);
           let insertEnd = dart.notNull(start) + dart.notNull(insertLength);
           list.length = newLength;
           list.setRange(insertEnd, newLength, list, end);
           list.setRange(start, insertEnd, iterable);
         }
       }
       static fillRangeList(list, start, end, fillValue) {
         _rangeCheck(list, start, end);
-        for (let i = start; dart.notNull(i) < dart.notNull(end); dart.notNull(i)++) {
+        for (let i = start; dart.notNull(i) < dart.notNull(end); i = dart.notNull(i) + 1) {
           list.set(i, fillValue);
         }
       }
       static insertAllList(list, index, iterable) {
         core.RangeError.checkValueInInterval(index, 0, list.length, "index");
         if (!dart.is(iterable, EfficientLength)) {
           iterable = iterable.toList({growable: false});
         }
         let insertionLength = iterable.length;
         list.length = insertionLength;
         list.setRange(dart.notNull(index) + dart.notNull(insertionLength), list.length, list, index);
         for (let element of iterable) {
-          list.set(dart.notNull(index)++, element);
+          list.set((($tmp) => index = dart.notNull($tmp) + 1, $tmp)(index), element);
         }
       }
       static setAllList(list, index, iterable) {
         core.RangeError.checkValueInInterval(index, 0, list.length, "index");
         for (let element of iterable) {
-          list.set(dart.notNull(index)++, element);
+          list.set((($tmp) => index = dart.notNull($tmp) + 1, $tmp)(index), element);
         }
       }
       asMapList(l) {
         return new ListMapView(dart.as(l, core.List$(T)));
       }
       static setContainsAll(set, other) {
         for (let element of other) {
           if (!dart.notNull(set.contains(element)))
             return false;
         }
@@ skipping 211 matching lines @@
         return this[_values].isNotEmpty;
       }
       containsValue(value) {
         return this[_values].contains(value);
       }
       containsKey(key) {
         return dart.notNull(typeof key == number) && dart.notNull(key) >= 0 && dart.notNull(key) < dart.notNull(this.length);
       }
       forEach(f) {
         let length = this[_values].length;
-        for (let i = 0; dart.notNull(i) < dart.notNull(length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
           f(i, this[_values].get(i));
           if (length !== this[_values].length) {
             throw new core.ConcurrentModificationError(this[_values]);
           }
         }
       }
       set(key, value) {
         throw new core.UnsupportedError("Cannot modify an unmodifiable map");
       }
       putIfAbsent(key, ifAbsent) {
@@ skipping 57 matching lines @@
     }
   }
   // Function makeListFixedLength: (List<dynamic>) → List
   function makeListFixedLength(growableList) {
     _interceptors.JSArray.markFixedList(growableList);
     return growableList;
   }
   class Lists extends dart.Object {
     static copy(src, srcStart, dst, dstStart, count) {
       if (dart.notNull(srcStart) < dart.notNull(dstStart)) {
-        for (let i = dart.notNull(srcStart) + dart.notNull(count) - 1, j = dart.notNull(dstStart) + dart.notNull(count) - 1; dart.notNull(i) >= dart.notNull(srcStart); dart.notNull(i)--, dart.notNull(j)--) {
+        for (let i = dart.notNull(srcStart) + dart.notNull(count) - 1, j = dart.notNull(dstStart) + dart.notNull(count) - 1; dart.notNull(i) >= dart.notNull(srcStart); i = dart.notNull(i) - 1, j = dart.notNull(j) - 1) {
           dst.set(j, src.get(i));
         }
       } else {
-        for (let i = srcStart, j = dstStart; dart.notNull(i) < dart.notNull(srcStart) + dart.notNull(count); dart.notNull(i)++, dart.notNull(j)++) {
+        for (let i = srcStart, j = dstStart; dart.notNull(i) < dart.notNull(srcStart) + dart.notNull(count); i = dart.notNull(i) + 1, j = dart.notNull(j) + 1) {
           dst.set(j, src.get(i));
         }
       }
     }
     static areEqual(a, b) {
       if (core.identical(a, b))
         return true;
       if (!dart.notNull(dart.is(b, core.List)))
         return false;
       let length = a.length;
       if (length !== dart.dload(b, 'length'))
         return false;
-      for (let i = 0; dart.notNull(i) < dart.notNull(length); dart.notNull(i)++) {
+      for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
         if (!dart.notNull(core.identical(a.get(i), dart.dindex(b, i))))
           return false;
       }
       return true;
     }
     static indexOf(a, element, startIndex, endIndex) {
       if (dart.notNull(startIndex) >= dart.notNull(a.length)) {
         return -1;
       }
       if (dart.notNull(startIndex) < 0) {
         startIndex = 0;
       }
-      for (let i = startIndex; dart.notNull(i) < dart.notNull(endIndex); dart.notNull(i)++) {
+      for (let i = startIndex; dart.notNull(i) < dart.notNull(endIndex); i = dart.notNull(i) + 1) {
         if (dart.equals(a.get(i), element)) {
           return i;
         }
       }
       return -1;
     }
     static lastIndexOf(a, element, startIndex) {
       if (dart.notNull(startIndex) < 0) {
         return -1;
       }
       if (dart.notNull(startIndex) >= dart.notNull(a.length)) {
         startIndex = dart.notNull(a.length) - 1;
       }
-      for (let i = startIndex; dart.notNull(i) >= 0; dart.notNull(i)--) {
+      for (let i = startIndex; dart.notNull(i) >= 0; i = dart.notNull(i) - 1) {
         if (dart.equals(a.get(i), element)) {
           return i;
         }
       }
       return -1;
     }
     static indicesCheck(a, start, end) {
       core.RangeError.checkValidRange(start, end, a.length);
     }
     static rangeCheck(a, start, length) {
@@ skipping 24 matching lines @@
       _doSort(a, from, dart.notNull(to) - 1, compare);
     }
     static [_doSort](a, left, right, compare) {
       if (dart.notNull(right) - dart.notNull(left) <= dart.notNull(_INSERTION_SORT_THRESHOLD)) {
         _insertionSort(a, left, right, compare);
       } else {
         _dualPivotQuicksort(a, left, right, compare);
       }
     }
     static [_insertionSort](a, left, right, compare) {
-      for (let i = dart.notNull(left) + 1; dart.notNull(i) <= dart.notNull(right); dart.notNull(i)++) {
+      for (let i = dart.notNull(left) + 1; dart.notNull(i) <= dart.notNull(right); i = dart.notNull(i) + 1) {
         let el = a.get(i);
         let j = i;
         while (dart.notNull(j) > dart.notNull(left) && dart.notNull(compare(a.get(dart.notNull(j) - 1), el)) > 0) {
           a.set(j, a.get(dart.notNull(j) - 1));
-          dart.notNull(j)--;
+          j = dart.notNull(j) - 1;
         }
         a.set(j, el);
       }
     }
     static [_dualPivotQuicksort](a, left, right, compare) {
       dart.assert(dart.notNull(right) - dart.notNull(left) > dart.notNull(_INSERTION_SORT_THRESHOLD));
       let sixth = ((dart.notNull(right) - dart.notNull(left) + 1) / 6).truncate();
       let index1 = dart.notNull(left) + dart.notNull(sixth);
       let index5 = dart.notNull(right) - dart.notNull(sixth);
       let index3 = ((dart.notNull(left) + dart.notNull(right)) / 2).truncate();
@@ skipping 54 matching lines @@
       a.set(index1, el1);
       a.set(index3, el3);
       a.set(index5, el5);
       a.set(index2, a.get(left));
       a.set(index4, a.get(right));
       let less = dart.notNull(left) + 1;
       let great = dart.notNull(right) - 1;
       let pivots_are_equal = compare(pivot1, pivot2) === 0;
       if (pivots_are_equal) {
         let pivot = pivot1;
-        for (let k = less; dart.notNull(k) <= dart.notNull(great); dart.notNull(k)++) {
+        for (let k = less; dart.notNull(k) <= dart.notNull(great); k = dart.notNull(k) + 1) {
           let ak = a.get(k);
           let comp = compare(ak, pivot);
           if (comp === 0)
             continue;
           if (dart.notNull(comp) < 0) {
             if (k !== less) {
               a.set(k, a.get(less));
               a.set(less, ak);
             }
-            dart.notNull(less)++;
+            less = dart.notNull(less) + 1;
           } else {
             while (true) {
               comp = compare(a.get(great), pivot);
               if (dart.notNull(comp) > 0) {
-                dart.notNull(great)--;
+                great = dart.notNull(great) - 1;
                 continue;
               } else if (dart.notNull(comp) < 0) {
                 a.set(k, a.get(less));
-                a.set(dart.notNull(less)++, a.get(great));
-                a.set(dart.notNull(great)--, ak);
+                a.set((($tmp) => less = dart.notNull($tmp) + 1, $tmp)(less), a.get(great));
+                a.set((($tmp) => great = dart.notNull($tmp) - 1, $tmp)(great), ak);
                 break;
               } else {
                 a.set(k, a.get(great));
-                a.set(dart.notNull(great)--, ak);
+                a.set((($tmp) => great = dart.notNull($tmp) - 1, $tmp)(great), ak);
                 break;
               }
             }
           }
         }
       } else {
-        for (let k = less; dart.notNull(k) <= dart.notNull(great); dart.notNull(k)++) {
+        for (let k = less; dart.notNull(k) <= dart.notNull(great); k = dart.notNull(k) + 1) {
           let ak = a.get(k);
           let comp_pivot1 = compare(ak, pivot1);
           if (dart.notNull(comp_pivot1) < 0) {
             if (k !== less) {
               a.set(k, a.get(less));
               a.set(less, ak);
             }
-            dart.notNull(less)++;
+            less = dart.notNull(less) + 1;
           } else {
             let comp_pivot2 = compare(ak, pivot2);
             if (dart.notNull(comp_pivot2) > 0) {
               while (true) {
                 let comp = compare(a.get(great), pivot2);
                 if (dart.notNull(comp) > 0) {
-                  dart.notNull(great)--;
+                  great = dart.notNull(great) - 1;
                   if (dart.notNull(great) < dart.notNull(k))
                     break;
                   continue;
                 } else {
                   comp = compare(a.get(great), pivot1);
                   if (dart.notNull(comp) < 0) {
                     a.set(k, a.get(less));
-                    a.set(dart.notNull(less)++, a.get(great));
-                    a.set(dart.notNull(great)--, ak);
+                    a.set((($tmp) => less = dart.notNull($tmp) + 1, $tmp)(less), a.get(great));
+                    a.set((($tmp) => great = dart.notNull($tmp) - 1, $tmp)(great), ak);
                   } else {
                     a.set(k, a.get(great));
-                    a.set(dart.notNull(great)--, ak);
+                    a.set((($tmp) => great = dart.notNull($tmp) - 1, $tmp)(great), ak);
                   }
                   break;
                 }
               }
             }
           }
         }
       }
       a.set(left, a.get(dart.notNull(less) - 1));
       a.set(dart.notNull(less) - 1, pivot1);
       a.set(right, a.get(dart.notNull(great) + 1));
       a.set(dart.notNull(great) + 1, pivot2);
       _doSort(a, left, dart.notNull(less) - 2, compare);
       _doSort(a, dart.notNull(great) + 2, right, compare);
       if (pivots_are_equal) {
         return;
       }
       if (dart.notNull(less) < dart.notNull(index1) && dart.notNull(great) > dart.notNull(index5)) {
         while (compare(a.get(less), pivot1) === 0) {
-          dart.notNull(less)++;
+          less = dart.notNull(less) + 1;
         }
         while (compare(a.get(great), pivot2) === 0) {
-          dart.notNull(great)--;
+          great = dart.notNull(great) - 1;
         }
-        for (let k = less; dart.notNull(k) <= dart.notNull(great); dart.notNull(k)++) {
+        for (let k = less; dart.notNull(k) <= dart.notNull(great); k = dart.notNull(k) + 1) {
           let ak = a.get(k);
           let comp_pivot1 = compare(ak, pivot1);
           if (comp_pivot1 === 0) {
             if (k !== less) {
               a.set(k, a.get(less));
               a.set(less, ak);
             }
-            dart.notNull(less)++;
+            less = dart.notNull(less) + 1;
           } else {
             let comp_pivot2 = compare(ak, pivot2);
             if (comp_pivot2 === 0) {
               while (true) {
                 let comp = compare(a.get(great), pivot2);
                 if (comp === 0) {
-                  dart.notNull(great)--;
+                  great = dart.notNull(great) - 1;
                   if (dart.notNull(great) < dart.notNull(k))
                     break;
                   continue;
                 } else {
                   comp = compare(a.get(great), pivot1);
                   if (dart.notNull(comp) < 0) {
                     a.set(k, a.get(less));
-                    a.set(dart.notNull(less)++, a.get(great));
-                    a.set(dart.notNull(great)--, ak);
+                    a.set((($tmp) => less = dart.notNull($tmp) + 1, $tmp)(less), a.get(great));
+                    a.set((($tmp) => great = dart.notNull($tmp) - 1, $tmp)(great), ak);
                   } else {
                     a.set(k, a.get(great));
-                    a.set(dart.notNull(great)--, ak);
+                    a.set((($tmp) => great = dart.notNull($tmp) - 1, $tmp)(great), ak);
                   }
                   break;
                 }
               }
             }
           }
         }
         _doSort(a, less, great, compare);
       } else {
         _doSort(a, less, great, compare);
@@ skipping 118 matching lines @@
   exports.ReversedListIterable = ReversedListIterable;
   exports.ReversedListIterable$ = ReversedListIterable$;
   exports.UnmodifiableListError = UnmodifiableListError;
   exports.NonGrowableListError = NonGrowableListError;
   exports.makeListFixedLength = makeListFixedLength;
   exports.Lists = Lists;
   exports.printToConsole = printToConsole;
   exports.Sort = Sort;
   exports.Symbol = Symbol;
 })(_internal || (_internal = {}));