Use import/export for more functions (instead of js builtins object).

src/debug/mirrors.js

 // Copyright 2006-2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 (function(global, utils) {
 "use strict";
 
 // ----------------------------------------------------------------------------
 // Imports
 
+var ErrorToString;
 var FunctionSourceString;
 var GlobalArray = global.Array;
 var IsNaN = global.isNaN;
 var JSONStringify = global.JSON.stringify;
+var MapEntries;
+var MapIteratorNext;
 var MathMin = global.Math.min;
 var promiseStatusSymbol = utils.ImportNow("promise_status_symbol");
 var promiseValueSymbol = utils.ImportNow("promise_value_symbol");
+var SetIteratorNext;
+var SetValues;
 var SymbolToString;
 
 utils.Import(function(from) {
+  ErrorToString = from.ErrorToString;
   FunctionSourceString = from.FunctionSourceString;
+  MapEntries = from.MapEntries;
+  MapIteratorNext = from.MapIteratorNext;
+  SetIteratorNext = from.SetIteratorNext;
+  SetValues = from.SetValues;
   SymbolToString = from.SymbolToString;
 });
 
 // ----------------------------------------------------------------------------
 
 // Mirror hierarchy:
 // - Mirror
 //   - ValueMirror
 //     - UndefinedMirror
 //     - NullMirror
@@ skipping 1259 matching lines @@
  */
 ErrorMirror.prototype.message = function() {
   return this.value_.message;
 };
 
 
 ErrorMirror.prototype.toText = function() {
   // Use the same text representation as in messages.js.
   var text;
   try {
-    text = %_CallFunction(this.value_, builtins.$errorToString);
+    text = %_CallFunction(this.value_, ErrorToString);
   } catch (e) {
     text = '#<Error>';
   }
   return text;
 };
 
 
 /**
  * Mirror object for a Promise object.
  * @param {Object} value The Promise object
@@ skipping 49 matching lines @@
     var entries = %GetWeakMapEntries(this.value_, opt_limit || 0);
     for (var i = 0; i < entries.length; i += 2) {
       result.push({
         key: entries[i],
         value: entries[i + 1]
       });
     }
     return result;
   }
 
-  var iter = %_CallFunction(this.value_, builtins.$mapEntries);
+  var iter = %_CallFunction(this.value_, MapEntries);
   var next;
   while ((!opt_limit || result.length < opt_limit) &&
          !(next = iter.next()).done) {
     result.push({
       key: next.value[0],
       value: next.value[1]
     });
   }
   return result;
 };
@@ skipping 21 matching lines @@
  * This will keep elements alive for WeakSets.
  *
  * @param {number=} opt_limit Max elements to return.
  * @returns {Array.<Object>} Array of elements of a set.
  */
 SetMirror.prototype.values = function(opt_limit) {
   if (IS_WEAKSET(this.value_)) {
     return %GetWeakSetValues(this.value_, opt_limit || 0);
   }
 
-  var iter = %_CallFunction(this.value_, builtins.$setValues);
-  return IteratorGetValues_(iter, builtins.$setIteratorNext, opt_limit);
+  var iter = %_CallFunction(this.value_, SetValues);
+  return IteratorGetValues_(iter, SetIteratorNext, opt_limit);
 };
 
 
 function IteratorMirror(value) {
   %_CallFunction(this, value, MirrorType.ITERATOR_TYPE, ObjectMirror);
 }
 inherits(IteratorMirror, ObjectMirror);
 
 
 /**
  * Returns a preview of elements of an iterator.
  * Does not change the backing iterator state.
  *
  * @param {number=} opt_limit Max elements to return.
  * @returns {Array.<Object>} Array of elements of an iterator.
  */
 IteratorMirror.prototype.preview = function(opt_limit) {
   if (IS_MAP_ITERATOR(this.value_)) {
     return IteratorGetValues_(%MapIteratorClone(this.value_),
-                              builtins.$mapIteratorNext,
+                              MapIteratorNext,
                               opt_limit);
   } else if (IS_SET_ITERATOR(this.value_)) {
     return IteratorGetValues_(%SetIteratorClone(this.value_),
-                              builtins.$setIteratorNext,
+                              SetIteratorNext,
                               opt_limit);
   }
 };
 
 
 /**
  * Mirror object for a Generator object.
  * @param {Object} data The Generator object
  * @constructor
  * @extends Mirror
@@ skipping 1661 matching lines @@
 // Functions needed by the debugger runtime.
 utils.InstallFunctions(utils, DONT_ENUM, [
   "ClearMirrorCache", ClearMirrorCache
 ]);
 
 // Export to debug.js
 utils.Export(function(to) {
   to.MirrorType = MirrorType;
 });
 })