Merge pull request dotnet/corert#7397 from dotnet-bot/from-tfs

Merge changes from TFS

Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>

diff --git a/src/System.Private.CoreLib/shared/System/Numerics/Vector.cs b/src/System.Private.CoreLib/shared/System/Numerics/Vector.cs
index b49d8b1..8afa109 100644 (file)
--- a/src/System.Private.CoreLib/shared/System/Numerics/Vector.cs
+++ b/src/System.Private.CoreLib/shared/System/Numerics/Vector.cs
@@ -61,7 +61,13 @@ namespace System.Numerics
             get
             {
                 ThrowHelper.ThrowForUnsupportedVectorBaseType<T>();
+#if PROJECTN
+                // Hits an active bug in ProjectN (887908). This code path is actually only used rarely,
+                // since get_Count is an intrinsic.
+                throw new NotImplementedException();
+#else
                 return Unsafe.SizeOf<Vector<T>>() / Unsafe.SizeOf<T>();
+#endif
             }
         }
 

diff --git a/src/System.Private.CoreLib/shared/System/Numerics/Vector.tt b/src/System.Private.CoreLib/shared/System/Numerics/Vector.tt
index ed2b606..4682494 100644 (file)
--- a/src/System.Private.CoreLib/shared/System/Numerics/Vector.tt
+++ b/src/System.Private.CoreLib/shared/System/Numerics/Vector.tt
@@ -65,7 +65,13 @@ namespace System.Numerics
             get
             {
                 ThrowHelper.ThrowForUnsupportedVectorBaseType<T>();
+#if PROJECTN
+                // Hits an active bug in ProjectN (887908). This code path is actually only used rarely,
+                // since get_Count is an intrinsic.
+                throw new NotImplementedException();
+#else
                 return Unsafe.SizeOf<Vector<T>>() / Unsafe.SizeOf<T>();
+#endif
             }
         }