Skip to content

Reuse bool box objects in UncommonField<bool>.SetValue #6528

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 3, 2022
Merged

Reuse bool box objects in UncommonField<bool>.SetValue #6528

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc928b8
Reuse bool box objects in UncommonField<bool>.SetValue
stephentoub May 4, 2022
70f0b74
Use BooleanBoxes
stephentoub May 4, 2022
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
21 changes: 16 additions & 5 deletions src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/UncommonField.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Collections.Generic;
using System.Diagnostics;

using System.Runtime.CompilerServices;
using MS.Internal.KnownBoxes;
using MS.Internal.WindowsBase; // for FriendAccessAllowed

namespace System.Windows
Expand Down Expand Up @@ -54,12 +53,24 @@ public void SetValue(DependencyObject instance, T value)
// Set the value if it's not the default, otherwise remove the value.
if (!EqualityComparer<T>.Default.Equals(value, _defaultValue))
{
instance.SetEffectiveValue(entryIndex, null /* dp */, _globalIndex, null /* metadata */, value, BaseValueSourceInternal.Local);
object valueObject;

if (typeof(T) == typeof(bool))
{
// Use shared boxed instances rather than creating new objects for each SetValue call.
valueObject = BooleanBoxes.Box(Unsafe.As<T, bool>(ref value));
}
else
{
valueObject = value;
}

instance.SetEffectiveValue(entryIndex, dp: null, _globalIndex, metadata: null, valueObject, BaseValueSourceInternal.Local);
_hasBeenSet = true;
}
else
{
instance.UnsetEffectiveValue(entryIndex, null /* dp */, null /* metadata */);
instance.UnsetEffectiveValue(entryIndex, dp: null, metadata: null);
}
}
else
Expand Down