Fix increment on nullable

test/codegen/expect/dart/_js_helper.js

 var _js_helper;
 (function(exports) {
   'use strict';
   class _Patch extends dart.Object {
     _Patch() {
     }
   }
   let patch = new _Patch();
   class InternalMap extends dart.Object {
   }
@@ skipping 94 matching lines @@
     get isAccessor() {
       return this[_kind] !== METHOD;
     }
     get positionalArguments() {
       if (this.isGetter)
         return /* Unimplemented const */new List.from([]);
       let argumentCount = dart.notNull(this[_arguments].length) - dart.notNull(this[_namedArgumentNames].length);
       if (argumentCount === 0)
         return /* Unimplemented const */new List.from([]);
       let list = new List.from([]);
-      for (let index = 0; dart.notNull(index) < dart.notNull(argumentCount); dart.notNull(index)++) {
+      for (let index = 0; dart.notNull(index) < dart.notNull(argumentCount); index = dart.notNull(index) + 1) {
         list.add(this[_arguments].get(index));
       }
       return dart.as(makeLiteralListConst(list), core.List);
     }
     get namedArguments() {
       if (this.isAccessor)
         return dart.map();
       let namedArgumentCount = this[_namedArgumentNames].length;
       let namedArgumentsStartIndex = dart.notNull(this[_arguments].length) - dart.notNull(namedArgumentCount);
       if (namedArgumentCount === 0)
         return dart.map();
       let map = new core.Map();
-      for (let i = 0; dart.notNull(i) < dart.notNull(namedArgumentCount); dart.notNull(i)++) {
+      for (let i = 0; dart.notNull(i) < dart.notNull(namedArgumentCount); i = dart.notNull(i) + 1) {
         map.set(new _internal.Symbol.unvalidated(dart.as(this[_namedArgumentNames].get(i), core.String)), this[_arguments].get(dart.notNull(namedArgumentsStartIndex) + dart.notNull(i)));
       }
       return map;
     }
     [_getCachedInvocation](object) {
       let interceptor = _interceptors.getInterceptor(object);
       let receiver = object;
       let name = this[_internalName];
       let arguments = this[_arguments];
       let interceptedNames = _foreign_helper.JS_EMBEDDED_GLOBAL('', dart.as(_js_embedded_names.INTERCEPTED_NAMES, core.String));
@@ skipping 104 matching lines @@
           receiver = this.cachedInterceptor;
         providedArgumentCount = dart.notNull(arguments.length) - 1;
       }
       if (dart.notNull(this.info.areOptionalParametersNamed) && dart.notNull(providedArgumentCount) > dart.notNull(this.info.requiredParameterCount)) {
         throw new UnimplementedNoSuchMethodError(`Invocation of unstubbed method '${this.info.reflectionName}'` + ` with ${arguments.length} arguments.`);
       } else if (dart.notNull(providedArgumentCount) < dart.notNull(this.info.requiredParameterCount)) {
         throw new UnimplementedNoSuchMethodError(`Invocation of unstubbed method '${this.info.reflectionName}'` + ` with ${providedArgumentCount} arguments (too few).`);
       } else if (dart.notNull(providedArgumentCount) > dart.notNull(fullParameterCount)) {
         throw new UnimplementedNoSuchMethodError(`Invocation of unstubbed method '${this.info.reflectionName}'` + ` with ${providedArgumentCount} arguments (too many).`);
       }
-      for (let i = providedArgumentCount; dart.notNull(i) < dart.notNull(fullParameterCount); dart.notNull(i)++) {
+      for (let i = providedArgumentCount; dart.notNull(i) < dart.notNull(fullParameterCount); i = dart.notNull(i) + 1) {
         arguments.add(getMetadata(this.info.defaultValue(i)));
       }
       return this.jsFunction.apply(receiver, arguments);
     }
   }
   class CachedNoSuchMethodInvocation extends dart.Object {
     CachedNoSuchMethodInvocation(interceptor) {
       this.interceptor = interceptor;
     }
     get isNoSuchMethod() {
@@ skipping 69 matching lines @@
       if (!dart.notNull(this.areOptionalParametersNamed) || this.optionalParameterCount === 1) {
         return this.parameterName(parameter);
       }
       let index = this.sortedIndex(dart.notNull(parameter) - dart.notNull(this.requiredParameterCount));
       return this.parameterName(index);
     }
     sortedIndex(unsortedIndex) {
       if (this.cachedSortedIndices === null) {
         this.cachedSortedIndices = new core.List(this.optionalParameterCount);
         let positions = dart.map();
-        for (let i = 0; dart.notNull(i) < dart.notNull(this.optionalParameterCount); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(this.optionalParameterCount); i = dart.notNull(i) + 1) {
           let index = dart.notNull(this.requiredParameterCount) + dart.notNull(i);
           positions.set(this.parameterName(index), index);
         }
         let index = 0;
         ((_) => {
           _.sort();
           return _;
         }).bind(this)(positions.keys.toList()).forEach(((name) => {
-          this.cachedSortedIndices.set(dart.notNull(index)++, positions.get(name));
+          this.cachedSortedIndices.set((($tmp) => index = dart.notNull($tmp) + 1, $tmp)(index), positions.get(name));
         }).bind(this));
       }
       return dart.as(this.cachedSortedIndices.get(unsortedIndex), core.int);
     }
     computeFunctionRti(jsConstructor) {
       if (typeof this.functionType == "number") {
         return getMetadata(dart.as(this.functionType, core.int));
       } else if (typeof this.functionType == "function") {
         let fakeInstance = new jsConstructor();
         setRuntimeTypeInfo(fakeInstance, fakeInstance["<>"]);
@@ skipping 67 matching lines @@
             return parseInt(source, 10);
           }
           if (dart.notNull(radix) < 10 || dart.notNull(dart.dindex(match, decimalIndex) === null)) {
             let maxCharCode = null;
             if (dart.notNull(radix) <= 10) {
               maxCharCode = 48 + dart.notNull(radix) - 1;
             } else {
               maxCharCode = 97 + dart.notNull(radix) - 10 - 1;
             }
             let digitsPart = dart.as(dart.dindex(match, digitsIndex), core.String);
-            for (let i = 0; dart.notNull(i) < dart.notNull(digitsPart.length); dart.notNull(i)++) {
+            for (let i = 0; dart.notNull(i) < dart.notNull(digitsPart.length); i = dart.notNull(i) + 1) {
               let characterCode = dart.notNull(digitsPart.codeUnitAt(0)) | 32;
               if (dart.notNull(digitsPart.codeUnitAt(i)) > dart.notNull(maxCharCode)) {
                 return handleError(source);
               }
             }
           }
         }
       }
       if (match === null)
         return handleError(source);
@@ skipping 239 matching lines @@
       if (positionalArguments !== null) {
         argumentCount = positionalArguments.length;
         arguments.addAll(positionalArguments);
       }
       let names = '';
       if (dart.notNull(namedArguments !== null) && !dart.notNull(namedArguments.isEmpty)) {
         namedArguments.forEach(((name, argument) => {
           names = `${names}$${name}`;
           namedArgumentList.add(name);
           arguments.add(argument);
-          dart.notNull(argumentCount)++;
+          argumentCount = dart.notNull(argumentCount) + 1;
         }).bind(this));
       }
       let selectorName = `${_foreign_helper.JS_GET_NAME("CALL_PREFIX")}$${argumentCount}${names}`;
       return dart.dinvoke(function, 'noSuchMethod', createUnmangledInvocationMirror(dart.throw_("Unimplemented SymbolLiteral: #call"), selectorName, JSInvocationMirror.METHOD, arguments, namedArgumentList));
     }
     static applyFunction(function, positionalArguments, namedArguments) {
       return namedArguments === null ? applyFunctionWithPositionalArguments(function, positionalArguments) : applyFunctionWithNamedArguments(function, positionalArguments, namedArguments);
     }
     static applyFunctionWithPositionalArguments(function, positionalArguments) {
       let argumentCount = 0;
@@ skipping 30 matching lines @@
       }
       if (positionalArguments !== null) {
         positionalArguments = new core.List.from(positionalArguments);
       } else {
         positionalArguments = new List.from([]);
       }
       if (info.requiredParameterCount !== positionalArguments.length) {
         return functionNoSuchMethod(function, positionalArguments, namedArguments);
       }
       let defaultArguments = new core.Map();
-      for (let i = 0; dart.notNull(i) < dart.notNull(info.optionalParameterCount); dart.notNull(i)++) {
+      for (let i = 0; dart.notNull(i) < dart.notNull(info.optionalParameterCount); i = dart.notNull(i) + 1) {
         let index = dart.notNull(i) + dart.notNull(info.requiredParameterCount);
         let parameterName = info.parameterNameInOrder(index);
         let value = info.defaultValueInOrder(index);
         let defaultValue = getMetadata(value);
         defaultArguments.set(parameterName, defaultValue);
       }
       let bad = false;
       namedArguments.forEach(((parameter, value) => {
         if (defaultArguments.containsKey(parameter)) {
           defaultArguments.set(parameter, value);
@@ skipping 425 matching lines @@
       return dart.as(dart.dload(object, 'hashCode'), core.int);
     } else {
       return Primitives.objectHashCode(object);
     }
   }
   // Function fillLiteralMap: (dynamic, Map<dynamic, dynamic>) → dynamic
   function fillLiteralMap(keyValuePairs, result) {
     let index = 0;
     let length = getLength(keyValuePairs);
     while (dart.notNull(index) < dart.notNull(length)) {
-      let key = getIndex(keyValuePairs, dart.notNull(index)++);
-      let value = getIndex(keyValuePairs, dart.notNull(index)++);
+      let key = getIndex(keyValuePairs, (($tmp) => index = dart.notNull($tmp) + 1, $tmp)(index));
+      let value = getIndex(keyValuePairs, (($tmp) => index = dart.notNull($tmp) + 1, $tmp)(index));
       result.set(key, value);
     }
     return result;
   }
   // Function invokeClosure: (Function, dynamic, int, dynamic, dynamic, dynamic, dynamic) → dynamic
   function invokeClosure(closure, isolate, numberOfArguments, arg1, arg2, arg3, arg4) {
     if (numberOfArguments === 0) {
       return _foreign_helper.JS_CALL_IN_ISOLATE(isolate, () => dart.dinvokef(closure));
     } else if (numberOfArguments === 1) {
       return _foreign_helper.JS_CALL_IN_ISOLATE(isolate, () => dart.dinvokef(closure, arg1));
@@ skipping 35 matching lines @@
       let callName = dart.as(function.$callName, core.String);
       function.$reflectionInfo = reflectionInfo;
       let info = new ReflectionInfo(function);
       let functionType = info.functionType;
       let prototype = isStatic ? Object.create(new TearOffClosure().constructor.prototype) : Object.create(new BoundClosure(null, null, null, null).constructor.prototype);
       prototype.$initialize = prototype.constructor;
       let constructor = isStatic ? function() {
         this.$initialize();
       } : isCsp ? function(a, b, c, d) {
         this.$initialize(a, b, c, d);
-      } : new Function("a", "b", "c", "d", "this.$initialize(a,b,c,d);" + dart.notNull(functionCounter)++);
+      } : new Function("a", "b", "c", "d", "this.$initialize(a,b,c,d);" + (($tmp) => functionCounter = dart.notNull($tmp) + 1, $tmp)(functionCounter));
       prototype.constructor = constructor;
       constructor.prototype = prototype;
       let trampoline = function;
       let isIntercepted = false;
       if (!dart.notNull(isStatic)) {
         if (jsArguments.length == 1) {
           isIntercepted = true;
         }
         trampoline = forwardCallTo(receiver, function, isIntercepted);
         trampoline.$reflectionInfo = reflectionInfo;
@@ skipping 13 matching lines @@
         signatureFunction = function(f, r) {
           return function() {
             return f.apply({$receiver: r(this)}, arguments);
           };
         }(functionType, getReceiver);
       } else {
         throw 'Error in reflectionInfo.';
       }
       prototype[_foreign_helper.JS_SIGNATURE_NAME()] = signatureFunction;
       prototype[callName] = trampoline;
-      for (let i = 1; dart.notNull(i) < dart.notNull(functions.length); dart.notNull(i)++) {
+      for (let i = 1; dart.notNull(i) < dart.notNull(functions.length); i = dart.notNull(i) + 1) {
         let stub = functions.get(i);
         let stubCallName = stub.$callName;
         if (stubCallName !== null) {
           prototype[stubCallName] = isStatic ? stub : forwardCallTo(receiver, stub, isIntercepted);
         }
       }
       prototype["call*"] = trampoline;
       return constructor;
     }
     static cspForwardCall(arity, isSuperCall, stubName, function) {
@@ skipping 52 matching lines @@
       if (isIntercepted)
         return forwardInterceptedCallTo(receiver, function);
       let stubName = dart.as(function.$stubName, core.String);
       let arity = function.length;
       let lookedUpFunction = receiver[stubName];
       let isSuperCall = !dart.notNull(core.identical(function, lookedUpFunction));
       if (dart.notNull(isCsp) || dart.notNull(isSuperCall) || dart.notNull(arity) >= 27) {
         return cspForwardCall(arity, isSuperCall, stubName, function);
       }
       if (arity === 0) {
-        return new Function('return function(){' + `return this.${BoundClosure.selfFieldName()}.${stubName}();` + `${dart.notNull(functionCounter)++}` + '}')();
+        return new Function('return function(){' + `return this.${BoundClosure.selfFieldName()}.${stubName}();` + `${(($tmp) => functionCounter = dart.notNull($tmp) + 1, $tmp)(functionCounter)}` + '}')();
       }
       dart.assert(1 <= dart.notNull(arity) && dart.notNull(arity) < 27);
       let arguments = "abcdefghijklmnopqrstuvwxyz".split("").splice(0, arity).join(",");
-      return new Function(`return function(${arguments}){` + `return this.${BoundClosure.selfFieldName()}.${stubName}(${arguments});` + `${dart.notNull(functionCounter)++}` + '}')();
+      return new Function(`return function(${arguments}){` + `return this.${BoundClosure.selfFieldName()}.${stubName}(${arguments});` + `${(($tmp) => functionCounter = dart.notNull($tmp) + 1, $tmp)(functionCounter)}` + '}')();
     }
     static cspForwardInterceptedCall(arity, isSuperCall, name, function) {
       let getSelf = _foreign_helper.RAW_DART_FUNCTION_REF(BoundClosure.selfOf);
       let getReceiver = _foreign_helper.RAW_DART_FUNCTION_REF(BoundClosure.receiverOf);
       if (isSuperCall)
         arity = -1;
       switch (arity) {
         case 0:
           throw new RuntimeError('Intercepted function with no arguments.');
         case 1:
@@ skipping 47 matching lines @@
       let receiverField = BoundClosure.receiverFieldName();
       let stubName = dart.as(function.$stubName, core.String);
       let arity = function.length;
       let isCsp = typeof dart_precompiled == "function";
       let lookedUpFunction = receiver[stubName];
       let isSuperCall = !dart.notNull(core.identical(function, lookedUpFunction));
       if (dart.notNull(isCsp) || dart.notNull(isSuperCall) || dart.notNull(arity) >= 28) {
         return cspForwardInterceptedCall(arity, isSuperCall, stubName, function);
       }
       if (arity === 1) {
-        return new Function('return function(){' + `return this.${selfField}.${stubName}(this.${receiverField});` + `${dart.notNull(functionCounter)++}` + '}')();
+        return new Function('return function(){' + `return this.${selfField}.${stubName}(this.${receiverField});` + `${(($tmp) => functionCounter = dart.notNull($tmp) + 1, $tmp)(functionCounter)}` + '}')();
       }
       dart.assert(1 < dart.notNull(arity) && dart.notNull(arity) < 28);
       let arguments = "abcdefghijklmnopqrstuvwxyz".split("").splice(0, dart.notNull(arity) - 1).join(",");
-      return new Function(`return function(${arguments}){` + `return this.${selfField}.${stubName}(this.${receiverField}, ${arguments});` + `${dart.notNull(functionCounter)++}` + '}')();
+      return new Function(`return function(${arguments}){` + `return this.${selfField}.${stubName}(this.${receiverField}, ${arguments});` + `${(($tmp) => functionCounter = dart.notNull($tmp) + 1, $tmp)(functionCounter)}` + '}')();
     }
     toString() {
       return "Closure";
     }
   }
   Closure.FUNCTION_INDEX = 0;
   Closure.NAME_INDEX = 1;
   Closure.CALL_NAME_INDEX = 2;
   Closure.REQUIRED_PARAMETER_INDEX = 3;
   Closure.OPTIONAL_PARAMETER_INDEX = 4;
@@ skipping 54 matching lines @@
     }
     static receiverFieldName() {
       if (receiverFieldNameCache === null) {
         receiverFieldNameCache = computeFieldNamed('receiver');
       }
       return receiverFieldNameCache;
     }
     static computeFieldNamed(fieldName) {
       let template = new BoundClosure('self', 'target', 'receiver', 'name');
       let names = _interceptors.JSArray.markFixedList(dart.as(Object.getOwnPropertyNames(template), core.List));
-      for (let i = 0; dart.notNull(i) < dart.notNull(names.length); dart.notNull(i)++) {
+      for (let i = 0; dart.notNull(i) < dart.notNull(names.length); i = dart.notNull(i) + 1) {
         let name = names.get(i);
         if (template[name] === fieldName) {
           return name;
         }
       }
     }
   }
   BoundClosure.selfFieldNameCache = null;
   BoundClosure.receiverFieldNameCache = null;
   // Function jsHasOwnProperty: (dynamic, String) → bool
@@ skipping 429 matching lines @@
       }
       if (dart.notNull(this.parameterTypes !== null) && !dart.notNull(this.parameterTypes.isEmpty)) {
         result[_foreign_helper.JS_FUNCTION_TYPE_REQUIRED_PARAMETERS_TAG()] = listToRti(this.parameterTypes);
       }
       if (dart.notNull(this.optionalParameterTypes !== null) && !dart.notNull(this.optionalParameterTypes.isEmpty)) {
         result[_foreign_helper.JS_FUNCTION_TYPE_OPTIONAL_PARAMETERS_TAG()] = listToRti(this.optionalParameterTypes);
       }
       if (this.namedParameters !== null) {
         let namedRti = Object.create(null);
         let keys = _js_names.extractKeys(this.namedParameters);
-        for (let i = 0; dart.notNull(i) < dart.notNull(keys.length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(keys.length); i = dart.notNull(i) + 1) {
           let name = keys.get(i);
           let rti = dart.dinvoke(this.namedParameters[name], 'toRti');
           namedRti[name] = rti;
         }
         result[_foreign_helper.JS_FUNCTION_TYPE_NAMED_PARAMETERS_TAG()] = namedRti;
       }
       return result;
     }
     static listToRti(list) {
       list = list;
       let result = [];
-      for (let i = 0; i['<'](dart.dload(list, 'length')); dart.notNull(i)++) {
+      for (let i = 0; i['<'](dart.dload(list, 'length')); i = dart.notNull(i) + 1) {
         result.push(dart.dinvoke(dart.dindex(list, i), 'toRti'));
       }
       return result;
     }
     toString() {
       let result = '(';
       let needsComma = false;
       if (this.parameterTypes !== null) {
-        for (let i = 0; dart.notNull(i) < dart.notNull(this.parameterTypes.length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(this.parameterTypes.length); i = dart.notNull(i) + 1) {
           let type = this.parameterTypes.get(i);
           if (needsComma)
             result = ', ';
           result = `${type}`;
           needsComma = true;
         }
       }
       if (dart.notNull(this.optionalParameterTypes !== null) && !dart.notNull(this.optionalParameterTypes.isEmpty)) {
         if (needsComma)
           result = ', ';
         needsComma = false;
         result = '[';
-        for (let i = 0; dart.notNull(i) < dart.notNull(this.optionalParameterTypes.length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(this.optionalParameterTypes.length); i = dart.notNull(i) + 1) {
           let type = this.optionalParameterTypes.get(i);
           if (needsComma)
             result = ', ';
           result = `${type}`;
           needsComma = true;
         }
         result = ']';
       } else if (this.namedParameters !== null) {
         if (needsComma)
           result = ', ';
         needsComma = false;
         result = '{';
         let keys = _js_names.extractKeys(this.namedParameters);
-        for (let i = 0; dart.notNull(i) < dart.notNull(keys.length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(keys.length); i = dart.notNull(i) + 1) {
           let name = keys.get(i);
           if (needsComma)
             result = ', ';
           let rti = dart.dinvoke(this.namedParameters[name], 'toRti');
           result = `${rti} ${name}`;
           needsComma = true;
         }
         result = '}';
       }
       result = `) -> ${this.returnType}`;
@@ skipping 68 matching lines @@
   // Function convertRtiToRuntimeType: (dynamic) → RuntimeType
   function convertRtiToRuntimeType(rti) {
     if (rti === null) {
       return getDynamicRuntimeType();
     } else if (typeof rti == "function") {
       return new RuntimeTypePlain(rti.name);
     } else if (rti.constructor == Array) {
       let list = dart.as(rti, core.List);
       let name = list.get(0).name;
       let arguments = new List.from([]);
-      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) {
         arguments.add(convertRtiToRuntimeType(list.get(i)));
       }
       return new RuntimeTypeGeneric(name, dart.as(arguments, core.List$(RuntimeType)), rti);
     } else if ("func" in rti) {
       return new FunctionTypeInfoDecoderRing(rti).toRuntimeType();
     } else {
       throw new RuntimeError("Cannot convert " + `'${JSON.stringify(rti)}' to RuntimeType.`);
     }
   }
   class RuntimeTypePlain extends RuntimeType {
@@ skipping 372 matching lines @@
       get(key) {
         if (!dart.notNull(this.containsKey(key)))
           return null;
         return dart.as(this[_fetch](key), V);
       }
       [_fetch](key) {
         return jsPropertyAccess(this[_jsObject], dart.as(key, core.String));
       }
       forEach(f) {
         let keys = this[_keys];
-        for (let i = 0; i['<'](dart.dload(keys, 'length')); dart.notNull(i)++) {
+        for (let i = 0; i['<'](dart.dload(keys, 'length')); i = dart.notNull(i) + 1) {
           let key = dart.dindex(keys, i);
           f(dart.as(key, K), dart.as(this[_fetch](key), V));
         }
       }
       get keys() {
         return new _ConstantMapKeyIterable(this);
       }
       get values() {
         return new _internal.MappedIterable(this[_keys], dart.as(((key) => this[_fetch](key)).bind(this), dart.throw_("Unimplemented type (K) → V")));
       }
@@ skipping 262 matching lines @@
   function initNativeDispatchContinue() {
     exports.dispatchRecordsForInstanceTags = Object.create(null);
     exports.interceptorsForUncacheableTags = Object.create(null);
     initHooks();
     let map = exports.interceptorsByTag;
     let tags = Object.getOwnPropertyNames(map);
     if (typeof window != "undefined") {
       let context = window;
       let fun = function() {
       };
-      for (let i = 0; i['<'](dart.dload(tags, 'length')); dart.notNull(i)++) {
+      for (let i = 0; i['<'](dart.dload(tags, 'length')); i = dart.notNull(i) + 1) {
         let tag = dart.dindex(tags, i);
         let proto = dart.dinvokef(exports.prototypeForTagFunction, tag);
         if (proto !== null) {
           let interceptorClass = map[tag];
           let record = makeDefaultDispatchRecord(tag, interceptorClass, proto);
           if (record !== null) {
             _interceptors.setDispatchProperty(proto, record);
             fun.prototype = proto;
           }
         }
       }
     }
-    for (let i = 0; i['<'](dart.dload(tags, 'length')); dart.notNull(i)++) {
+    for (let i = 0; i['<'](dart.dload(tags, 'length')); i = dart.notNull(i) + 1) {
       let tag = tags[i];
       if (/^[A-Za-z_]/.test(tag)) {
         let interceptorClass = propertyGet(map, tag);
         propertySet(map, dart.as(dart.dbinary(INSTANCE_CACHED_MARK, '+', tag), core.String), interceptorClass);
         propertySet(map, dart.as(dart.dbinary(UNCACHED_MARK, '+', tag), core.String), interceptorClass);
         propertySet(map, dart.as(dart.dbinary(LEAF_MARK, '+', tag), core.String), interceptorClass);
         propertySet(map, dart.as(dart.dbinary(INTERIOR_MARK, '+', tag), core.String), interceptorClass);
         propertySet(map, dart.as(dart.dbinary(DISCRIMINATED_MARK, '+', tag), core.String), interceptorClass);
       }
     }
   }
   // Function initHooks: () → void
   function initHooks() {
     let hooks = _baseHooks();
     let _fallbackConstructorHooksTransformer = _fallbackConstructorHooksTransformerGenerator(_constructorNameFallback);
     hooks = applyHooksTransformer(_fallbackConstructorHooksTransformer, hooks);
     hooks = applyHooksTransformer(_firefoxHooksTransformer, hooks);
     hooks = applyHooksTransformer(_ieHooksTransformer, hooks);
     hooks = applyHooksTransformer(_operaHooksTransformer, hooks);
     hooks = applyHooksTransformer(_safariHooksTransformer, hooks);
     hooks = applyHooksTransformer(_fixDocumentHooksTransformer, hooks);
     hooks = applyHooksTransformer(_dartExperimentalFixupGetTagHooksTransformer, hooks);
     if (typeof dartNativeDispatchHooksTransformer != "undefined") {
       let transformers = dartNativeDispatchHooksTransformer;
       if (typeof transformers == "function") {
         transformers = new List.from([transformers]);
       }
       if (transformers.constructor == Array) {
-        for (let i = 0; dart.notNull(i) < transformers.length; dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < transformers.length; i = dart.notNull(i) + 1) {
           let transformer = transformers[i];
           if (typeof transformer == "function") {
             hooks = applyHooksTransformer(transformer, hooks);
           }
         }
       }
     }
     let getTag = hooks.getTag;
     let getUnknownTag = hooks.getUnknownTag;
     let prototypeForTag = hooks.prototypeForTag;
@@ skipping 208 matching lines @@
     }
     moveNext() {
       if (this[_string] === null)
         return false;
       if (dart.notNull(this[_nextIndex]) <= dart.notNull(this[_string].length)) {
         let match = this[_regExp]._execGlobal(this[_string], this[_nextIndex]);
         if (match !== null) {
           this[_current] = match;
           let nextIndex = match.end;
           if (match.start === nextIndex) {
-            dart.notNull(nextIndex)++;
+            nextIndex = dart.notNull(nextIndex) + 1;
           }
           this[_nextIndex] = nextIndex;
           return true;
         }
       }
       this[_current] = null;
       this[_string] = null;
       return false;
     }
   }
@@ skipping 38 matching lines @@
     while (true) {
       let position = haystack.indexOf(needle, startIndex);
       if (position === -1) {
         break;
       }
       result.add(new StringMatch(position, haystack, needle));
       let endIndex = dart.notNull(position) + dart.notNull(patternLength);
       if (endIndex === length) {
         break;
       } else if (position === endIndex) {
-        ++dart.notNull(startIndex);
+        startIndex = dart.notNull(startIndex) + 1;
       } else {
         startIndex = endIndex;
       }
     }
     return result;
   }
   // Function stringContainsUnchecked: (dynamic, dynamic, dynamic) → dynamic
   function stringContainsUnchecked(receiver, other, startIndex) {
     if (typeof other == string) {
       return !dart.equals(dart.dinvoke(receiver, 'indexOf', other, startIndex), -1);
@@ skipping 23 matching lines @@
   function stringReplaceAllUnchecked(receiver, from, to) {
     checkString(to);
     if (typeof from == string) {
       if (dart.equals(from, "")) {
         if (dart.equals(receiver, "")) {
           return to;
         } else {
           let result = new core.StringBuffer();
           let length = dart.as(dart.dload(receiver, 'length'), core.int);
           result.write(to);
-          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.write(dart.dindex(receiver, i));
             result.write(to);
           }
           return result.toString();
         }
       } else {
         let quoter = new RegExp(ESCAPE_REGEXP, 'g');
         let quoted = from.replace(quoter, "\\$&");
         let replacer = new RegExp(quoted, 'g');
         return stringReplaceJS(receiver, replacer, to);
@@ skipping 47 matching lines @@
       let code = dart.as(dart.dinvoke(receiver, 'codeUnitAt', i), core.int);
       if ((dart.notNull(code) & ~1023) === 55296 && dart.notNull(length) > dart.notNull(i) + 1) {
         code = dart.as(dart.dinvoke(receiver, 'codeUnitAt', dart.notNull(i) + 1), core.int);
         if ((dart.notNull(code) & ~1023) === 56320) {
           buffer.write(dart.dinvokef(onNonMatch, dart.dinvoke(receiver, 'substring', i, dart.notNull(i) + 2)));
           i = 2;
           continue;
         }
       }
       buffer.write(dart.dinvokef(onNonMatch, dart.dindex(receiver, i)));
-      dart.notNull(i)++;
+      i = dart.notNull(i) + 1;
     }
     buffer.write(dart.dinvokef(onMatch, new StringMatch(i, dart.as(receiver, core.String), "")));
     buffer.write(dart.dinvokef(onNonMatch, ""));
     return buffer.toString();
   }
   // Function stringReplaceAllStringFuncUnchecked: (dynamic, dynamic, dynamic, dynamic) → dynamic
   function stringReplaceAllStringFuncUnchecked(receiver, pattern, onMatch, onNonMatch) {
     let patternLength = dart.as(dart.dload(pattern, 'length'), core.int);
     if (patternLength === 0) {
       return stringReplaceAllEmptyFuncUnchecked(receiver, onMatch, onNonMatch);
@@ skipping 135 matching lines @@
   }
   // Function joinArguments: (dynamic, int, {onTypeVariable: (int) → String}) → String
   function joinArguments(types, startIndex, opt$) {
     let onTypeVariable = opt$.onTypeVariable === void 0 ? null : opt$.onTypeVariable;
     if (types === null)
       return '';
     dart.assert(isJsArray(types));
     let firstArgument = true;
     let allDynamic = true;
     let buffer = new core.StringBuffer();
-    for (let index = startIndex; dart.notNull(index) < dart.notNull(getLength(types)); dart.notNull(index)++) {
+    for (let index = startIndex; dart.notNull(index) < dart.notNull(getLength(types)); index = dart.notNull(index) + 1) {
       if (firstArgument) {
         firstArgument = false;
       } else {
         buffer.write(', ');
       }
       let argument = getIndex(types, index);
       if (argument !== null) {
         allDynamic = false;
       }
       buffer.write(runtimeTypeToString(argument, {onTypeVariable: onTypeVariable}));
@@ skipping 76 matching lines @@
     return areSubtypes(substitute(substitution, arguments), checks);
   }
   // Function areSubtypes: (dynamic, dynamic) → bool
   function areSubtypes(s, t) {
     if (dart.notNull(s === null) || dart.notNull(t === null))
       return true;
     dart.assert(isJsArray(s));
     dart.assert(isJsArray(t));
     dart.assert(getLength(s) === getLength(t));
     let len = getLength(s);
-    for (let i = 0; dart.notNull(i) < dart.notNull(len); dart.notNull(i)++) {
+    for (let i = 0; dart.notNull(i) < dart.notNull(len); i = dart.notNull(i) + 1) {
       if (!dart.notNull(isSubtype(getIndex(s, i), getIndex(t, i)))) {
         return false;
       }
     }
     return true;
   }
   // Function computeSignature: (dynamic, dynamic, dynamic) → dynamic
   function computeSignature(signature, context, contextName) {
     let typeArguments = getRuntimeTypeArguments(context, contextName);
     return invokeOn(signature, context, typeArguments);
@@ skipping 91 matching lines @@
     dart.assert(isJsArray(t));
     let sLength = getLength(s);
     let tLength = getLength(t);
     if (allowShorter) {
       if (dart.notNull(sLength) < dart.notNull(tLength))
         return false;
     } else {
       if (sLength !== tLength)
         return false;
     }
-    for (let i = 0; dart.notNull(i) < dart.notNull(tLength); dart.notNull(i)++) {
+    for (let i = 0; dart.notNull(i) < dart.notNull(tLength); i = dart.notNull(i) + 1) {
       if (!dart.notNull(isAssignable(getIndex(s, i), getIndex(t, i)))) {
         return false;
       }
     }
     return true;
   }
   // Function areAssignableMaps: (dynamic, dynamic) → bool
   function areAssignableMaps(s, t) {
     if (t === null)
       return true;
     if (s === null)
       return false;
     dart.assert(isJsObject(s));
     dart.assert(isJsObject(t));
     let names = _interceptors.JSArray.markFixedList(dart.as(Object.getOwnPropertyNames(t), core.List));
-    for (let i = 0; dart.notNull(i) < dart.notNull(names.length); dart.notNull(i)++) {
+    for (let i = 0; dart.notNull(i) < dart.notNull(names.length); i = dart.notNull(i) + 1) {
       let name = names.get(i);
       if (!Object.hasOwnProperty.call(s, name)) {
         return false;
       }
       let tType = t[name];
       let sType = s[name];
       if (!dart.notNull(isAssignable(tType, sType)))
         return false;
     }
     return true;
@@ skipping 28 matching lines @@
       return false;
     }
     if (sParametersLen === tParametersLen) {
       if (!dart.notNull(areAssignable(dart.as(sParameterTypes, core.List), dart.as(tParameterTypes, core.List), false)))
         return false;
       if (!dart.notNull(areAssignable(dart.as(sOptionalParameterTypes, core.List), dart.as(tOptionalParameterTypes, core.List), true))) {
         return false;
       }
     } else {
       let pos = 0;
-      for (; dart.notNull(pos) < dart.notNull(sParametersLen); dart.notNull(pos)++) {
+      for (; dart.notNull(pos) < dart.notNull(sParametersLen); pos = dart.notNull(pos) + 1) {
         if (!dart.notNull(isAssignable(getIndex(sParameterTypes, pos), getIndex(tParameterTypes, pos)))) {
           return false;
         }
       }
       let sPos = 0;
       let tPos = pos;
-      for (; dart.notNull(tPos) < dart.notNull(tParametersLen); dart.notNull(sPos)++, dart.notNull(tPos)++) {
+      for (; dart.notNull(tPos) < dart.notNull(tParametersLen); sPos = dart.notNull(sPos) + 1, tPos = dart.notNull(tPos) + 1) {
         if (!dart.notNull(isAssignable(getIndex(sOptionalParameterTypes, sPos), getIndex(tParameterTypes, tPos)))) {
           return false;
         }
       }
       tPos = 0;
-      for (; dart.notNull(tPos) < dart.notNull(tOptionalParametersLen); dart.notNull(sPos)++, dart.notNull(tPos)++) {
+      for (; dart.notNull(tPos) < dart.notNull(tOptionalParametersLen); sPos = dart.notNull(sPos) + 1, tPos = dart.notNull(tPos) + 1) {
         if (!dart.notNull(isAssignable(getIndex(sOptionalParameterTypes, sPos), getIndex(tOptionalParameterTypes, tPos)))) {
           return false;
         }
       }
     }
     let sNamedParameters = getField(s, `${_foreign_helper.JS_FUNCTION_TYPE_NAMED_PARAMETERS_TAG()}`);
     let tNamedParameters = getField(t, `${_foreign_helper.JS_FUNCTION_TYPE_NAMED_PARAMETERS_TAG()}`);
     return areAssignableMaps(sNamedParameters, tNamedParameters);
   }
   // Function invoke: (dynamic, dynamic) → dynamic
@@ skipping 277 matching lines @@
   exports.getIndex = getIndex;
   exports.getLength = getLength;
   exports.isJsArray = isJsArray;
   exports.hasField = hasField;
   exports.hasNoField = hasNoField;
   exports.isJsFunction = isJsFunction;
   exports.isJsObject = isJsObject;
   exports.isIdentical = isIdentical;
   exports.isNotIdentical = isNotIdentical;
 })(_js_helper || (_js_helper = {}));