Optimize global identifier access a bit and reduce allocations (#741)

sebastienros · May 30, 2020 · 56ca37b · 56ca37b
1 parent 58f8add
commit 56ca37b
Show file tree

Hide file tree

Showing 27 changed files with 168 additions and 126 deletions.
diff --git a/Jint/Collections/HybridDictionary.cs b/Jint/Collections/HybridDictionary.cs
@@ -13,7 +13,7 @@ internal class HybridDictionary<TValue> : IEnumerable<KeyValuePair<Key, TValue>>
 
         private readonly bool _checkExistingKeys;
         private ListDictionary<TValue> _list;
-        private StringDictionarySlim<TValue> _dictionary;
+        internal StringDictionarySlim<TValue> _dictionary;
 
         public HybridDictionary() : this(0, checkExistingKeys: true)
         {

diff --git a/Jint/JsValueExtensions.cs b/Jint/JsValueExtensions.cs
@@ -42,12 +42,6 @@ public static string AsString(this JsValue value)
                 ThrowWrongTypeException(value, "string");
             }
 
-            return AsStringWithoutTypeCheck(value);
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        internal static string AsStringWithoutTypeCheck(this JsValue value)
-        {
             return value.ToString();
         }
 

diff --git a/Jint/Native/Global/GlobalObject.cs b/Jint/Native/Global/GlobalObject.cs
@@ -754,9 +754,9 @@ internal bool Set(Key property, JsValue value)
             // here we are called only from global environment record context
             // we can take some shortcuts to be faster
 
-            if (!Properties.TryGetValue(property, out var existingDescriptor))
+            if (!_properties.TryGetValue(property, out var existingDescriptor))
             {
-                Properties[property] = new PropertyDescriptor(value, PropertyFlag.ConfigurableEnumerableWritable);
+                _properties[property] = new PropertyDescriptor(value, PropertyFlag.ConfigurableEnumerableWritable);
                 return true;
             }
 

diff --git a/Jint/Native/JsValue.cs b/Jint/Native/JsValue.cs
@@ -559,7 +559,7 @@ public JsValueDebugView(JsValue value)
                         Value = ((JsBoolean) value)._value + " (bool)";
                         break;
                     case Types.String:
-                        Value = value.AsStringWithoutTypeCheck() + " (string)";
+                        Value = value.ToString() + " (string)";
                         break;
                     case Types.Number:
                         Value = ((JsNumber) value)._value + " (number)";

diff --git a/Jint/Native/Json/JsonSerializer.cs b/Jint/Native/Json/JsonSerializer.cs
@@ -53,7 +53,7 @@ public JsValue Serialize(JsValue value, JsValue replacer, JsValue space)
                         string item = null;
                         if (v.IsString())
                         {
-                            item = v.AsStringWithoutTypeCheck();
+                            item = v.ToString();
                         }
                         else if (v.IsNumber())
                         {
@@ -105,7 +105,7 @@ public JsValue Serialize(JsValue value, JsValue replacer, JsValue space)
             }
             else if (space.IsString())
             {
-                var stringSpace = space.AsStringWithoutTypeCheck();
+                var stringSpace = space.ToString();
                 _gap = stringSpace.Length <= 10 ? stringSpace : stringSpace.Substring(0, 10);
             }
             else
@@ -177,7 +177,7 @@ private JsValue Str(JsValue key, ObjectInstance holder)
 
             if (value.IsString())
             {
-                return Quote(value.AsStringWithoutTypeCheck());
+                return Quote(value.ToString());
             }
 
             if (value.IsNumber())
@@ -264,7 +264,7 @@ private string SerializeArray(ArrayInstance value)
                 var strP = Str(TypeConverter.ToString(i), value);
                 if (strP.IsUndefined())
                     strP = "null";
-                partial.Add(strP.AsStringWithoutTypeCheck());
+                partial.Add(strP.ToString());
             }
             if (partial.Count == 0)
             {

diff --git a/Jint/Native/Object/ObjectInstance.cs b/Jint/Native/Object/ObjectInstance.cs
@@ -25,7 +25,7 @@ public class ObjectInstance : JsValue, IEquatable<ObjectInstance>
         private bool _initialized;
         private readonly ObjectClass _class;
 
-        private PropertyDictionary _properties;
+        internal PropertyDictionary _properties;
         internal SymbolDictionary _symbols;
 
         internal ObjectInstance _prototype;
@@ -317,11 +317,6 @@ internal JsValue UnwrapJsValue(PropertyDescriptor desc)
 
         internal static JsValue UnwrapJsValue(PropertyDescriptor desc, JsValue thisObject)
         {
-            if (desc == PropertyDescriptor.Undefined)
-            {
-                return Undefined;
-            }
-
             var value = (desc._flags & PropertyFlag.CustomJsValue) != 0
                 ? desc.CustomValue
                 : desc._value;
@@ -333,6 +328,15 @@ internal static JsValue UnwrapJsValue(PropertyDescriptor desc, JsValue thisObjec
                 return value ?? Undefined;
             }
 
+            return UnwrapFromGetter(desc, thisObject);
+        }
+
+        /// <summary>
+        /// A rarer case.
+        /// </summary>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private static JsValue UnwrapFromGetter(PropertyDescriptor desc, JsValue thisObject)
+        {
             var getter = desc.Get ?? Undefined;
             if (getter.IsUndefined())
             {
@@ -457,10 +461,7 @@ public override bool Set(JsValue property, JsValue value, JsValue receiver)
                 {
                     return parent.Set(property, value, receiver);
                 }
-                else
-                {
-                    ownDesc = new PropertyDescriptor(Undefined, PropertyFlag.ConfigurableEnumerableWritable);
-                }
+                ownDesc = new PropertyDescriptor(Undefined, PropertyFlag.ConfigurableEnumerableWritable);
             }
 
             if (ownDesc.IsDataDescriptor())
@@ -506,7 +507,7 @@ public override bool Set(JsValue property, JsValue value, JsValue receiver)
 
             return true;
         }
-
+        
         /// <summary>
         /// Returns a Boolean value indicating whether a
         /// [[Put]] operation with PropertyName can be
@@ -681,6 +682,7 @@ protected static bool ValidateAndApplyPropertyDescriptor(ObjectInstance o, JsVal
                             };
                         }
 
+                        propertyDescriptor._flags |= desc._flags & PropertyFlag.MutableBinding; 
                         o.SetOwnProperty(property, propertyDescriptor);
                     }
                     else
@@ -697,7 +699,7 @@ protected static bool ValidateAndApplyPropertyDescriptor(ObjectInstance o, JsVal
             var currentSet = current.Set;
             var currentValue = current.Value;
 
-            if ((current._flags & PropertyFlag.ConfigurableSet | PropertyFlag.EnumerableSet | PropertyFlag.WritableSet) == 0 &&
+            if ((current._flags & (PropertyFlag.ConfigurableSet | PropertyFlag.EnumerableSet | PropertyFlag.WritableSet)) == 0 &&
                 ReferenceEquals(currentGet, null) &&
                 ReferenceEquals(currentSet, null) &&
                 ReferenceEquals(currentValue, null))
@@ -797,7 +799,6 @@ protected static bool ValidateAndApplyPropertyDescriptor(ObjectInstance o, JsVal
 
             if (o is object)
             {
-
                 if (!ReferenceEquals(descValue, null))
                 {
                     current.Value = descValue;
@@ -817,7 +818,7 @@ protected static bool ValidateAndApplyPropertyDescriptor(ObjectInstance o, JsVal
                 {
                     current.Configurable = desc.Configurable;
                 }
-                
+
                 PropertyDescriptor mutable = null;
                 if (!ReferenceEquals(descGet, null))
                 {

diff --git a/Jint/Native/String/StringInstance.cs b/Jint/Native/String/StringInstance.cs
@@ -55,7 +55,7 @@ public override PropertyDescriptor GetOwnProperty(JsValue property)
                 return PropertyDescriptor.Undefined;
             }
 
-            var str = PrimitiveValue.AsStringWithoutTypeCheck();
+            var str = PrimitiveValue.ToString();
             var number = TypeConverter.ToNumber(property);
             if (!IsInt32(number, out var index) || index < 0 || index >= str.Length)
             {

diff --git a/Jint/Native/String/StringPrototype.cs b/Jint/Native/String/StringPrototype.cs
@@ -652,7 +652,7 @@ private JsValue Concat(JsValue thisObj, JsValue[] arguments)
             {
                 if (arguments[i].Type == Types.String)
                 {
-                    capacity += arguments[i].AsStringWithoutTypeCheck().Length;
+                    capacity += arguments[i].ToString().Length;
                 }
             }
 

diff --git a/Jint/Runtime/Environments/DeclarativeEnvironmentRecord.cs b/Jint/Runtime/Environments/DeclarativeEnvironmentRecord.cs
@@ -23,7 +23,7 @@ public sealed override bool HasBinding(string name)
         }
 
         internal sealed override bool TryGetBinding(
-            BindingName name,
+            in BindingName name,
             bool strict,
             out Binding binding,
             out JsValue value)
@@ -65,7 +65,7 @@ public sealed override void InitializeBinding(string name, JsValue value)
             _dictionary[name] = binding.ChangeValue(value);
         }
 
-        internal override void SetMutableBinding(BindingName name, JsValue value, bool strict)
+        internal override void SetMutableBinding(in BindingName name, JsValue value, bool strict)
         {
             SetMutableBinding(name.Key.Name, value, strict);
         }

diff --git a/Jint/Runtime/Environments/EnvironmentRecord.cs b/Jint/Runtime/Environments/EnvironmentRecord.cs
@@ -23,7 +23,7 @@ protected EnvironmentRecord(Engine engine) : base(InternalTypes.ObjectEnvironmen
         public abstract bool HasBinding(string name);
 
         internal abstract bool TryGetBinding(
-            BindingName name,
+            in BindingName name,
             bool strict,
             out Binding binding,
             out JsValue value);
@@ -57,7 +57,7 @@ protected EnvironmentRecord(Engine engine) : base(InternalTypes.ObjectEnvironmen
         /// <param name="strict">The identify strict mode references.</param>
         public abstract void SetMutableBinding(string name, JsValue value, bool strict);
 
-        internal abstract void SetMutableBinding(BindingName name, JsValue value, bool strict);
+        internal abstract void SetMutableBinding(in BindingName name, JsValue value, bool strict);
 
         /// <summary>
         /// Returns the value of an already existing binding from an environment record.
@@ -107,7 +107,7 @@ public override bool Equals(JsValue other)
         /// <summary>
         /// Helper to cache JsString/Key when environments use different lookups.
         /// </summary>
-        internal class BindingName
+        internal readonly struct BindingName
         {
             public readonly Key Key;
             public readonly JsString StringValue;

diff --git a/Jint/Runtime/Environments/FunctionEnvironmentRecord.cs b/Jint/Runtime/Environments/FunctionEnvironmentRecord.cs
@@ -218,7 +218,7 @@ private void HandleObjectPattern(bool initiallyEmpty, JsValue argument, ObjectPa
                             propertyName = ExceptionHelper.ThrowArgumentOutOfRangeException<JsString>("property", "unknown object pattern property type");
                         }
 
-                        processedProperties?.Add(propertyName.AsStringWithoutTypeCheck());
+                        processedProperties?.Add(propertyName.ToString());
                         jsValues[0] = argumentObject.Get(propertyName);
                         SetFunctionParameter(p.Value, jsValues, 0, initiallyEmpty);
                     }