Rename JS_CURRENT_ISOLATE to JS_CURRENT_ISOLATE_CONTEXT.

dart/sdk/lib/_internal/compiler/implementation/lib/js_helper.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.
 
 library _js_helper;
 
 import 'dart:collection';
 import 'dart:_foreign_helper' show DART_CLOSURE_TO_JS,
                                    JS,
                                    JS_CALL_IN_ISOLATE,
                                    JS_CURRENT_ISOLATE,
+                                   JS_CURRENT_ISOLATE_CONTEXT,
                                    JS_DART_OBJECT_CONSTRUCTOR,
+                                   JS_OPERATOR_AS_PREFIX,
                                    JS_OPERATOR_IS_PREFIX,
-                                   JS_OPERATOR_AS_PREFIX,
                                    RAW_DART_FUNCTION_REF;
 import 'dart:_interceptors';
 import "dart:_collection-dev" as _symbol_dev;
 
 part 'constant_map.dart';
 part 'native_helper.dart';
 part 'regexp_helper.dart';
 part 'string_helper.dart';
 part 'js_rti.dart';
 
@@ skipping 556 matching lines @@
 
   static getConstructor(String className) {
     // TODO(ahe): Generalize this and improve test coverage of
     // reflecting on intercepted classes.
     if (JS('bool', '# == "String"', className)) return const JSString();
     if (JS('bool', '# == "int"', int)) return const JSInt();
     if (JS('bool', '# == "double"', int)) return const JSDouble();
     if (JS('bool', '# == "num"', int)) return const JSNumber();
     if (JS('bool', '# == "bool"', int)) return const JSBool();
     if (JS('bool', '# == "List"', int)) return const JSArray();
-    // TODO(ahe): How to safely access $?
-    return JS('var', r'$[#]', className);
+    return JS('var', '#[#]', JS_CURRENT_ISOLATE(), className);
   }
 
   static bool identicalImplementation(a, b) {
     return JS('bool', '# == null', a)
       ? JS('bool', '# == null', b)
       : JS('bool', '# === #', a, b);
   }
 }
 
 /**
@@ skipping 334 matching lines @@
   // compiler and/or minifier.
   function = JS('var',
                 r'(function ($2, $3) {'
                     r' return function($0, $1) { '
                         r'return $3(#, $2, #, $0, $1) }})(#, #)',
                 closure,
                 arity,
                 // Capture the current isolate now.  Remember that "#"
                 // in JS is simply textual substitution of compiled
                 // expressions.
-                JS_CURRENT_ISOLATE(),
+                JS_CURRENT_ISOLATE_CONTEXT(),
                 DART_CLOSURE_TO_JS(invokeClosure));
 
   JS('void', r'#.$identity = #', closure, function);
   return function;
 }
 
 /**
  * Super class for Dart closures.
  */
 class Closure implements Function {
@@ skipping 458 matching lines @@
                               expectedArgumentNames);
 }
 
 /**
  * Called by generated code when a static field's initializer references the
  * field that is currently being initialized.
  */
 void throwCyclicInit(String staticName) {
   throw new RuntimeError("Cyclic initialization for static $staticName");
 }