admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improving performance of LanguagePrimitives.TryConvertTo. (#7418)

Browse Source 
Before the fix the TryConvertTo() is implemented in terms of Convert(), but with wrapping exception handling. This is costly performance wise. By inlining the implementation of ConvertTo(), and getting access to the FigureConversion output we can determine upfront on at least some occations that a conversion is not available.
This commit is contained in:
Staffan Gustafsson
2018-08-03 09:18:05 +05:00
committed by Ilya
parent f8b3abaac7
commit 81313743df
1 changed files with 39 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/System.Management.Automation/engine/LanguagePrimitives.cs
+39 -31
View File
@@ -801,9 +801,7 @@ namespace System.Management.Automation
}
}
string firstString = first as string;
if (firstString != null)
if (first is string firstString)
{
string secondString = second as string;
if (secondString == null)
@@ -841,9 +839,7 @@ namespace System.Management.Automation
first.ToString(), second.ToString(), e.Message);
}
IComparable firstComparable = first as IComparable;
if (firstComparable != null)
if (first is IComparable firstComparable)
{
return firstComparable.CompareTo(secondConverted);
}
@@ -1646,9 +1642,9 @@ namespace System.Management.Automation
/// <returns></returns>
public static T ConvertTo<T>(object valueToConvert)
{
if (valueToConvert is T)
if (valueToConvert is T value)
{
return (T)valueToConvert;
return value;
}
return (T)ConvertTo(valueToConvert, typeof(T), true, CultureInfo.InvariantCulture, null);
}
@@ -1664,9 +1660,9 @@ namespace System.Management.Automation
/// <returns>false for conversion failure, true for success</returns>
public static bool TryConvertTo<T>(object valueToConvert, out T result)
{
if (valueToConvert is T)
if (valueToConvert is T value)
{
result = (T)valueToConvert;
result = value;
return true;
}
return TryConvertTo(valueToConvert, CultureInfo.InvariantCulture, out result);
@@ -1685,19 +1681,14 @@ namespace System.Management.Automation
public static bool TryConvertTo<T>(object valueToConvert, IFormatProvider formatProvider, out T result)
{
result = default(T);
try
if (TryConvertTo(valueToConvert, typeof(T), formatProvider, out object res))
{
result = (T)ConvertTo(valueToConvert, typeof(T), formatProvider);
result = (T)res;
return true;
}
catch (InvalidCastException)
{
return false;
}
catch (ArgumentException)
{
return false;
}
return true;
return false;
}
/// <summary>
@@ -1722,27 +1713,44 @@ namespace System.Management.Automation
/// <remarks>
/// This method is a variant of ConvertTo that does not throw exceptions if the conversion fails.
/// </remarks>
/// <param name="valueToConvert">value to be converted and returned</param>
/// <param name="resultType">type to convert valueToConvert</param>
/// <param name="formatProvider">governing conversion of types</param>
/// <param name="valueToConvert">value to be converted and returned.</param>
/// <param name="resultType">type to convert valueToConvert.</param>
/// <param name="formatProvider">governing conversion of types.</param>
/// <param name="result">result of the conversion. This is valid only if the return is true.</param>
/// <returns>false for conversion failure, true for success</returns>
/// <returns>false for conversion failure, true for success.</returns>
public static bool TryConvertTo(object valueToConvert, Type resultType, IFormatProvider formatProvider, out object result)
{
result = null;
try
{
result = ConvertTo(valueToConvert, resultType, formatProvider);
using (typeConversion.TraceScope("Converting \"{0}\" to \"{1}\".", valueToConvert, resultType))
{
if (resultType == null)
{
return false;
}
var conversion = FigureConversion(valueToConvert, resultType, out bool debase);
if (conversion.Rank == ConversionRank.None)
{
return false;
}
result = conversion.Invoke(
debase ? PSObject.Base(valueToConvert) : valueToConvert,
resultType,
recurse: true,
debase ? (PSObject)valueToConvert : null,
formatProvider,
backupTable: null);
return true;
}
}
catch (InvalidCastException)
{
return false;
}
catch (ArgumentException)
{
return false;
}
return true;
}
#endregion public type conversion