Merge pull request #453 from davidwrighton/integration_tweaks

Make Type System somewhat more flexible

2 files changed, 8 insertions, 1 deletions

diff --git a/src/Common/src/TypeSystem/Common/ArrayType.cs b/src/Common/src/TypeSystem/Common/ArrayType.cs
index 92810cfad..9541676dc 100644
--- a/src/Common/src/TypeSystem/Common/ArrayType.cs
+++ b/src/Common/src/TypeSystem/Common/ArrayType.cs
@@ -146,7 +146,7 @@ namespace Internal.TypeSystem
         Ctor
     }
 
-    public class ArrayMethod : MethodDesc
+    public partial class ArrayMethod : MethodDesc
     {
         private ArrayType _owningType;
         private ArrayMethodKind _kind;
diff --git a/src/Common/src/TypeSystem/Common/Utilities/LockFreeReaderHashtable.cs b/src/Common/src/TypeSystem/Common/Utilities/LockFreeReaderHashtable.cs
index 9ce407a45..b72c7095f 100644
--- a/src/Common/src/TypeSystem/Common/Utilities/LockFreeReaderHashtable.cs
+++ b/src/Common/src/TypeSystem/Common/Utilities/LockFreeReaderHashtable.cs
@@ -128,6 +128,11 @@ namespace Internal.TypeSystem
         }
 
         /// <summary>
+        /// The current count of elements in the hashtable
+        /// </summary>
+        public int Count { get { return _count; } }
+
+        /// <summary>
         /// Gets the value associated with the specified key.
         /// </summary>
         /// <param name="key">The key of the value to get.</param>
@@ -232,7 +237,9 @@ namespace Internal.TypeSystem
             if (value == null)
                 throw new ArgumentNullException();
 
+#if !TYPE_SYSTEM_SINGLE_THREADED
             lock (this)
+#endif
             {
                 // Check to see if adding this value may require a resize. If so, expand
                 // the table now.