Ensure proper ValueStringBuilder dispose when needed (#1699)

Jint/Extensions/Polyfills.cs

@@ -1,21 +1,17 @@
-using System.Runtime.CompilerServices;
-
 namespace Jint;
 
 internal static class Polyfills
 {
 #if NETFRAMEWORK || NETSTANDARD2_0
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
     internal static bool Contains(this string source, char c) => source.IndexOf(c) != -1;
+
+    [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
+    internal static bool StartsWith(this string source, char c) => source.Length > 0 && source[0] == c;
 #endif
 
 #if NETFRAMEWORK
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
     internal static bool Contains(this ReadOnlySpan<string> source, string c) => source.IndexOf(c) != -1;
 #endif
-
-#if NETFRAMEWORK || NETSTANDARD2_0
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    internal static bool StartsWith(this string source, char c) => source.Length > 0 && source[0] == c;
-#endif
 }

Jint/Native/Array/ArrayPrototype.cs

@@ -1265,7 +1265,7 @@ namespace Jint.Native.Array
                 return s;
             }
 
-            var sb = new ValueStringBuilder(stackalloc char[256]);
+            using var sb = new ValueStringBuilder(stackalloc char[256]);
             sb.Append(s);
             for (uint k = 1; k < len; k++)
             {

Jint/Native/Json/JsonParser.cs

@@ -170,9 +170,9 @@ namespace Jint.Native.Json
             }
         }
 
-        private Token ScanNumericLiteral(ref State state)
+        private Token ScanNumericLiteral()
         {
-            var sb = new ValueStringBuilder(stackalloc char[64]);
+            using var sb = new ValueStringBuilder(stackalloc char[64]);
             var start = _index;
             var ch = _source.CharCodeAt(_index);
             var canBeInteger = true;
@@ -309,7 +309,7 @@ namespace Jint.Native.Json
             int start = _index;
             ++_index;
 
-            var sb = new ValueStringBuilder(stackalloc char[64]);
+            using var sb = new ValueStringBuilder(stackalloc char[64]);
             while (_index < _length)
             {
                 char ch = _source[_index++];
@@ -403,14 +403,14 @@ namespace Jint.Native.Json
             {
                 if (IsDecimalDigit(_source.CharCodeAt(_index + 1)))
                 {
-                    return ScanNumericLiteral(ref state);
+                    return ScanNumericLiteral();
                 }
                 return ScanPunctuator();
             }
 
             if (IsDecimalDigit(ch))
             {
-                return ScanNumericLiteral(ref state);
+                return ScanNumericLiteral();
             }
 
             if (ch == 't' || ch == 'f')

Jint/Native/Json/JsonSerializer.cs

@@ -52,13 +52,20 @@ namespace Jint.Native.Json
             var wrapper = _engine.Realm.Intrinsics.Object.Construct(Arguments.Empty);
             wrapper.DefineOwnProperty(JsString.Empty, new PropertyDescriptor(value, PropertyFlag.ConfigurableEnumerableWritable));
 
-            var jsonBuilder = new ValueStringBuilder();
-            if (SerializeJSONProperty(JsString.Empty, wrapper, ref jsonBuilder) == SerializeResult.Undefined)
+            string result;
+            var json = new ValueStringBuilder();
+            try
             {
-                return JsValue.Undefined;
+                if (SerializeJSONProperty(JsString.Empty, wrapper, ref json) == SerializeResult.Undefined)
+                {
+                    return JsValue.Undefined;
+                }
             }
-
-            return new JsString(jsonBuilder.ToString());
+            finally
+            {
+                result = json.ToString();
+            }
+            return new JsString(result);
         }
 
         private void SetupReplacer(JsValue replacer)

Jint/Native/Number/NumberPrototype.cs

@@ -418,7 +418,7 @@ namespace Jint.Native.Number
                 return "0";
             }
 
-            using var sb = new ValueStringBuilder(stackalloc char[64]);
+            var sb = new ValueStringBuilder(stackalloc char[64]);
             while (n > 0)
             {
                 var digit = (int) (n % radix);
@@ -440,7 +440,7 @@ namespace Jint.Native.Number
                 return "0";
             }
 
-            using var result = new ValueStringBuilder(stackalloc char[64]);
+            var result = new ValueStringBuilder(stackalloc char[64]);
             while (n > 0 && result.Length < 50) // arbitrary limit
             {
                 var c = n*radix;

Jint/Native/RegExp/RegExpPrototype.cs

@@ -337,7 +337,7 @@ namespace Jint.Native.RegExp
             // $`	Inserts the portion of the string that precedes the matched substring.
             // $'	Inserts the portion of the string that follows the matched substring.
             // $n or $nn	Where n or nn are decimal digits, inserts the nth parenthesized submatch string, provided the first argument was a RegExp object.
-            var sb = new ValueStringBuilder(stackalloc char[128]);
+            using var sb = new ValueStringBuilder(stackalloc char[128]);
             for (var i = 0; i < replacement.Length; i++)
             {
                 char c = replacement[i];

Jint/Native/String/StringConstructor.cs

@@ -82,7 +82,7 @@ namespace Jint.Native.String
         private JsValue FromCodePoint(JsValue thisObject, JsValue[] arguments)
         {
             JsNumber codePoint;
-            var result = new ValueStringBuilder(stackalloc char[128]);
+            using var result = new ValueStringBuilder(stackalloc char[128]);
             foreach (var a in arguments)
             {
                 int point;
@@ -144,7 +144,7 @@ namespace Jint.Native.String
                 return JsString.Empty;
             }
 
-            var result = new ValueStringBuilder();
+            using var result = new ValueStringBuilder();
             for (var i = 0; i < length; i++)
             {
                 if (i > 0)

Jint/Native/String/StringPrototype.cs

@@ -642,7 +642,7 @@ namespace Jint.Native.String
             var advanceBy = System.Math.Max(1, searchLength);
 
             var endOfLastMatch = 0;
-            var result = new ValueStringBuilder();
+            using var result = new ValueStringBuilder();
 
             var position = StringIndexOf(thisString, searchString, 0);
             while (position != -1)

Jint/Native/TypedArray/IntrinsicTypedArrayPrototype.cs

@@ -637,7 +637,7 @@ namespace Jint.Native.TypedArray
                 return s;
             }
 
-            var result = new ValueStringBuilder();
+            using var result = new ValueStringBuilder();
             result.Append(s);
             for (var k = 1; k < len; k++)
             {

Jint/Runtime/Interpreter/Expressions/JintTemplateLiteralExpression.cs

@@ -40,7 +40,7 @@ internal sealed class JintTemplateLiteralExpression : JintExpression
             _initialized = true;
         }
 
-        var sb = new ValueStringBuilder();
+        using var sb = new ValueStringBuilder();
         ref readonly var elements = ref _templateLiteralExpression.Quasis;
         for (var i = 0; i < elements.Count; i++)
         {

Jint/Runtime/TypeConverter.cs

@@ -2,13 +2,11 @@ using System.Globalization;
 using System.Numerics;
 using System.Reflection;
 using System.Runtime.CompilerServices;
-using System.Text;
 using Esprima;
 using Esprima.Ast;
 using Jint.Extensions;
 using Jint.Native;
 using Jint.Native.Number;
-using Jint.Native.Number.Dtoa;
 using Jint.Native.Object;
 using Jint.Native.String;
 using Jint.Native.Symbol;