[1.4>master] [MERGE #2308 @kunalspathak] Marshal result of ContructTrap

Merge pull request #2308 from kunalspathak:marshalbug

See: https://microsoft.visualstudio.com//defaultcollection/OS/_workItems?_a=edit&fullScreen=false&id=10057382&triage=true

Marshal the result returned by ConstructTrap.

lib/Runtime/Library/JavascriptProxy.cpp

@@ -1960,7 +1960,7 @@ namespace Js
         {
             functionResult = JavascriptFunction::CallFunction<true>(this, this->GetEntryPoint(), args);
         }
-        return functionResult;
+        return CrossSite::MarshalVar(scriptContext, functionResult);
     }
 
     Var JavascriptProxy::FunctionCallTrap(RecyclableObject* function, CallInfo callInfo, ...)

test/es6/proxybug.js

@@ -1,73 +1,100 @@
-//-------------------------------------------------------------------------------------------------------
-// Copyright (C) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
-//-------------------------------------------------------------------------------------------------------
-
-var passed = true;
-
-function test1() {
-  var sc4 = WScript.LoadScript('function test(){ obj2.prop4 = {needMarshal:true}; }', 'samethread');
-  var obj1 = new Proxy({}, { set: function (target, property, value) { Reflect.set(value); } })
-  sc4.obj2 = obj1;
-  sc4.test();
-  obj1.prop4 = { needMarshal: false };
-  obj1.prop5 = { needMarshal: false };
-};
-test1();
-
-
-function test2() {
-  var bug = new Proxy(new Array(1), { has: () => true });
-  var a = bug.concat();
-  if (a[0] !== undefined || a.length !== 1) {
-    passed = false;
-  } else {
-    passed &= true;
-  }
-}
-test2();
-
-function test3() {
-  var obj1 = {};
-  var arrObj0 = {};
-  var x = 1
-  var proxyHandler = {};
-  proxyHandler['get'] = function () { };
-  proxyHandler['defineProperty'] = function (target, property, descriptor) {
-    return Reflect.defineProperty(target, property, descriptor);
-  };
-  proxyHandler['isExtensible'] = function (target) {
-    arrObj0.prop0;
-    arrObj0 = new Proxy(arrObj0, proxyHandler);
-    return Reflect.isExtensible(target);
-  };
-  arrObj0 = new Proxy(arrObj0, proxyHandler);
-  arrObj0 = new Proxy(arrObj0, proxyHandler);
-  do {
-    var sc3 = WScript.LoadScript('function test(){arrObj0.length = arrObj0[obj1];}', 'samethread');
-    sc3.obj1 = obj1;
-    sc3.arrObj0 = arrObj0;
-    sc3.test();
-  } while (x--);
-}
-test3();
-
-function test4() {
-  var func3 = function () { };
-  var ary = Array();
-  var proxyHandler = {};
-  var ownkeys = Reflect.ownKeys(ary);
-  proxyHandler['ownKeys'] = function () {
-    func3() == 0;
-    return ownkeys;
-  };
-
-  ary = new Proxy(ary, proxyHandler);
-  var sc2 = WScript.LoadScript('function test(){for (var x in ary);}', 'samethread');
-  sc2.ary = ary;
-  sc2.func3 = func3;
-  sc2.test();
-}
-test4();
-
-print(passed ? "passed" : "failed");
+//-------------------------------------------------------------------------------------------------------
+// Copyright (C) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
+//-------------------------------------------------------------------------------------------------------
+
+var passed = true;
+
+function test1() {
+  var sc4 = WScript.LoadScript('function test(){ obj2.prop4 = {needMarshal:true}; }', 'samethread');
+  var obj1 = new Proxy({}, { set: function (target, property, value) { Reflect.set(value); } })
+  sc4.obj2 = obj1;
+  sc4.test();
+  obj1.prop4 = { needMarshal: false };
+  obj1.prop5 = { needMarshal: false };
+};
+test1();
+
+
+function test2() {
+  var bug = new Proxy(new Array(1), { has: () => true });
+  var a = bug.concat();
+  if (a[0] !== undefined || a.length !== 1) {
+    passed = false;
+  } else {
+    passed &= true;
+  }
+}
+test2();
+
+function test3() {
+  var obj1 = {};
+  var arrObj0 = {};
+  var x = 1
+  var proxyHandler = {};
+  proxyHandler['get'] = function () { };
+  proxyHandler['defineProperty'] = function (target, property, descriptor) {
+    return Reflect.defineProperty(target, property, descriptor);
+  };
+  proxyHandler['isExtensible'] = function (target) {
+    arrObj0.prop0;
+    arrObj0 = new Proxy(arrObj0, proxyHandler);
+    return Reflect.isExtensible(target);
+  };
+  arrObj0 = new Proxy(arrObj0, proxyHandler);
+  arrObj0 = new Proxy(arrObj0, proxyHandler);
+  do {
+    var sc3 = WScript.LoadScript('function test(){arrObj0.length = arrObj0[obj1];}', 'samethread');
+    sc3.obj1 = obj1;
+    sc3.arrObj0 = arrObj0;
+    sc3.test();
+  } while (x--);
+}
+test3();
+
+function test4() {
+  var func3 = function () { };
+  var ary = Array();
+  var proxyHandler = {};
+  var ownkeys = Reflect.ownKeys(ary);
+  proxyHandler['ownKeys'] = function () {
+    func3() == 0;
+    return ownkeys;
+  };
+
+  ary = new Proxy(ary, proxyHandler);
+  var sc2 = WScript.LoadScript('function test(){for (var x in ary);}', 'samethread');
+  sc2.ary = ary;
+  sc2.func3 = func3;
+  sc2.test();
+}
+test4();
+
+
+function test5() {
+  function makeArrayLength() {
+  }
+  function leaf() {
+  }
+  var obj1 = {};
+  var arrObj0 = {};
+  var func1 = function () {
+  };
+  obj1.method0 = func1;
+  obj1.method1 = func1;
+  var protoObj1 = Object();
+  var proxyHandler = {};
+  var v0 = new Proxy(obj1.method0, proxyHandler);
+  var sc9 = WScript.LoadScript('', 'samethread');
+  sc9.arrObj0 = arrObj0;
+  sc9.obj1 = obj1;
+  sc9.protoObj1 = protoObj1;
+  sc9.v0 = v0;
+  sc9.makeArrayLength = makeArrayLength;
+  sc9.leaf = leaf;
+  var sc9_cctx = sc9.WScript.LoadScript('function test() {var b = 1; arrObj0.length= makeArrayLength((arrObj0.length != arrObj0.prop4));\n       var d = obj1.method1.call(protoObj1 , (((new v0((protoObj1.length >>>= -866043558),(protoObj1.prop0 = 1),leaf,leaf)) , (b ? 1 : 16678541)) & (typeof(arrObj0.prop4)  == \'number\') ), ((1) * (d %= (1 * obj1.length - b)) + obj1.method0.call(arrObj0 , ("a" instanceof ((typeof RegExp == \'function\' ) ? RegExp : Object)), (\'prop0\' in arrObj0), leaf, leaf)), leaf, leaf);\n       var uniqobj21 = Object.create(arrObj0);\n       arrObj0.length= makeArrayLength(((1 ) % -520343586));\n       ;\n       }');
+  sc9_cctx.test();
+}
+test5();
+
+print(passed ? "passed" : "failed");