Bump corefx

diff --git a/external/corefx b/external/corefx
index 63c51e726292149b4868db71baa883e5ad173766..f646c9d6a61cfc067df42b0e452448c4da7d144b 160000 (submodule)
--- a/external/corefx
+++ b/external/corefx
@@ -1 +1 @@
-Subproject commit 63c51e726292149b4868db71baa883e5ad173766
+Subproject commit f646c9d6a61cfc067df42b0e452448c4da7d144b

diff --git a/external/corert b/external/corert
index 24dc44aa3c3b5b7380778a683a3ab6d2793e4dc0..8dce492077a2cd43abff2e9d4e0c9e186f44af2e 160000 (submodule)
--- a/external/corert
+++ b/external/corert
@@ -1 +1 @@
-Subproject commit 24dc44aa3c3b5b7380778a683a3ab6d2793e4dc0
+Subproject commit 8dce492077a2cd43abff2e9d4e0c9e186f44af2e

diff --git a/mcs/class/System.Core/common_System.Core.dll.sources b/mcs/class/System.Core/common_System.Core.dll.sources
index 0ccd4597cf28757afe53f7736459e521435c2beb..9e54bcb3f7227e907b9cbcb4fd4e7caad0ef485a 100644 (file)
--- a/mcs/class/System.Core/common_System.Core.dll.sources
+++ b/mcs/class/System.Core/common_System.Core.dll.sources
@@ -124,7 +124,6 @@ System.Security.Cryptography/SHA512CryptoServiceProvider.cs
 ../../../external/corefx/src/System.Linq.Expressions/src/System/Runtime/CompilerServices/IRuntimeVariables.cs
 ../../../external/corefx/src/System.Linq.Expressions/src/System/Runtime/CompilerServices/ReadOnlyCollectionBuilder.cs
 ../../../external/corefx/src/System.Linq.Expressions/src/System/Runtime/CompilerServices/RuleCache.cs
-../../../external/corefx/src/System.Linq.Expressions/src/System/Runtime/CompilerServices/RuntimeOps.ExpressionQuoter.cs
 ../../../external/corefx/src/System.Linq.Expressions/src/System/Runtime/CompilerServices/RuntimeOps.RuntimeVariableList.cs
 ../../../external/corefx/src/System.Linq.Expressions/src/System/Runtime/CompilerServices/RuntimeOps.MergedRuntimeVariables.cs
 ../../../external/corefx/src/System.Linq.Expressions/src/System/Runtime/CompilerServices/RuntimeOps.RuntimeVariables.cs

diff --git a/mcs/class/System.Core/dynamic_System.Core.dll.sources b/mcs/class/System.Core/dynamic_System.Core.dll.sources
index 27d916c49d552f573fbea9fbcaf3835ea125e6b9..7dc422513068b28226e989df350e806580d6947d 100644 (file)
--- a/mcs/class/System.Core/dynamic_System.Core.dll.sources
+++ b/mcs/class/System.Core/dynamic_System.Core.dll.sources
@@ -32,3 +32,5 @@
 ../../../external/corefx/src/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/StackSpiller.Temps.cs
 ../../../external/corefx/src/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/StackSpiller.cs
 ../../../external/corefx/src/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/VariableBinder.cs
+
+../../../external/corefx/src/System.Linq.Expressions/src/System/Runtime/CompilerServices/RuntimeOps.ExpressionQuoter.cs

diff --git a/mcs/class/System.Numerics/System.Numerics.dll.sources b/mcs/class/System.Numerics/System.Numerics.dll.sources
index 1e56c801e93eb413f4a195e33b821d990f065615..4a50c42d7f362ca31cba282c9fc7c3ed178dd4f5 100644 (file)
--- a/mcs/class/System.Numerics/System.Numerics.dll.sources
+++ b/mcs/class/System.Numerics/System.Numerics.dll.sources
@@ -21,6 +21,8 @@ corefx/Vector.cs
 ../../../external/corefx/src/System.Runtime.Numerics/src/System/Numerics/Complex.cs
 ../../../external/corefx/src/System.Runtime.Numerics/src/System/Numerics/NumericsHelpers.cs
 
+../../../external/corefx/src/System.Numerics.Vectors/src/System/MathF.cs
+
 ../../../external/corefx/src/System.Numerics.Vectors/src/System/Numerics/JitIntrinsicAttribute.cs
 ../../../external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Matrix3x2.cs
 ../../../external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Matrix4x4.cs

diff --git a/mcs/class/corlib/ReferenceSources/RuntimeType.cs b/mcs/class/corlib/ReferenceSources/RuntimeType.cs
index d0b1473c7cd6d77edfae7bebbae07c837c7f9b7a..d124a93f25676f4965d892faf0848db55c460b5f 100644 (file)
--- a/mcs/class/corlib/ReferenceSources/RuntimeType.cs
+++ b/mcs/class/corlib/ReferenceSources/RuntimeType.cs
@@ -794,6 +794,13 @@ namespace System
                        }
                }
 
+               public override bool IsSZArray {
+                       get {
+                               // TODO: intrinsic
+                               return IsArray && ReferenceEquals (this, GetElementType ().MakeArrayType ());
+                       }
+               }
+
                internal override bool IsUserType {
                        get {
                                return false;

diff --git a/mcs/class/corlib/System.Threading/WaitHandle.cs b/mcs/class/corlib/System.Threading/WaitHandle.cs
index f09b9fe7e551c33a006f27bf3fa1300258b73e04..dd91330355ed355081c3778ece51e449cb73c7ef 100644 (file)
--- a/mcs/class/corlib/System.Threading/WaitHandle.cs
+++ b/mcs/class/corlib/System.Threading/WaitHandle.cs
@@ -45,6 +45,8 @@ namespace System.Threading
        {
                protected static readonly IntPtr InvalidHandle = (IntPtr) (-1);
 
+               internal const int MaxWaitHandles = 64;
+
                static int WaitMultiple(WaitHandle[] waitHandles, int millisecondsTimeout, bool exitContext, bool WaitAll)
                {
                        int release_last = -1;

diff --git a/mcs/class/corlib/corert/Debug.cs b/mcs/class/corlib/corert/Debug.cs
index 3eaf922d1345de6a66c9acf4482ae86c20396cdf..4d2446c5eca7b47aa5a724b00b29bed2a89b7f00 100644 (file)
--- a/mcs/class/corlib/corert/Debug.cs
+++ b/mcs/class/corlib/corert/Debug.cs
@@ -1,4 +1,3 @@
-
 namespace System.Diagnostics.Private
 {
        static partial class Debug

diff --git a/mcs/class/corlib/corert/RelocatedTypeAttribute.cs b/mcs/class/corlib/corert/RelocatedTypeAttribute.cs
new file mode 100644 (file)
index 0000000..b3dc5d6
--- /dev/null
+++ b/mcs/class/corlib/corert/RelocatedTypeAttribute.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Diagnostics;
+
+namespace Internal.Runtime.CompilerServices
+{
+       [Conditional ("ALWAYSREMOVED")]
+       [AttributeUsage(AttributeTargets.All)]
+       class RelocatedTypeAttribute : Attribute
+       {
+               public RelocatedTypeAttribute(String originalAssemblySimpleName)
+               {
+               }
+       }
+}
\ No newline at end of file

diff --git a/mcs/class/corlib/corert/RuntimeThread.cs b/mcs/class/corlib/corert/RuntimeThread.cs
new file mode 100644 (file)
index 0000000..72810fa
--- /dev/null
+++ b/mcs/class/corlib/corert/RuntimeThread.cs
@@ -0,0 +1,9 @@
+namespace Internal.Runtime.Augments
+{
+    class RuntimeThread
+    {
+       public static void InitializeThreadPoolThread ()
+       {
+       }
+    }
+}
\ No newline at end of file

diff --git a/mcs/class/corlib/corlib.dll.sources b/mcs/class/corlib/corlib.dll.sources
index 58358939536fc2cdd1e3b53d1471a0fe580086cb..6fb6cd13270d2815c36773ad9a211eb89be6eacd 100644 (file)
--- a/mcs/class/corlib/corlib.dll.sources
+++ b/mcs/class/corlib/corlib.dll.sources
@@ -1091,7 +1091,6 @@ ReferenceSources/Type.cs
 
 ../referencesource/mscorlib/system/collections/generic/comparer.cs
 ../referencesource/mscorlib/system/collections/generic/debugview.cs
-../referencesource/mscorlib/system/collections/generic/dictionary.cs
 ../referencesource/mscorlib/system/collections/generic/equalitycomparer.cs
 ../referencesource/mscorlib/system/collections/generic/icollection.cs
 ../referencesource/mscorlib/system/collections/generic/icomparer.cs
@@ -1644,6 +1643,8 @@ corert/Array.Portable.cs
 corert/Debug.cs
 corert/Interop.cs
 corert/Interop.MemAllocFree.cs
+corert/RelocatedTypeAttribute.cs
+corert/RuntimeThread.cs
 
 ../../../external/corert/src/Common/src/Interop/Unix/Interop.Libraries.cs
 
@@ -1651,34 +1652,43 @@ corert/Interop.MemAllocFree.cs
 
 ../../../external/corert/src/Common/src/Interop/Windows/Interop.Libraries.cs
 
-../../../external/corert/src/Common/src/Interop/Windows/mincore/Interop.Errors.cs
-../../../external/corert/src/Common/src/Interop/Windows/mincore/Interop.FormatMessage.cs
 ../../../external/corert/src/Common/src/Interop/Windows/mincore/Interop.MemAllocFree.cs
 ../../../external/corert/src/Common/src/Interop/Windows/mincore/Interop.ThreadPoolIO.cs
 
-../../../external/corert/src/Common/src/System/Diagnostics/Debug.cs
-
 ../../../external/corert/src/Common/src/System/Numerics/Hashing/HashHelpers.cs
 
 ../../../external/corert/src/Runtime.Base/src/System/Runtime/InteropServices/NativeCallableAttribute.cs
 
+
+../../../external/corert/src/System.Private.CoreLib/shared/Interop/Windows/Interop.Errors.cs
+../../../external/corert/src/System.Private.CoreLib/shared/Interop/Windows/Interop.Libraries.cs
+
+../../../external/corert/src/System.Private.CoreLib/shared/Interop/Windows/Kernel32/Interop.FormatMessage.cs
+
+../../../external/corert/src/System.Private.CoreLib/shared/System/TupleExtensions.cs
+
+../../../external/corert/src/System.Private.CoreLib/shared/System/IO/Win32Marshal.cs
+
+../../../external/corert/src/System.Private.CoreLib/shared/System/Runtime/CompilerServices/ITuple.cs
+../../../external/corert/src/System.Private.CoreLib/shared/System/Runtime/CompilerServices/TupleElementNamesAttribute.cs
+
+../../../external/corert/src/System.Private.CoreLib/shared/System/Threading/DeferredDisposableLifetime.cs
+
+
 ../../../external/corert/src/System.Private.CoreLib/src/Microsoft/Win32/SafeHandles/SafeThreadPoolIOHandle.cs
 
 ../../../external/corert/src/System.Private.CoreLib/src/System/Tuple.cs
-../../../external/corert/src/System.Private.CoreLib/src/System/TupleExtensions.cs
 ../../../external/corert/src/System.Private.CoreLib/src/System/ValueTuple.cs
 
 ../../../external/corert/src/System.Private.CoreLib/src/System/Collections/LowLevelComparer.cs
 ../../../external/corert/src/System.Private.CoreLib/src/System/Collections/ObjectEqualityComparer.cs
 
 ../../../external/corert/src/System.Private.CoreLib/src/System/Collections/Generic/ArraySortHelper.cs
+../../../external/corert/src/System.Private.CoreLib/src/System/Collections/Generic/IDictionaryDebugView.cs
+../../../external/corert/src/System.Private.CoreLib/src/System/Collections/Generic/Dictionary.cs
 
-../../../external/corert/src/System.Private.CoreLib/src/System/IO/Win32Marshal.cs
-
-../../../external/corert/src/System.Private.CoreLib/src/System/Runtime/CompilerServices/ITuple.cs
-../../../external/corert/src/System.Private.CoreLib/src/System/Runtime/CompilerServices/TupleElementNamesAttribute.cs
+../../../external/corert/src/System.Private.CoreLib/src/System/Diagnostics/Debug.cs
 
-../../../external/corert/src/System.Private.CoreLib/src/System/Threading/DeferredDisposableLifetime.cs
 ../../../external/corert/src/System.Private.CoreLib/src/System/Threading/Win32ThreadPoolBoundHandle.cs
 ../../../external/corert/src/System.Private.CoreLib/src/System/Threading/Win32ThreadPoolNativeOverlapped.cs
 ../../../external/corert/src/System.Private.CoreLib/src/System/Threading/Win32ThreadPoolNativeOverlapped.ExecutionContextCallbackArgs.cs

diff --git a/mcs/class/referencesource/mscorlib/system/reflection/typedelegator.cs b/mcs/class/referencesource/mscorlib/system/reflection/typedelegator.cs
index 59d567cb25ef7de5e53ec47e1b70daa737e36791..0cb24e826918eaaa5a12ae98ea5e0c30beb5b408 100644 (file)
--- a/mcs/class/referencesource/mscorlib/system/reflection/typedelegator.cs
+++ b/mcs/class/referencesource/mscorlib/system/reflection/typedelegator.cs
@@ -261,5 +261,9 @@ namespace System.Reflection {
         {
             return typeImpl.GetInterfaceMap(interfaceType);
         }
+
+#if MONO
+        public override bool IsSZArray { get { return typeImpl.IsSZArray; } }
+#endif
     }
 }

diff --git a/mcs/class/referencesource/mscorlib/system/type.cs b/mcs/class/referencesource/mscorlib/system/type.cs
index e31567473f76028d20434e8ef3e53f23aab793bb..929fb43097f515f3c33cb0250806c60c19cb059d 100644 (file)
--- a/mcs/class/referencesource/mscorlib/system/type.cs
+++ b/mcs/class/referencesource/mscorlib/system/type.cs
@@ -1891,6 +1891,10 @@ namespace System {
         // private convenience data
         private const BindingFlags DefaultLookup = BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public;
         internal const BindingFlags DeclaredOnlyLookup = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static | BindingFlags.DeclaredOnly;
+
+#if MONO
+        public virtual bool IsSZArray { get { throw new NotImplementedException (); } }
+#endif
 }
 
 #if CONTRACTS_FULL

diff --git a/mcs/errors/CS0122-38-lib.cs b/mcs/errors/CS0122-38-lib.cs
index bcedb915d92948a500f84360eefb95f88024632c..4337c3a4fdce3829c81c99b7e1f8ccc5e942f69c 100644 (file)
--- a/mcs/errors/CS0122-38-lib.cs
+++ b/mcs/errors/CS0122-38-lib.cs
@@ -2,7 +2,7 @@ using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo("cs0122-38, PublicKeyToken=<ad60da1470a03d36")]
 
-class Internal
+class InternalClass
 {
        
 }
\ No newline at end of file

diff --git a/mcs/errors/cs0122-38.cs b/mcs/errors/cs0122-38.cs
index e30975028cedd68422c3f9c3acca8905a3cf76e6..8406845c4b684ccae29b462204c1672e0790736e 100644 (file)
--- a/mcs/errors/cs0122-38.cs
+++ b/mcs/errors/cs0122-38.cs
@@ -1,4 +1,4 @@
-// CS0122: `Internal' is inaccessible due to its protection level
+// CS0122: `InternalClass' is inaccessible due to its protection level
 // Line: 9
 // Compiler options: -r:CS0122-38-lib.dll
 
@@ -6,6 +6,6 @@ class M
 {
        public static void Main ()
        {
-               new Internal ();
+               new InternalClass ();
        }
 }
\ No newline at end of file

diff --git a/mcs/tools/mono-symbolicate/Makefile b/mcs/tools/mono-symbolicate/Makefile
index 2a81a74173ce2ccb9477fb48418192b2605dc6d1..ddc254ec1138a5e495d354fb37b9bef64cabba9a 100644 (file)
--- a/mcs/tools/mono-symbolicate/Makefile
+++ b/mcs/tools/mono-symbolicate/Makefile
@@ -25,7 +25,7 @@ SYMBOLICATE_EXPECTED_FILE = Test/symbolicate.expected
 CHECK_DIFF = @\
        $(MONO) $(TEST_EXE) > $(STACKTRACE_FILE); \
        $(MONO) $(LIB_PATH)/$(PROGRAM) $(MSYM_DIR) $(STACKTRACE_FILE) > $(SYMBOLICATE_RAW_FILE); \
-       cat $(SYMBOLICATE_RAW_FILE) | tr '\\' '/' | sed "s/) .* in .*\/mcs\//) in mcs\//" | sed '/\[MVID\]/d' | sed '/\[AOTID\]/d' > $(SYMBOLICATE_RESULT_FILE); \
+       cat $(SYMBOLICATE_RAW_FILE) | tr '\\' '/' | sed "s/) .* in .*\/mcs\//) in mcs\//" | sed "s/) .* in .*\/external\//) in external\//" | sed '/\[MVID\]/d' | sed '/\[AOTID\]/d' > $(SYMBOLICATE_RESULT_FILE); \
        DIFF=$$(diff -up $(SYMBOLICATE_EXPECTED_FILE) $(SYMBOLICATE_RESULT_FILE)); \
        if [ ! -z "$$DIFF" ]; then \
                echo "Symbolicate tests failed."; \

diff --git a/mcs/tools/mono-symbolicate/Test/symbolicate.expected b/mcs/tools/mono-symbolicate/Test/symbolicate.expected
index 1ad44cec5ccaeb0d9f33a8a55cdbc81364810bda..71084c05af8d554e10d17f626233a3b0c5869551 100644 (file)
--- a/mcs/tools/mono-symbolicate/Test/symbolicate.expected
+++ b/mcs/tools/mono-symbolicate/Test/symbolicate.expected
@@ -141,14 +141,12 @@ Stacktrace:
 
 System.ArgumentNullException: Value cannot be null.
 Parameter name: key
-  at System.ThrowHelper.ThrowArgumentNullException (System.ExceptionArgument argument) in mcs/class/referencesource/mscorlib/system/throwhelper.cs:80 
-  at System.Collections.Generic.Dictionary`2[TKey,TValue].FindEntry (TKey key) in mcs/class/referencesource/mscorlib/system/collections/generic/dictionary.cs:299 
-  at System.Collections.Generic.Dictionary`2[TKey,TValue].ContainsKey (TKey key) in mcs/class/referencesource/mscorlib/system/collections/generic/dictionary.cs:228 
+  at System.Collections.Generic.Dictionary`2[TKey,TValue].FindEntry (TKey key) in external/corert/src/System.Private.CoreLib/src/System/Collections/Generic/Dictionary.cs:359 
+  at System.Collections.Generic.Dictionary`2[TKey,TValue].ContainsKey (TKey key) in external/corert/src/System.Private.CoreLib/src/System/Collections/Generic/Dictionary.cs:275 
   at StackTraceDumper+<>c.<Main>b__0_15 () in mcs/tools/mono-symbolicate/Test/StackTraceDumper.cs:54 
   at StackTraceDumper.Catch (System.Action action) in mcs/tools/mono-symbolicate/Test/StackTraceDumper.cs:72 
 Stacktrace:
-  at System.ThrowHelper.ThrowArgumentNullException (System.ExceptionArgument argument) in mcs/class/referencesource/mscorlib/system/throwhelper.cs:80 
-  at System.Collections.Generic.Dictionary`2[TKey,TValue].FindEntry (TKey key) in mcs/class/referencesource/mscorlib/system/collections/generic/dictionary.cs:299 
-  at System.Collections.Generic.Dictionary`2[TKey,TValue].ContainsKey (TKey key) in mcs/class/referencesource/mscorlib/system/collections/generic/dictionary.cs:228 
+  at System.Collections.Generic.Dictionary`2[TKey,TValue].FindEntry (TKey key) in external/corert/src/System.Private.CoreLib/src/System/Collections/Generic/Dictionary.cs:359 
+  at System.Collections.Generic.Dictionary`2[TKey,TValue].ContainsKey (TKey key) in external/corert/src/System.Private.CoreLib/src/System/Collections/Generic/Dictionary.cs:275 
   at StackTraceDumper+<>c.<Main>b__0_15 () in mcs/tools/mono-symbolicate/Test/StackTraceDumper.cs:54 
   at StackTraceDumper.Catch (System.Action action) in mcs/tools/mono-symbolicate/Test/StackTraceDumper.cs:72