[MERGE chakra-core#2456 @MikeHolman] add missing copy on access conversion for GetItemSetter

MikeHolman · MikeHolman · commit 6c17206486cb · 2017-02-07T12:11:53.000-08:00
Merge pull request chakra-core#2456 from MikeHolman:copyonaccessreflectset
diff --git a/lib/Runtime/Library/JavascriptArray.cpp b/lib/Runtime/Library/JavascriptArray.cpp
@@ -2826,6 +2826,16 @@ namespace Js
         return GetType()->GetLibrary()->GetUndefined();
     }
 
+    DescriptorFlags JavascriptNativeIntArray::GetItemSetter(uint32 index, Var* setterValue, ScriptContext* requestContext)
+    {
+#if ENABLE_COPYONACCESS_ARRAY
+        JavascriptLibrary::CheckAndConvertCopyOnAccessNativeIntArray<Var>(this);
+#endif 
+        int32 value = 0;
+        return this->DirectGetItemAt(index, &value) ? WritableData : None;
+    }
+
+
     Var JavascriptNativeFloatArray::DirectGetItem(uint32 index)
     {
         SparseArraySegment<double> *seg = (SparseArraySegment<double>*)this->GetLastUsedSegment();
diff --git a/lib/Runtime/Library/JavascriptArray.h b/lib/Runtime/Library/JavascriptArray.h
@@ -959,11 +959,7 @@ namespace Js
         virtual BOOL DirectGetVarItemAt(uint index, Var* outval, ScriptContext *scriptContext);
         virtual BOOL DirectGetItemAtFull(uint index, Var* outVal);
         virtual Var DirectGetItem(uint32 index);
-        virtual DescriptorFlags GetItemSetter(uint32 index, Var* setterValue, ScriptContext* requestContext) override
-        {
-            int32 value = 0;
-            return this->DirectGetItemAt(index, &value) ? WritableData : None;
-        }
+        virtual DescriptorFlags GetItemSetter(uint32 index, Var* setterValue, ScriptContext* requestContext) override;
 
         virtual BOOL SetItem(uint32 index, Var value, PropertyOperationFlags flags) override;
         virtual BOOL DeleteItem(uint32 index, PropertyOperationFlags flags) override;
diff --git a/test/Array/CopyOnAccessArray_bugs.baseline b/test/Array/CopyOnAccessArray_bugs.baseline
@@ -30,6 +30,8 @@ PASSED
 PASSED
 *** Running test #12 (11): Reflect.defineProperty
 PASSED
-*** Running test #13 (12): Array.of
+*** Running test #13 (12): Reflect.set
 PASSED
-Summary of tests: total executed: 13; passed: 13; failed: 0
+*** Running test #14 (13): Array.of
+PASSED
+Summary of tests: total executed: 14; passed: 14; failed: 0
diff --git a/test/Array/CopyOnAccessArray_bugs.js b/test/Array/CopyOnAccessArray_bugs.js
@@ -128,6 +128,14 @@ var tests = [
             assert.areEqual(b.length, 0, "Setting length property to 0");
         }
     },
+    {
+        name: "Reflect.set",
+        body: function ()
+        {
+            assert.isTrue(Reflect.set([1950, 1960, 1970, 1980, 1990], "0", 1), "Should be able to set property on int array");
+            assert.isTrue(Reflect.set([1950, 1960.1, 1970, 1980, 1990], "0", 1), "Should be able to set property on float array");
+        }
+    },
     {
         name: "Array.of",
         body: function ()
