Skip to content

Replace lock(this) with private lock object in CompiledScriptBlockData #27619

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

Open
euxaristia wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replace lock(this) with private lock object in CompiledScriptBlockData #27619

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 8 additions & 6 deletions src/System.Management.Automation/engine/runtime/CompiledScriptBlock.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ internal bool Compile(bool optimized)

private void InitializeMetadata()
{
lock (this)
lock (_lock)
{
if (_attributes != null)
{
Expand Down Expand Up @@ -132,7 +132,7 @@ private void InitializeMetadata()

private void CompileUnoptimized()
{
lock (this)
lock (_lock)
{
if (_compiledUnoptimized)
{
Expand All @@ -147,7 +147,7 @@ private void CompileUnoptimized()

private void CompileOptimized()
{
lock (this)
lock (_lock)
{
if (_compiledOptimized)
{
Expand Down Expand Up @@ -291,7 +291,7 @@ bool IsScriptBlockInFactASafeHashtable()

private IParameterMetadataProvider DelayParseScriptText()
{
lock (this)
lock (_lock)
{
if (_ast != null)
{
Expand Down Expand Up @@ -346,6 +346,8 @@ private IParameterMetadataProvider DelayParseScriptText()

internal IScriptExtent[] SequencePoints { get; set; }

private readonly object _lock = new object();

private RuntimeDefinedParameterDictionary _runtimeDefinedParameterDictionary;
private Attribute[] _attributes;
private bool _usesCmdletBinding;
Expand Down Expand Up @@ -473,7 +475,7 @@ internal ExperimentalAttribute ExperimentalAttribute
{
if (_expAttribute == ExperimentalAttribute.None)
{
lock (this)
lock (_lock)
{
if (_expAttribute == ExperimentalAttribute.None)
{
Expand All @@ -492,7 +494,7 @@ public MergedCommandParameterMetadata GetParameterMetadata(ScriptBlock scriptBlo
{
if (_parameterMetadata == null)
{
lock (this)
lock (_lock)
{
if (_parameterMetadata == null)
{
Expand Down