[MERGE #5435 @atulkatti] MSFT:15450950 Remove special code to marshal TypedArray's ArrayBuffer. The default behavior does the right thing.

Merge pull request #5435 from atulkatti:Bug15450950.ArrayBufferMarshalling.1

Author: Atul Katti

lib/Runtime/Library/TypedArray.h

@@ -221,26 +221,7 @@ namespace Js
     {
     protected:
         DEFINE_VTABLE_CTOR(TypedArray, TypedArrayBase);
-        virtual void MarshalToScriptContext(Js::ScriptContext * scriptContext)
-        {
-            Assert(this->GetScriptContext() != scriptContext);
-            AssertMsg(VirtualTableInfo<TypedArray>::HasVirtualTable(this), "Derived class need to define marshal to script context");
-
-            VirtualTableInfo<Js::CrossSiteObject<TypedArray<TypeName, clamped, virtualAllocated>>>::SetVirtualTable(this);
-            ArrayBufferBase* arrayBuffer = this->GetArrayBuffer();
-            if (arrayBuffer && !arrayBuffer->IsCrossSiteObject())
-            {
-                arrayBuffer->MarshalToScriptContext(scriptContext);
-            }
-        }
-
-#if ENABLE_TTD
-        virtual void MarshalCrossSite_TTDInflate()
-        {
-            AssertMsg(VirtualTableInfo<TypedArray>::HasVirtualTable(this), "Derived class need to define marshal");
-            VirtualTableInfo<Js::CrossSiteObject<TypedArray<TypeName, clamped, virtualAllocated>>>::SetVirtualTable(this);
-        }
-#endif
+        DEFINE_MARSHAL_OBJECT_TO_SCRIPT_CONTEXT(TypedArray);
 
         TypedArray(DynamicType *type): TypedArrayBase(nullptr, 0, 0, sizeof(TypeName), type) { buffer = nullptr; }
 

test/typedarray/CrossSiteVirtual.js

@@ -3,11 +3,34 @@
 // Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
 //-------------------------------------------------------------------------------------------------------
 
-function foo( type )
+function foo(type)
 {
-    var g = WScript.LoadScript("a = new " + type + "(16777216);", "samethread");
+    var arrBuffer = new ArrayBuffer(16);
+    var arr = new this[type](arrBuffer);
+    var g = WScript.LoadScript("a = new " + type + "(16777216);" + `
+    function arrayBufferTest1(arr2) { 
+        var buf = arr2.buffer; 
+        var name = buf.constructor.name; 
+    }` + `
+    function arrayBufferTest2(type, arrBuffer2) { 
+        var arr2 = new this[type](arrBuffer2);
+        var buf = arr2.buffer; 
+        var name = buf.constructor.name; 
+    }` + `
+    function arrayBufferTest3(type, arr3) { 
+        var arrBuffer3 = new ArrayBuffer(16);
+        arr3 = new this[type](arrBuffer3);
+        var buf = arr3.buffer; 
+        var name = buf.constructor.name; 
+    }`, "samethread");
     g.a[0] = 0;
     g.a[0];
+
+    // Test to make sure the TypedArray's underlying ArrayBuffer gets marshalled correctly along with it's prototype chain.
+    g.arrayBufferTest1(arr);
+    g.arrayBufferTest2(type, arrBuffer);
+    var arr3;
+    g.arrayBufferTest3(type, arr3);
 }
 
 foo("Int8Array");