-Avoid box allocations when enumerating IDictionary
This commit is contained in:
@@ -2041,9 +2041,19 @@ namespace Newtonsoft.Json.Serialization
|
||||
IDictionary targetDictionary = (dictionaryContract.ShouldCreateWrapper) ? dictionaryContract.CreateWrapper(createdObjectDictionary) : (IDictionary)createdObjectDictionary;
|
||||
IDictionary newValues = (dictionaryContract.ShouldCreateWrapper) ? dictionaryContract.CreateWrapper(value) : (IDictionary)value;
|
||||
|
||||
foreach (DictionaryEntry newValue in newValues)
|
||||
// Manual use of IDictionaryEnumerator instead of foreach to avoid DictionaryEntry box allocations.
|
||||
IDictionaryEnumerator e = newValues.GetEnumerator();
|
||||
try
|
||||
{
|
||||
targetDictionary.Add(newValue.Key, newValue.Value);
|
||||
while (e.MoveNext())
|
||||
{
|
||||
DictionaryEntry entry = e.Entry;
|
||||
targetDictionary.Add(entry.Key, entry.Value);
|
||||
}
|
||||
}
|
||||
finally
|
||||
{
|
||||
(e as IDisposable)?.Dispose();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1050,8 +1050,14 @@ namespace Newtonsoft.Json.Serialization
|
||||
|
||||
int initialDepth = writer.Top;
|
||||
|
||||
foreach (DictionaryEntry entry in values)
|
||||
// Manual use of IDictionaryEnumerator instead of foreach to avoid DictionaryEntry box allocations.
|
||||
IDictionaryEnumerator e = values.GetEnumerator();
|
||||
try
|
||||
{
|
||||
while (e.MoveNext())
|
||||
{
|
||||
DictionaryEntry entry = e.Entry;
|
||||
|
||||
bool escape;
|
||||
string propertyName = GetPropertyName(writer, entry.Key, contract.KeyContract, out escape);
|
||||
|
||||
@@ -1093,6 +1099,11 @@ namespace Newtonsoft.Json.Serialization
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
finally
|
||||
{
|
||||
(e as IDisposable)?.Dispose();
|
||||
}
|
||||
|
||||
writer.WriteEndObject();
|
||||
|
||||
|
||||
@@ -299,9 +299,19 @@ namespace Newtonsoft.Json.Utilities
|
||||
{
|
||||
if (_dictionary != null)
|
||||
{
|
||||
foreach (DictionaryEntry item in _dictionary)
|
||||
// Manual use of IDictionaryEnumerator instead of foreach to avoid DictionaryEntry box allocations.
|
||||
IDictionaryEnumerator e = _dictionary.GetEnumerator();
|
||||
try
|
||||
{
|
||||
array[arrayIndex++] = new KeyValuePair<TKey, TValue>((TKey)item.Key, (TValue)item.Value);
|
||||
while (e.MoveNext())
|
||||
{
|
||||
DictionaryEntry entry = e.Entry;
|
||||
array[arrayIndex++] = new KeyValuePair<TKey, TValue>((TKey)entry.Key, (TValue)entry.Value);
|
||||
}
|
||||
}
|
||||
finally
|
||||
{
|
||||
(e as IDisposable)?.Dispose();
|
||||
}
|
||||
}
|
||||
#if !(NET40 || NET35 || NET20 || PORTABLE40)
|
||||
|
||||
Reference in New Issue
Block a user