Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 5.6k
Remove calls to empty RuntimeHelpers.PrepareConstrainedRegions()#33191
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.
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
jkotas
merged 4 commits into
dotnet:master
from
Marusyk:marusyk/PrepareConstrainedRegionsMar 16, 2020
Uh oh!
There was an error while loading. Please reload this page.
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
2 changes: 0 additions & 2 deletions
2 src/coreclr/src/System.Private.CoreLib/src/System/RuntimeType.CoreCLR.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 0 additions & 6 deletions
6 src/coreclr/src/System.Private.CoreLib/src/System/Threading/ThreadPool.CoreCLR.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 10 additions & 28 deletions
38 src/libraries/System.Net.HttpListener/src/System/Net/Windows/WebSockets/WebSocketBase.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -8,7 +8,6 @@ | ||
| using System.Globalization; | ||
| using System.IO; | ||
| using System.Net.Sockets; | ||
| using System.Runtime.CompilerServices; | ||
| using System.Runtime.InteropServices; | ||
| using System.Text; | ||
| using System.Threading; | ||
| @@ -1018,26 +1017,16 @@ private void ReleaseLocks(ref bool thisLockTaken, ref bool sessionHandleLockTake | ||
| Debug.Assert(_thisLock != null, "'_thisLock' MUST NOT be NULL."); | ||
| Debug.Assert(SessionHandle != null, "'SessionHandle' MUST NOT be NULL."); | ||
| if (thisLockTaken || sessionHandleLockTaken) | ||
| if (thisLockTaken) | ||
| { | ||
| RuntimeHelpers.PrepareConstrainedRegions(); | ||
| try | ||
| { | ||
| } | ||
| finally | ||
| { | ||
| if (thisLockTaken) | ||
| { | ||
| Monitor.Exit(_thisLock); | ||
| thisLockTaken = false; | ||
| } | ||
| Monitor.Exit(_thisLock); | ||
| thisLockTaken = false; | ||
| } | ||
| if (sessionHandleLockTaken) | ||
| { | ||
| Monitor.Exit(SessionHandle); | ||
| sessionHandleLockTaken = false; | ||
| } | ||
| } | ||
| if (sessionHandleLockTaken) | ||
| { | ||
| Monitor.Exit(SessionHandle); | ||
| sessionHandleLockTaken = false; | ||
| } | ||
| } | ||
| @@ -1104,15 +1093,8 @@ private static void ReleaseLock(object lockObject, ref bool lockTaken) | ||
| Debug.Assert(lockObject != null, "'lockObject' MUST NOT be NULL."); | ||
| if (lockTaken) | ||
| { | ||
| RuntimeHelpers.PrepareConstrainedRegions(); | ||
Marusyk marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| try | ||
| { | ||
| } | ||
| finally | ||
| { | ||
| Monitor.Exit(lockObject); | ||
| lockTaken = false; | ||
| } | ||
| Monitor.Exit(lockObject); | ||
| lockTaken = false; | ||
| } | ||
| } | ||
7 changes: 0 additions & 7 deletions
7 src/libraries/System.Private.CoreLib/src/System/IO/UnmanagedMemoryStream.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -4,7 +4,6 @@ | ||
| using System.Buffers; | ||
| using System.Diagnostics; | ||
| using System.Runtime.CompilerServices; | ||
| using System.Runtime.InteropServices; | ||
| using System.Threading; | ||
| using System.Threading.Tasks; | ||
| @@ -128,7 +127,6 @@ protected void Initialize(SafeBuffer buffer, long offset, long length, FileAcces | ||
| unsafe | ||
| { | ||
| byte* pointer = null; | ||
| RuntimeHelpers.PrepareConstrainedRegions(); | ||
stephentoub marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| try | ||
| { | ||
| buffer.AcquirePointer(ref pointer); | ||
| @@ -260,7 +258,6 @@ public override void CopyTo(ReadOnlySpanAction<byte, object?> callback, object? | ||
| { | ||
| byte* pointer = null; | ||
| RuntimeHelpers.PrepareConstrainedRegions(); | ||
| try | ||
| { | ||
| _buffer.AcquirePointer(ref pointer); | ||
| @@ -490,7 +487,6 @@ internal int ReadCore(Span<byte> buffer) | ||
| { | ||
| byte* pointer = null; | ||
| RuntimeHelpers.PrepareConstrainedRegions(); | ||
| try | ||
| { | ||
| _buffer.AcquirePointer(ref pointer); | ||
| @@ -606,7 +602,6 @@ public override int ReadByte() | ||
| unsafe | ||
| { | ||
| byte* pointer = null; | ||
| RuntimeHelpers.PrepareConstrainedRegions(); | ||
| try | ||
| { | ||
| _buffer.AcquirePointer(ref pointer); | ||
| @@ -786,7 +781,6 @@ internal unsafe void WriteCore(ReadOnlySpan<byte> buffer) | ||
| } | ||
| byte* pointer = null; | ||
| RuntimeHelpers.PrepareConstrainedRegions(); | ||
| try | ||
| { | ||
| _buffer.AcquirePointer(ref pointer); | ||
| @@ -920,7 +914,6 @@ public override void WriteByte(byte value) | ||
| unsafe | ||
| { | ||
| byte* pointer = null; | ||
| RuntimeHelpers.PrepareConstrainedRegions(); | ||
| try | ||
| { | ||
| _buffer.AcquirePointer(ref pointer); | ||
9 changes: 0 additions & 9 deletions
9 src/libraries/System.Private.CoreLib/src/System/Runtime/MemoryFailPoint.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.