Revert r16155: unit tests of the dart2js compiler fail.

sdk/lib/_internal/compiler/implementation/js_backend/emitter.dart

 // Copyright (c) 2012, 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 js_backend;
 
 /**
  * A function element that represents a closure call. The signature is copied
  * from the given element.
  */
@@ skipping 1838 matching lines @@
     compiler.codegenWorld.invokedNames.forEach(addNoSuchMethodHandlers);
     compiler.codegenWorld.invokedGetters.forEach(addNoSuchMethodHandlers);
     compiler.codegenWorld.invokedSetters.forEach(addNoSuchMethodHandlers);
   }
 
   String buildIsolateSetup(CodeBuffer buffer,
                            Element appMain,
                            Element isolateMain) {
     String mainAccess = "${namer.isolateAccess(appMain)}";
     String currentIsolate = "${namer.CURRENT_ISOLATE}";
+    String mainEnsureGetter = '';
     // Since we pass the closurized version of the main method to
     // the isolate method, we must make sure that it exists.
     if (!compiler.codegenWorld.staticFunctionsNeedingGetter.contains(appMain)) {
       Selector selector = new Selector.callClosure(0);
       String invocationName = "${namer.closureInvocationName(selector)}";
-      buffer.add("$mainAccess.$invocationName = $mainAccess");
+      mainEnsureGetter = "$mainAccess.$invocationName = $mainAccess";
     }
-    return "${namer.isolateAccess(isolateMain)}($mainAccess)";
+    // TODO(ngeoffray): These globals are currently required by the isolate
+    // library. They should be removed.
+    buffer.add("""
+var \$globalThis = $currentIsolate;
+var \$globalState;
+var \$globals;
+var \$isWorker = false;
+var \$supportsWorkers = false;
+var \$thisScriptUrl;
+function \$static_init(){};
+
+function \$initGlobals(context) {
+  context.isolateStatics = new ${namer.isolateName}();
+}
+function \$setGlobals(context) {
+  $currentIsolate = context.isolateStatics;
+  \$globalThis = $currentIsolate;
+}
+$mainEnsureGetter
+""");
+  return "${namer.isolateAccess(isolateMain)}($mainAccess)";
   }
 
   emitMain(CodeBuffer buffer) {
     if (compiler.isMockCompilation) return;
     Element main = compiler.mainApp.find(Compiler.MAIN);
     String mainCall = null;
-    if (compiler.hasIsolateSupport()) {
+    if (compiler.isolateHelperLibrary != null) {
       Element isolateMain =
         compiler.isolateHelperLibrary.find(Compiler.START_ROOT_ISOLATE);
       mainCall = buildIsolateSetup(buffer, main, isolateMain);
     } else {
       mainCall = '${namer.isolateAccess(main)}()';
     }
     if (!compiler.enableMinification) {
       buffer.add("""
 
 //
@@ skipping 176 matching lines @@
 """;
 const String HOOKS_API_USAGE = """
 // The code supports the following hooks:
 // dartPrint(message)   - if this function is defined it is called
 //                        instead of the Dart [print] method.
 // dartMainRunner(main) - if this function is defined, the Dart [main]
 //                        method will not be invoked directly.
 //                        Instead, a closure that will invoke [main] is
 //                        passed to [dartMainRunner].
 """;