add ArrayOperations.GetAll

sebastienros · Jul 22, 2019 · 0f29b4e · 0f29b4e
1 parent c7c2770
commit 0f29b4e
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 14 deletions.
diff --git a/Jint/Native/Array/ArrayInstance.cs b/Jint/Native/Array/ArrayInstance.cs
@@ -13,7 +13,7 @@ public class ArrayInstance : ObjectInstance
         private const int MaxDenseArrayLength = 1024 * 10;
 
         // we have dense and sparse, we usually can start with dense and fall back to sparse when necessary
-        private PropertyDescriptor[] _dense;
+        internal PropertyDescriptor[] _dense;
         private Dictionary<uint, PropertyDescriptor> _sparse;
 
         public ArrayInstance(Engine engine, uint capacity = 0) : base(engine, objectClass: "Array")
@@ -353,6 +353,11 @@ protected override bool TryGetProperty(in Key propertyName, out PropertyDescript
 
         public override PropertyDescriptor GetOwnProperty(in Key propertyName)
         {
+            if (propertyName == KnownKeys.Length)
+            {
+                return _length ?? PropertyDescriptor.Undefined;
+            }
+
             if (IsArrayIndex(propertyName, out var index))
             {
                 if (TryGetDescriptor(index, out var result))
@@ -363,11 +368,6 @@ public override PropertyDescriptor GetOwnProperty(in Key propertyName)
                 return PropertyDescriptor.Undefined;
             }
 
-            if (propertyName == KnownKeys.Length)
-            {
-                return _length ?? PropertyDescriptor.Undefined;
-            }
-
             return base.GetOwnProperty(propertyName);
         }
 

diff --git a/Jint/Native/Array/ArrayPrototype.cs b/Jint/Native/Array/ArrayPrototype.cs
@@ -1272,6 +1272,18 @@ internal abstract class ArrayOperations
 
             public abstract JsValue Get(ulong index);
 
+            public virtual JsValue[] GetAll()
+            {
+                var n = (int) GetLength();
+                var jsValues = new JsValue[n];
+                for (uint i = 0; i < (uint) jsValues.Length; i++)
+                {
+                    jsValues[i] = Get(i);
+                }
+
+                return jsValues;
+            }
+
             public abstract bool TryGetValue(ulong index, out JsValue value);
 
             public abstract void Put(ulong index, JsValue value, bool throwOnError);
@@ -1432,6 +1444,31 @@ public override bool TryGetValue(ulong index, out JsValue value)
 
                 public override JsValue Get(ulong index) => _array.Get((uint) index);
 
+                public override JsValue[] GetAll()
+                {
+                    var n = _array.Length;
+
+                    if (_array._dense == null || _array._dense.Length < n)
+                    {
+                        return base.GetAll();
+                    }
+
+                    // optimized
+                    var jsValues = new JsValue[n];
+                    for (uint i = 0; i < (uint) jsValues.Length; i++)
+                    {
+                        var prop = _array._dense[i] ?? PropertyDescriptor.Undefined;
+                        if (prop == PropertyDescriptor.Undefined)
+                        {
+                            prop = _array.Prototype?.GetProperty(TypeConverter.ToString(i)) ?? PropertyDescriptor.Undefined;
+                        }
+
+                        jsValues[i] = _array.UnwrapJsValue(prop);
+                    }
+
+                    return jsValues;
+                }
+
                 public override void DeleteAt(ulong index) => _array.DeleteAt((uint) index);
 
                 public override void Put(ulong index, JsValue value, bool throwOnError) => _array.SetIndexValue((uint) index, value, throwOnError);

diff --git a/Jint/Native/Function/FunctionPrototype.cs b/Jint/Native/Function/FunctionPrototype.cs
@@ -102,16 +102,9 @@ private JsValue Apply(JsValue thisObject, JsValue[] arguments)
 
             var argArrayObj = argArray as ObjectInstance ?? ExceptionHelper.ThrowTypeError<ObjectInstance>(Engine);
             var operations = ArrayPrototype.ArrayOperations.For(argArrayObj);
-
-            var n = (int) operations.GetLength();
-            var argList = _engine._jsValueArrayPool.RentArray(n);
-            for (uint i = 0; i < argList.Length; i++)
-            {
-                argList[i] = operations.Get(i);
-            }
+            var argList = operations.GetAll();
 
             var result = func.Call(thisArg, argList);
-            _engine._jsValueArrayPool.ReturnArray(argList);
 
             return result;
         }