Revert of Use ES2015-style TypedArray prototype chain

test/mjsunit/es6/classes-subclass-builtins.js

 // Copyright 2015 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.
 
 // Flags: --allow-natives-syntax --harmony-reflect --harmony-regexp-subclass
 // Flags: --expose-gc --strong-mode
 
 "use strict";
 
 
@@ skipping 331 matching lines @@
   assertEquals(4.2, o.d);
   assertEquals(153, o.o.foo);
 
   var o1 = new A(7);
   assertTrue(%HaveSameMap(o, o1));
 
   gc();
 })();
 
 
-(function TestArraySubclassing() {
-  class A extends Array {
+function TestArraySubclassing(array) {
+  class A extends array {
     constructor(...args) {
       assertFalse(new.target === undefined);
       super(...args);
       this.a = 42;
       this.d = 4.2;
       this.o = {foo:153};
     }
   }
 
-  var o = new Array(13);
+  var o = new array(13);
   assertTrue(o instanceof Object);
-  assertTrue(o instanceof Array);
+  assertTrue(o instanceof array);
   assertEquals("object", typeof o);
-  checkPrototypeChain(o, [Array, Object]);
+  checkPrototypeChain(o, [array, Object]);
   assertEquals(13, o.length);
 
   var o = new A(10);
   assertTrue(o instanceof Object);
-  assertTrue(o instanceof Array);
+  assertTrue(o instanceof array);
   assertTrue(o instanceof A);
   assertEquals("object", typeof o);
-  checkPrototypeChain(o, [A, Array, Object]);
+  checkPrototypeChain(o, [A, array, Object]);
   assertEquals(10, o.length);
   assertEquals(42, o.a);
   assertEquals(4.2, o.d);
   assertEquals(153, o.o.foo);
 
   var o1 = new A(7);
   assertTrue(%HaveSameMap(o, o1));
-})();
-
-
-var TypedArray = Uint8Array.__proto__;
-
-function TestTypedArraySubclassing(array) {
-  class A extends array {
-    constructor(...args) {
-      assertFalse(new.target === undefined);
-      super(...args);
-      this.a = 42;
-      this.d = 4.2;
-      this.o = {foo:153};
-    }
-  }
-
-  var o = new array(13);
-  assertTrue(o instanceof Object);
-  assertTrue(o instanceof TypedArray);
-  assertTrue(o instanceof array);
-  assertEquals("object", typeof o);
-  checkPrototypeChain(o, [array, TypedArray, Object]);
-  assertEquals(13, o.length);
-
-  var o = new A(10);
-  assertTrue(o instanceof Object);
-  assertTrue(o instanceof TypedArray);
-  assertTrue(o instanceof array);
-  assertTrue(o instanceof A);
-  assertEquals("object", typeof o);
-  checkPrototypeChain(o, [A, array, TypedArray, Object]);
-  assertEquals(10, o.length);
-  assertEquals(42, o.a);
-  assertEquals(4.2, o.d);
-  assertEquals(153, o.o.foo);
-
-  var o1 = new A(7);
-  assertTrue(%HaveSameMap(o, o1));
 }
 
 
 (function() {
-  TestTypedArraySubclassing(Int8Array);
-  TestTypedArraySubclassing(Uint8Array);
-  TestTypedArraySubclassing(Uint8ClampedArray);
-  TestTypedArraySubclassing(Int16Array);
-  TestTypedArraySubclassing(Uint16Array);
-  TestTypedArraySubclassing(Int32Array);
-  TestTypedArraySubclassing(Uint32Array);
-  TestTypedArraySubclassing(Float32Array);
-  TestTypedArraySubclassing(Float64Array);
+  TestArraySubclassing(Array);
+  TestArraySubclassing(Int8Array);
+  TestArraySubclassing(Uint8Array);
+  TestArraySubclassing(Uint8ClampedArray);
+  TestArraySubclassing(Int16Array);
+  TestArraySubclassing(Uint16Array);
+  TestArraySubclassing(Int32Array);
+  TestArraySubclassing(Uint32Array);
+  TestArraySubclassing(Float32Array);
+  TestArraySubclassing(Float64Array);
 })();
 
 
 function TestMapSetSubclassing(container, is_map) {
   var keys = [{name: "banana"}, {name: "cow"}, {name: "orange"}, {name: "chicken"}, {name: "apple"}];
 
   class A extends container {
     constructor(...args) {
       assertFalse(new.target === undefined);
       super(...args);
@@ skipping 503 matching lines @@
 
   Object.defineProperty(pattern, Symbol.match, {
     get() { log.push("match"); f.prototype = p2; return false; }});
 
   var o = Reflect.construct(RegExp, [pattern], f);
   assertEquals(["match", "tostring"], log);
   assertEquals(/biep/, o);
   assertTrue(o.__proto__ === p2);
   assertTrue(f.prototype === p3);
 })();