Cleanup CachedExpressionCompiler

This commit is contained in:
Pranav K 2018-05-03 15:44:53 -07:00
parent ec2d5c7aa4
commit 504da3c565
No known key found for this signature in database
GPG Key ID: 1963DA6D96C3057A
4 changed files with 158 additions and 162 deletions

View File

@ -1,157 +0,0 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using System.Collections.Concurrent;
using System.Linq.Expressions;
using System.Reflection;
namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
{
public static class CachedExpressionCompiler
{
// This is the entry point to the cached expression compilation system. The system
// will try to turn the expression into an actual delegate as quickly as possible,
// relying on cache lookups and other techniques to save time if appropriate.
// If the provided expression is particularly obscure and the system doesn't know
// how to handle it, we'll just compile the expression as normal.
public static Func<TModel, TResult> Process<TModel, TResult>(
Expression<Func<TModel, TResult>> expression)
{
if (expression == null)
{
throw new ArgumentNullException(nameof(expression));
}
return Compiler<TModel, TResult>.Compile(expression);
}
private static class Compiler<TModel, TResult>
{
private static Func<TModel, TResult> _identityFunc;
private static readonly ConcurrentDictionary<MemberInfo, Func<TModel, TResult>> _simpleMemberAccessCache =
new ConcurrentDictionary<MemberInfo, Func<TModel, TResult>>();
private static readonly ConcurrentDictionary<MemberInfo, Func<object, TResult>> _constMemberAccessCache =
new ConcurrentDictionary<MemberInfo, Func<object, TResult>>();
public static Func<TModel, TResult> Compile(Expression<Func<TModel, TResult>> expression)
{
if (expression == null)
{
throw new ArgumentNullException(nameof(expression));
}
return CompileFromIdentityFunc(expression)
?? CompileFromConstLookup(expression)
?? CompileFromMemberAccess(expression)
?? CompileSlow(expression);
}
private static Func<TModel, TResult> CompileFromConstLookup(
Expression<Func<TModel, TResult>> expression)
{
if (expression == null)
{
throw new ArgumentNullException(nameof(expression));
}
var constantExpression = expression.Body as ConstantExpression;
if (constantExpression != null)
{
// model => {const}
var constantValue = (TResult)constantExpression.Value;
return _ => constantValue;
}
return null;
}
private static Func<TModel, TResult> CompileFromIdentityFunc(
Expression<Func<TModel, TResult>> expression)
{
if (expression == null)
{
throw new ArgumentNullException(nameof(expression));
}
if (expression.Body == expression.Parameters[0])
{
// model => model
// Don't need to lock, as all identity funcs are identical.
if (_identityFunc == null)
{
_identityFunc = expression.Compile();
}
return _identityFunc;
}
return null;
}
private static Func<TModel, TResult> CompileFromMemberAccess(
Expression<Func<TModel, TResult>> expression)
{
if (expression == null)
{
throw new ArgumentNullException(nameof(expression));
}
// Performance tests show that on the x64 platform, special-casing static member and
// captured local variable accesses is faster than letting the fingerprinting system
// handle them. On the x86 platform, the fingerprinting system is faster, but only
// by around one microsecond, so it's not worth it to complicate the logic here with
// an architecture check.
var memberExpression = expression.Body as MemberExpression;
if (memberExpression != null)
{
if (memberExpression.Expression == expression.Parameters[0] || memberExpression.Expression == null)
{
// model => model.Member or model => StaticMember
return _simpleMemberAccessCache.GetOrAdd(memberExpression.Member, _ => expression.Compile());
}
var constantExpression = memberExpression.Expression as ConstantExpression;
if (constantExpression != null)
{
// model => {const}.Member (captured local variable)
var compiledExpression = _constMemberAccessCache.GetOrAdd(memberExpression.Member, _ =>
{
// rewrite as capturedLocal => ((TDeclaringType)capturedLocal).Member
var parameterExpression = Expression.Parameter(typeof(object), "capturedLocal");
var castExpression =
Expression.Convert(parameterExpression, memberExpression.Member.DeclaringType);
var replacementMemberExpression = memberExpression.Update(castExpression);
var replacementExpression = Expression.Lambda<Func<object, TResult>>(
replacementMemberExpression,
parameterExpression);
return replacementExpression.Compile();
});
var capturedLocal = constantExpression.Value;
return _ => compiledExpression(capturedLocal);
}
}
return null;
}
private static Func<TModel, TResult> CompileSlow(Expression<Func<TModel, TResult>> expression)
{
if (expression == null)
{
throw new ArgumentNullException(nameof(expression));
}
// fallback compilation system - just compile the expression directly
return expression.Compile();
}
}
}
}

View File

@ -31,9 +31,8 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
throw new ArgumentNullException(nameof(expression));
}
string expressionText;
if (expressionTextCache != null &&
expressionTextCache.Entries.TryGetValue(expression, out expressionText))
expressionTextCache.Entries.TryGetValue(expression, out var expressionText))
{
return expressionText;
}

View File

@ -80,17 +80,19 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
throw new InvalidOperationException(Resources.TemplateHelpers_TemplateLimitations);
}
Func<object, object> modelAccessor = (container) =>
object modelAccessor(object container)
{
var compiledExpression = CachedExpressionCompiler.Process(expression);
Debug.Assert(compiledExpression != null);
try
{
return CachedExpressionCompiler.Process(expression)((TModel)container);
return compiledExpression((TModel)container);
}
catch (NullReferenceException)
{
return null;
}
};
}
ModelMetadata metadata = null;
if (containerType != null && propertyName != null)

View File

@ -0,0 +1,152 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using System.Collections.Concurrent;
using System.Diagnostics;
using System.Linq.Expressions;
using System.Reflection;
namespace Microsoft.AspNetCore.Mvc.ViewFeatures
{
internal static class CachedExpressionCompiler
{
// This is the entry point to the cached expression compilation system. The system
// will try to turn the expression into an actual delegate as quickly as possible,
// relying on cache lookups and other techniques to save time if appropriate.
// If the provided expression is particularly obscure and the system doesn't know
// how to handle it, we'll just compile the expression as normal.
public static Func<TModel, TResult> Process<TModel, TResult>(
Expression<Func<TModel, TResult>> expression)
{
if (expression == null)
{
throw new ArgumentNullException(nameof(expression));
}
return Compiler<TModel, TResult>.Compile(expression);
}
private static class Compiler<TModel, TResult>
{
private static Func<TModel, TResult> _identityFunc;
private static readonly ConcurrentDictionary<MemberInfo, Func<TModel, TResult>> _simpleMemberAccessCache =
new ConcurrentDictionary<MemberInfo, Func<TModel, TResult>>();
private static readonly ConcurrentDictionary<MemberInfo, Func<object, TResult>> _constMemberAccessCache =
new ConcurrentDictionary<MemberInfo, Func<object, TResult>>();
public static Func<TModel, TResult> Compile(Expression<Func<TModel, TResult>> expression)
{
Debug.Assert(expression != null);
switch (expression.Body)
{
// model => model
case var body when body == expression.Parameters[0]:
return CompileFromIdentityFunc(expression);
// model => (object){const}
case ConstantExpression constantExpression:
return CompileFromConstLookup(constantExpression);
// model => CapturedConstant
case MemberExpression memberExpression when memberExpression.Expression is ConstantExpression constantExpression:
return CompileCapturedConstant(memberExpression, constantExpression);
// model => StaticMember
case MemberExpression memberExpression when memberExpression.Expression == null:
return CompileFromStaticMemberAccess(expression, memberExpression);
// model => model.Member
case MemberExpression memberExpression when memberExpression.Expression == expression.Parameters[0]:
return CompileFromMemberAccess(expression, memberExpression);
default:
return CompileSlow(expression);
}
}
private static Func<TModel, TResult> CompileFromConstLookup(
ConstantExpression constantExpression)
{
// model => {const}
var constantValue = (TResult)constantExpression.Value;
return _ => constantValue;
}
private static Func<TModel, TResult> CompileFromIdentityFunc(
Expression<Func<TModel, TResult>> expression)
{
// model => model
// Don't need to lock, as all identity funcs are identical.
if (_identityFunc == null)
{
_identityFunc = expression.Compile();
}
return _identityFunc;
}
private static Func<TModel, TResult> CompileFromMemberAccess(
Expression<Func<TModel, TResult>> expression,
MemberExpression memberExpression)
{
// model => model.Member
if (_simpleMemberAccessCache.TryGetValue(memberExpression.Member, out var result))
{
return result;
}
result = expression.Compile();
result = _simpleMemberAccessCache.GetOrAdd(memberExpression.Member, result);
return result;
}
private static Func<TModel, TResult> CompileFromStaticMemberAccess(
Expression<Func<TModel, TResult>> expression,
MemberExpression memberExpression)
{
// model => model.StaticMember
if (_simpleMemberAccessCache.TryGetValue(memberExpression.Member, out var result))
{
return result;
}
result = expression.Compile();
result = _simpleMemberAccessCache.GetOrAdd(memberExpression.Member, result);
return result;
}
private static Func<TModel, TResult> CompileCapturedConstant(MemberExpression memberExpression, ConstantExpression constantExpression)
{
// model => {const}.Member (captured local variable)
if (!_constMemberAccessCache.TryGetValue(memberExpression.Member, out var result))
{
// rewrite as capturedLocal => ((TDeclaringType)capturedLocal).Member
var parameterExpression = Expression.Parameter(typeof(object), "capturedLocal");
var castExpression =
Expression.Convert(parameterExpression, memberExpression.Member.DeclaringType);
var replacementMemberExpression = memberExpression.Update(castExpression);
var replacementExpression = Expression.Lambda<Func<object, TResult>>(
replacementMemberExpression,
parameterExpression);
result = replacementExpression.Compile();
result = _constMemberAccessCache.GetOrAdd(memberExpression.Member, result);
}
var capturedLocal = constantExpression.Value;
return _ => result(capturedLocal);
}
private static Func<TModel, TResult> CompileSlow(Expression<Func<TModel, TResult>> expression)
{
// fallback compilation system - just compile the expression directly
return expression.Compile();
}
}
}
}