Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(410)

Unified Diff: pkg/compiler/lib/src/js_emitter/old_emitter/emitter.dart

Issue 1224693004: dart2js: Move functionThatReturnsNull to Isolate. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: copy over property on isolate creation Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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,});
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698