Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions src/EFCore/Storage/Json/JsonConvertedValueReaderWriter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ public class JsonConvertedValueReaderWriter<TModel, TProvider> :
JsonValueReaderWriter<TModel>,
IJsonConvertedValueReaderWriter
{
private static readonly bool UseOldBehavior36856 =
AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue36856", out var enabled) && enabled;

private readonly JsonValueReaderWriter<TProvider> _providerReaderWriter;
private readonly ValueConverter _converter;

Expand Down Expand Up @@ -52,8 +55,17 @@ ValueConverter IJsonConvertedValueReaderWriter.Converter

/// <inheritdoc />
public override Expression ConstructorExpression
=> Expression.New(
_constructorInfo,
((ICompositeJsonValueReaderWriter)this).InnerReaderWriter.ConstructorExpression,
((IJsonConvertedValueReaderWriter)this).Converter.ConstructorExpression);
=> UseOldBehavior36856
? Expression.New(
_constructorInfo,
((ICompositeJsonValueReaderWriter)this).InnerReaderWriter.ConstructorExpression,
((IJsonConvertedValueReaderWriter)this).Converter.ConstructorExpression)
: Expression.New(
_constructorInfo,
((ICompositeJsonValueReaderWriter)this).InnerReaderWriter.ConstructorExpression,
// We shouldn't quote converters, because it will create a new instance every time and
// it will have to compile the expression again and
// it will have a negative performance impact. See #36856 for more info.
// This means this is currently unsupported scenario for precompilation.
Expression.Constant(((IJsonConvertedValueReaderWriter)this).Converter));
}
Loading