summaryrefslogtreecommitdiff
path: root/src/System.Private.CoreLib
diff options
context:
space:
mode:
authorMichal Strehovský <MichalStrehovsky@users.noreply.github.com>2019-05-06 13:16:10 +0200
committerAnirudh Agnihotry <anirudhagnihotry098@gmail.com>2019-07-15 13:52:34 -0700
commit7fe3cc73d1ee4bbe81b2a5e8a62667b78a02f7ae (patch)
treee22c2928a54a82445553096f4cd2a4e97ea26dcd /src/System.Private.CoreLib
parent11e150aab5be697d1d677a3084e66dbdab344d2a (diff)
downloadcoreclr-7fe3cc73d1ee4bbe81b2a5e8a62667b78a02f7ae.tar.gz
coreclr-7fe3cc73d1ee4bbe81b2a5e8a62667b78a02f7ae.tar.bz2
coreclr-7fe3cc73d1ee4bbe81b2a5e8a62667b78a02f7ae.zip
Merge pull request dotnet/corert#7397 from dotnet-bot/from-tfs
Merge changes from TFS Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
Diffstat (limited to 'src/System.Private.CoreLib')
-rw-r--r--src/System.Private.CoreLib/shared/System/Numerics/Vector.cs6
-rw-r--r--src/System.Private.CoreLib/shared/System/Numerics/Vector.tt6
2 files changed, 12 insertions, 0 deletions
diff --git a/src/System.Private.CoreLib/shared/System/Numerics/Vector.cs b/src/System.Private.CoreLib/shared/System/Numerics/Vector.cs
index b49d8b1720..8afa109f42 100644
--- 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 ed2b606e55..46824941fb 100644
--- 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
}
}