summaryrefslogtreecommitdiff
path: root/src/mscorlib/src/System/SharedStatics.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/mscorlib/src/System/SharedStatics.cs')
-rw-r--r--src/mscorlib/src/System/SharedStatics.cs64
1 files changed, 5 insertions, 59 deletions
diff --git a/src/mscorlib/src/System/SharedStatics.cs b/src/mscorlib/src/System/SharedStatics.cs
index ec63a0ec25..cbc5c354a1 100644
--- a/src/mscorlib/src/System/SharedStatics.cs
+++ b/src/mscorlib/src/System/SharedStatics.cs
@@ -11,18 +11,16 @@
**
=============================================================================*/
-namespace System {
-
+namespace System
+{
using System.Threading;
using System.Runtime.Remoting;
using System.Security;
using System.Security.Util;
using System.Runtime.CompilerServices;
using System.Runtime.ConstrainedExecution;
+ using System.Diagnostics;
using System.Diagnostics.Contracts;
-#if FEATURE_CAS_POLICY
- using StringMaker = System.Security.Util.Tokenizer.StringMaker;
-#endif // FEATURE_CAS_POLICY
internal sealed class SharedStatics
{
@@ -40,7 +38,6 @@ namespace System {
private volatile String _Remoting_Identity_IDGuid;
public static String Remoting_Identity_IDGuid
{
- [System.Security.SecuritySafeCritical] // auto-generated
get
{
if (_sharedStatics._Remoting_Identity_IDGuid == null)
@@ -61,63 +58,12 @@ namespace System {
}
}
- Contract.Assert(_sharedStatics._Remoting_Identity_IDGuid != null,
+ Debug.Assert(_sharedStatics._Remoting_Identity_IDGuid != null,
"_sharedStatics._Remoting_Identity_IDGuid != null");
return _sharedStatics._Remoting_Identity_IDGuid;
}
}
-#if FEATURE_CAS_POLICY
- private StringMaker _maker;
- [System.Security.SecuritySafeCritical] // auto-generated
- static public StringMaker GetSharedStringMaker()
- {
- StringMaker maker = null;
-
- bool tookLock = false;
- RuntimeHelpers.PrepareConstrainedRegions();
- try {
- Monitor.Enter(_sharedStatics, ref tookLock);
-
- if (_sharedStatics._maker != null)
- {
- maker = _sharedStatics._maker;
- _sharedStatics._maker = null;
- }
- }
- finally {
- if (tookLock)
- Monitor.Exit(_sharedStatics);
- }
-
- if (maker == null)
- {
- maker = new StringMaker();
- }
-
- return maker;
- }
-
- [System.Security.SecuritySafeCritical] // auto-generated
- static public void ReleaseSharedStringMaker(ref StringMaker maker)
- {
- // save this stringmaker so someone else can use it
- bool tookLock = false;
- RuntimeHelpers.PrepareConstrainedRegions();
- try
- {
- Monitor.Enter(_sharedStatics, ref tookLock);
-
- _sharedStatics._maker = maker;
- maker = null;
- }
- finally {
- if (tookLock)
- Monitor.Exit(_sharedStatics);
- }
- }
-#endif // FEATURE_CAS_POLICY
-
// Note this may not need to be process-wide.
private int _Remoting_Identity_IDSeqNum;
internal static int Remoting_Identity_GetNextSeqNum()
@@ -140,7 +86,7 @@ namespace System {
internal static ulong MemoryFailPointReservedMemory {
get {
- Contract.Assert(Volatile.Read(ref _sharedStatics._memFailPointReservedMemory) >= 0, "Process-wide MemoryFailPoint reserved memory was negative!");
+ Debug.Assert(Volatile.Read(ref _sharedStatics._memFailPointReservedMemory) >= 0, "Process-wide MemoryFailPoint reserved memory was negative!");
return (ulong) Volatile.Read(ref _sharedStatics._memFailPointReservedMemory);
}
}