Revert of Reland of Wrap typed array implementations in functions.

src/typedarray.js

 // Copyright 2013 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() {
-
 "use strict";
 
-%CheckIsBootstrapping();
+// This file relies on the fact that the following declaration has been made
+// in runtime.js:
+// var $Array = global.Array;
+var $ArrayBuffer = global.ArrayBuffer;
 
-var GlobalArray = global.Array;
-var GlobalArrayBuffer = global.ArrayBuffer;
 
 // --------------- Typed Arrays ---------------------
 macro TYPED_ARRAYS(FUNCTION)
 // arrayIds below should be synchronized with Runtime_TypedArrayInitialize.
 FUNCTION(1, Uint8Array, 1)
 FUNCTION(2, Int8Array, 1)
 FUNCTION(3, Uint16Array, 2)
 FUNCTION(4, Int16Array, 2)
 FUNCTION(5, Uint32Array, 4)
 FUNCTION(6, Int32Array, 4)
@@ skipping 49 matching lines @@
 }
 
 function NAMEConstructByLength(obj, length) {
   var l = IS_UNDEFINED(length) ?
     0 : ToPositiveInteger(length, "invalid_typed_array_length");
   if (l > %_MaxSmi()) {
     throw MakeRangeError("invalid_typed_array_length");
   }
   var byteLength = l * ELEMENT_SIZE;
   if (byteLength > %_TypedArrayMaxSizeInHeap()) {
-    var buffer = new GlobalArrayBuffer(byteLength);
+    var buffer = new $ArrayBuffer(byteLength);
     %_TypedArrayInitialize(obj, ARRAY_ID, buffer, 0, byteLength);
   } else {
     %_TypedArrayInitialize(obj, ARRAY_ID, null, 0, byteLength);
   }
 }
 
 function NAMEConstructByArrayLike(obj, arrayLike) {
   var length = arrayLike.length;
   var l = ToPositiveInteger(length, "invalid_typed_array_length");
 
@@ skipping 144 matching lines @@
         rightIndex >= leftIndex && targetPtr >= sourcePtr;
         rightIndex--) {
       target[offset + rightIndex] = source[rightIndex];
       targetPtr -= targetElementSize;
       sourcePtr -= sourceElementSize;
     }
     return rightIndex;
   }
   var rightIndex = CopyRightPart();
 
-  var temp = new GlobalArray(rightIndex + 1 - leftIndex);
+  var temp = new $Array(rightIndex + 1 - leftIndex);
   for (var i = leftIndex; i <= rightIndex; i++) {
     temp[i - leftIndex] = source[i];
   }
   for (i = leftIndex; i <= rightIndex; i++) {
     target[offset + i] = temp[i - leftIndex];
   }
 }
 
 function TypedArraySet(obj, offset) {
   var intOffset = IS_UNDEFINED(offset) ? 0 : TO_INTEGER(offset);
@@ skipping 36 matching lines @@
 
 function TypedArrayGetToStringTag() {
   if (!%IsTypedArray(this)) return;
   var name = %_ClassOf(this);
   if (IS_UNDEFINED(name)) return;
   return name;
 }
 
 // -------------------------------------------------------------------
 
+function SetupTypedArrays() {
 macro SETUP_TYPED_ARRAY(ARRAY_ID, NAME, ELEMENT_SIZE)
   %CheckIsBootstrapping();
   %SetCode(global.NAME, NAMEConstructor);
   %FunctionSetPrototype(global.NAME, new $Object());
 
   %AddNamedProperty(global.NAME, "BYTES_PER_ELEMENT", ELEMENT_SIZE,
                     READ_ONLY | DONT_ENUM | DONT_DELETE);
   %AddNamedProperty(global.NAME.prototype,
                     "constructor", global.NAME, DONT_ENUM);
   %AddNamedProperty(global.NAME.prototype,
                     "BYTES_PER_ELEMENT", ELEMENT_SIZE,
                     READ_ONLY | DONT_ENUM | DONT_DELETE);
   InstallGetter(global.NAME.prototype, "buffer", NAME_GetBuffer);
   InstallGetter(global.NAME.prototype, "byteOffset", NAME_GetByteOffset,
       DONT_ENUM | DONT_DELETE);
   InstallGetter(global.NAME.prototype, "byteLength", NAME_GetByteLength,
       DONT_ENUM | DONT_DELETE);
   InstallGetter(global.NAME.prototype, "length", NAME_GetLength,
       DONT_ENUM | DONT_DELETE);
   InstallGetter(global.NAME.prototype, symbolToStringTag,
                 TypedArrayGetToStringTag);
   InstallFunctions(global.NAME.prototype, DONT_ENUM, [
     "subarray", NAMESubArray,
     "set", TypedArraySet
   ]);
 endmacro
 
 TYPED_ARRAYS(SETUP_TYPED_ARRAY)
+}
+
+SetupTypedArrays();
 
 // --------------------------- DataView -----------------------------
 
 var $DataView = global.DataView;
 
 function DataViewConstructor(buffer, byteOffset, byteLength) { // length = 3
   if (%_IsConstructCall()) {
     if (!IS_ARRAYBUFFER(buffer)) {
       throw MakeTypeError('data_view_not_array_buffer', []);
     }
@@ skipping 87 matching lines @@
   }
   %DataViewSetTYPENAME(this,
                    ToPositiveDataViewOffset(offset),
                    TO_NUMBER_INLINE(value),
                    !!little_endian);
 }
 endmacro
 
 DATA_VIEW_TYPES(DATA_VIEW_GETTER_SETTER)
 
-// Setup the DataView constructor.
-%SetCode($DataView, DataViewConstructor);
-%FunctionSetPrototype($DataView, new $Object);
+function SetupDataView() {
+  %CheckIsBootstrapping();
 
-// Set up constructor property on the DataView prototype.
-%AddNamedProperty($DataView.prototype, "constructor", $DataView, DONT_ENUM);
-%AddNamedProperty(
-    $DataView.prototype, symbolToStringTag, "DataView", READ_ONLY|DONT_ENUM);
+  // Setup the DataView constructor.
+  %SetCode($DataView, DataViewConstructor);
+  %FunctionSetPrototype($DataView, new $Object);
 
-InstallGetter($DataView.prototype, "buffer", DataViewGetBufferJS);
-InstallGetter($DataView.prototype, "byteOffset", DataViewGetByteOffset);
-InstallGetter($DataView.prototype, "byteLength", DataViewGetByteLength);
+  // Set up constructor property on the DataView prototype.
+  %AddNamedProperty($DataView.prototype, "constructor", $DataView, DONT_ENUM);
+  %AddNamedProperty(
+      $DataView.prototype, symbolToStringTag, "DataView", READ_ONLY|DONT_ENUM);
 
-InstallFunctions($DataView.prototype, DONT_ENUM, [
-  "getInt8", DataViewGetInt8JS,
-  "setInt8", DataViewSetInt8JS,
+  InstallGetter($DataView.prototype, "buffer", DataViewGetBufferJS);
+  InstallGetter($DataView.prototype, "byteOffset", DataViewGetByteOffset);
+  InstallGetter($DataView.prototype, "byteLength", DataViewGetByteLength);
 
-  "getUint8", DataViewGetUint8JS,
-  "setUint8", DataViewSetUint8JS,
+  InstallFunctions($DataView.prototype, DONT_ENUM, [
+    "getInt8", DataViewGetInt8JS,
+    "setInt8", DataViewSetInt8JS,
 
-  "getInt16", DataViewGetInt16JS,
-  "setInt16", DataViewSetInt16JS,
+    "getUint8", DataViewGetUint8JS,
+    "setUint8", DataViewSetUint8JS,
 
-  "getUint16", DataViewGetUint16JS,
-  "setUint16", DataViewSetUint16JS,
+    "getInt16", DataViewGetInt16JS,
+    "setInt16", DataViewSetInt16JS,
 
-  "getInt32", DataViewGetInt32JS,
-  "setInt32", DataViewSetInt32JS,
+    "getUint16", DataViewGetUint16JS,
+    "setUint16", DataViewSetUint16JS,
 
-  "getUint32", DataViewGetUint32JS,
-  "setUint32", DataViewSetUint32JS,
+    "getInt32", DataViewGetInt32JS,
+    "setInt32", DataViewSetInt32JS,
 
-  "getFloat32", DataViewGetFloat32JS,
-  "setFloat32", DataViewSetFloat32JS,
+    "getUint32", DataViewGetUint32JS,
+    "setUint32", DataViewSetUint32JS,
 
-  "getFloat64", DataViewGetFloat64JS,
-  "setFloat64", DataViewSetFloat64JS
-]);
+    "getFloat32", DataViewGetFloat32JS,
+    "setFloat32", DataViewSetFloat32JS,
 
-})();
+    "getFloat64", DataViewGetFloat64JS,
+    "setFloat64", DataViewSetFloat64JS
+  ]);
+}
+
+SetupDataView();