Chromium Code Reviews| 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 af1e334cda68501fe3129ef5258929441c17377b..412f211c90f45fd8f313141ac666174c76b044d0 100644 |
| --- a/pkg/compiler/lib/src/js_emitter/old_emitter/emitter.dart |
| +++ b/pkg/compiler/lib/src/js_emitter/old_emitter/emitter.dart |
| @@ -181,6 +181,14 @@ class OldEmitter implements Emitter { |
| return '$initName.$global'; |
| } |
| + jsAst.PropertyAccess globalPropertyAccess(Element element) { |
| + String name = namer.getNameX(element); |
| + jsAst.PropertyAccess pa = new jsAst.PropertyAccess.field( |
| + new jsAst.VariableUse(namer.globalObjectFor(element)), |
| + name); |
| + return pa; |
| + } |
| + |
| jsAst.FunctionDeclaration get generateAccessorFunction { |
| const RANGE1_SIZE = RANGE1_LAST - RANGE1_FIRST + 1; |
| const RANGE2_SIZE = RANGE2_LAST - RANGE2_FIRST + 1; |
| @@ -646,7 +654,7 @@ class OldEmitter implements Emitter { |
| jsAst.Fun get lazyInitializerFunction { |
| String isolate = namer.currentIsolate; |
| jsAst.Expression cyclicThrow = |
| - namer.elementAccess(backend.getCyclicThrowHelper()); |
| + globalPropertyAccess(backend.getCyclicThrowHelper()); |
|
floitsch
2014/12/03 17:02:25
staticFunctionAccess
zarah
2014/12/05 08:22:51
Done.
|
| jsAst.Expression laziesAccess = |
| generateEmbeddedGlobalAccess(embeddedNames.LAZIES); |
| @@ -1043,7 +1051,7 @@ class OldEmitter implements Emitter { |
| // Since we pass the closurized version of the main method to |
| // the isolate method, we must make sure that it exists. |
| return js('function(a){ #(#, a); }', |
| - [namer.elementAccess(isolateMain), mainAccess]); |
| + [backend.emitter.globalPropertyAccess(isolateMain), mainAccess]); |
|
floitsch
2014/12/03 17:02:25
staticFunctionAccess
zarah
2014/12/05 08:22:51
Done.
|
| } |
| /** |
| @@ -1115,10 +1123,11 @@ class OldEmitter implements Emitter { |
| backend.isolateHelperLibrary.find(JavaScriptBackend.START_ROOT_ISOLATE); |
| mainCallClosure = buildIsolateSetupClosure(main, isolateMain); |
| } else if (compiler.hasIncrementalSupport) { |
| - mainCallClosure = |
| - js('function() { return #(); }', namer.elementAccess(main)); |
| + mainCallClosure = js( |
| + 'function() { return #(); }', |
| + backend.emitter.globalPropertyAccess(main)); |
|
floitsch
2014/12/03 17:02:25
staticFunctionAccess
zarah
2014/12/05 08:22:51
Done.
|
| } else { |
| - mainCallClosure = namer.elementAccess(main); |
| + mainCallClosure = backend.emitter.globalPropertyAccess(main); |
|
floitsch
2014/12/03 17:02:25
staticFunctionAccess
zarah
2014/12/05 08:22:51
Done.
|
| } |
| if (backend.needToInitializeIsolateAffinityTag) { |