| Index: pkg/compiler/lib/src/js_emitter/old_emitter/emitter.dart
|
| diff --git a/pkg/compiler/lib/src/js_emitter/old_emitter/emitter.dart b/pkg/compiler/lib/src/js_emitter/old_emitter/emitter.dart
|
| index bb2f2b2aa991b4c9480a7f19d0deb7b313bae4a1..bf3a7b9479cdbbfe863356f9d0f1674a03e16512 100644
|
| --- a/pkg/compiler/lib/src/js_emitter/old_emitter/emitter.dart
|
| +++ b/pkg/compiler/lib/src/js_emitter/old_emitter/emitter.dart
|
| @@ -733,12 +733,14 @@ class OldEmitter implements Emitter {
|
| }
|
|
|
| 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) {
|
| @@ -878,6 +880,8 @@ class OldEmitter implements Emitter {
|
| if (#outputContainsConstantList) {
|
| Isolate.#makeConstListProperty = oldIsolate.#makeConstListProperty;
|
| }
|
| + Isolate.#functionThatReturnsNullProperty =
|
| + oldIsolate.#functionThatReturnsNullProperty;
|
| if (#hasIncrementalSupport) {
|
| Isolate.#lazyInitializerProperty =
|
| oldIsolate.#lazyInitializerProperty;
|
| @@ -895,6 +899,8 @@ class OldEmitter implements Emitter {
|
| 'isolatePropertiesName': namer.isolatePropertiesName,
|
| 'outputContainsConstantList': task.outputContainsConstantList,
|
| 'makeConstListProperty': makeConstListProperty,
|
| + 'functionThatReturnsNullProperty':
|
| + backend.rti.getFunctionThatReturnsNullName,
|
| 'hasIncrementalSupport': compiler.hasIncrementalSupport,
|
| 'lazyInitializerProperty': lazyInitializerProperty,});
|
| }
|
|
|