dart2js: Move functionThatReturnsNull to Isolate.

pkg/compiler/lib/src/js_emitter/old_emitter/emitter.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 part of dart2js.js_emitter;
 
 
 class OldEmitter implements Emitter {
   final Compiler compiler;
   final CodeEmitterTask task;
@@ skipping 715 matching lines @@
             list.fixed$length = Array;
             return list;
           }''',
           [namer.isolateName, makeConstListProperty]);
     } else {
       return js.comment("Output contains no constant list.");
     }
   }
 
   jsAst.Statement buildFunctionThatReturnsNull() {
-    return js.statement('# = function() {}',
-                        [backend.rti.getFunctionThatReturnsNullName]);
+    return js.statement('#.# = function() {}',
+                        [namer.isolateName,
+                         backend.rti.getFunctionThatReturnsNullName]);
   }
 
   jsAst.Expression generateFunctionThatReturnsNull() {
-    return js("#", [backend.rti.getFunctionThatReturnsNullName]);
+    return js("#.#", [namer.isolateName,
+                      backend.rti.getFunctionThatReturnsNullName]);
   }
 
   buildMain(jsAst.Statement invokeMain) {
     if (compiler.isMockCompilation) return js.comment("Mock compilation");
 
     List<jsAst.Statement> parts = <jsAst.Statement>[];
 
     if (NativeGenerator.needsIsolateAffinityTagInitialization(backend)) {
       parts.add(
           NativeGenerator.generateIsolateAffinityTagInitialization(
@@ skipping 119 matching lines @@
               var lazyInitName = lazies[lazyInitializers[i]];
               this[lazyInitName] = isolateProperties[lazyInitName];
             }
           }
           Isolate.prototype = oldIsolate.prototype;
           Isolate.prototype.constructor = Isolate;
           Isolate.#isolatePropertiesName = isolateProperties;
           if (#outputContainsConstantList) {
             Isolate.#makeConstListProperty = oldIsolate.#makeConstListProperty;
           }
+          Isolate.#functionThatReturnsNullProperty =
+              oldIsolate.#functionThatReturnsNullProperty;
           if (#hasIncrementalSupport) {
             Isolate.#lazyInitializerProperty =
                 oldIsolate.#lazyInitializerProperty;
           }
           return Isolate;
       }
 
       }''', {'allClasses': allClassesAccess,
             'getTypeFromName': getTypeFromNameAccess,
             'interceptorsByTag': interceptorsByTagAccess,
             'leafTags': leafTagsAccess,
             'finishedClasses': finishedClassesAccess,
             'needsLazyInitializer': needsLazyInitializer,
             'lazies': laziesAccess, 'cyclicThrow': cyclicThrow,
             'isolatePropertiesName': namer.isolatePropertiesName,
             'outputContainsConstantList': task.outputContainsConstantList,
             'makeConstListProperty': makeConstListProperty,
+            'functionThatReturnsNullProperty':
+                backend.rti.getFunctionThatReturnsNullName,
             'hasIncrementalSupport': compiler.hasIncrementalSupport,
             'lazyInitializerProperty': lazyInitializerProperty,});
   }
 
   jsAst.Statement buildConvertToFastObjectFunction() {
     List<jsAst.Statement> debugCode = <jsAst.Statement>[];
     if (DEBUG_FAST_OBJECTS) {
       debugCode.add(js.statement(r'''
         // The following only works on V8 when run with option
         // "--allow-natives-syntax".  We use'new Function' because the
@@ skipping 1094 matching lines @@
     for (Element element in compiler.enqueuer.codegen.newlyEnqueuedElements) {
       if (element.isInstanceMember) {
         cachedClassBuilders.remove(element.enclosingClass);
 
         nativeEmitter.cachedBuilders.remove(element.enclosingClass);
 
       }
     }
   }
 }