From fb1a589aea75cc332470a5e04ab5140abd8369ad Mon Sep 17 00:00:00 2001
From: Tanner Gooding <tagoo@outlook.com>
Date: Tue, 29 Jan 2019 13:34:01 -0800
Subject: [PATCH] Fixing several of the HWIntrinsic SoftwareFallback functions
 to be captureless (#22263)

Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
---
 .../shared/System/Runtime/Intrinsics/Vector128.cs    | 16 ++++++++--------
 .../shared/System/Runtime/Intrinsics/Vector256.cs    | 20 ++++++++++----------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/netcore/System.Private.CoreLib/shared/System/Runtime/Intrinsics/Vector128.cs b/netcore/System.Private.CoreLib/shared/System/Runtime/Intrinsics/Vector128.cs
index a57f999112c..e4a031c14ec 100644
--- a/netcore/System.Private.CoreLib/shared/System/Runtime/Intrinsics/Vector128.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Runtime/Intrinsics/Vector128.cs
@@ -1172,7 +1172,7 @@ namespace System.Runtime.Intrinsics
             Vector128<short> SoftwareFallback(short x)
             {
                 var result = Vector128<short>.Zero;
-                Unsafe.WriteUnaligned(ref Unsafe.As<Vector128<short>, byte>(ref result), value);
+                Unsafe.WriteUnaligned(ref Unsafe.As<Vector128<short>, byte>(ref result), x);
                 return result;
             }
         }
@@ -1193,7 +1193,7 @@ namespace System.Runtime.Intrinsics
             Vector128<int> SoftwareFallback(int x)
             {
                 var result = Vector128<int>.Zero;
-                Unsafe.WriteUnaligned(ref Unsafe.As<Vector128<int>, byte>(ref result), value);
+                Unsafe.WriteUnaligned(ref Unsafe.As<Vector128<int>, byte>(ref result), x);
                 return result;
             }
         }
@@ -1213,7 +1213,7 @@ namespace System.Runtime.Intrinsics
             Vector128<long> SoftwareFallback(long x)
             {
                 var result = Vector128<long>.Zero;
-                Unsafe.WriteUnaligned(ref Unsafe.As<Vector128<long>, byte>(ref result), value);
+                Unsafe.WriteUnaligned(ref Unsafe.As<Vector128<long>, byte>(ref result), x);
                 return result;
             }
         }
@@ -1237,7 +1237,7 @@ namespace System.Runtime.Intrinsics
             Vector128<sbyte> SoftwareFallback(sbyte x)
             {
                 var result = Vector128<sbyte>.Zero;
-                Unsafe.WriteUnaligned(ref Unsafe.As<Vector128<sbyte>, byte>(ref result), value);
+                Unsafe.WriteUnaligned(ref Unsafe.As<Vector128<sbyte>, byte>(ref result), x);
                 return result;
             }
         }
@@ -1258,7 +1258,7 @@ namespace System.Runtime.Intrinsics
             Vector128<float> SoftwareFallback(float x)
             {
                 var result = Vector128<float>.Zero;
-                Unsafe.WriteUnaligned(ref Unsafe.As<Vector128<float>, byte>(ref result), value);
+                Unsafe.WriteUnaligned(ref Unsafe.As<Vector128<float>, byte>(ref result), x);
                 return result;
             }
         }
@@ -1282,7 +1282,7 @@ namespace System.Runtime.Intrinsics
             Vector128<ushort> SoftwareFallback(ushort x)
             {
                 var result = Vector128<ushort>.Zero;
-                Unsafe.WriteUnaligned(ref Unsafe.As<Vector128<ushort>, byte>(ref result), value);
+                Unsafe.WriteUnaligned(ref Unsafe.As<Vector128<ushort>, byte>(ref result), x);
                 return result;
             }
         }
@@ -1304,7 +1304,7 @@ namespace System.Runtime.Intrinsics
             Vector128<uint> SoftwareFallback(uint x)
             {
                 var result = Vector128<uint>.Zero;
-                Unsafe.WriteUnaligned(ref Unsafe.As<Vector128<uint>, byte>(ref result), value);
+                Unsafe.WriteUnaligned(ref Unsafe.As<Vector128<uint>, byte>(ref result), x);
                 return result;
             }
         }
@@ -1326,7 +1326,7 @@ namespace System.Runtime.Intrinsics
             Vector128<ulong> SoftwareFallback(ulong x)
             {
                 var result = Vector128<ulong>.Zero;
-                Unsafe.WriteUnaligned(ref Unsafe.As<Vector128<ulong>, byte>(ref result), value);
+                Unsafe.WriteUnaligned(ref Unsafe.As<Vector128<ulong>, byte>(ref result), x);
                 return result;
             }
         }
diff --git a/netcore/System.Private.CoreLib/shared/System/Runtime/Intrinsics/Vector256.cs b/netcore/System.Private.CoreLib/shared/System/Runtime/Intrinsics/Vector256.cs
index f1f70786cab..4404f2c3a72 100644
--- a/netcore/System.Private.CoreLib/shared/System/Runtime/Intrinsics/Vector256.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Runtime/Intrinsics/Vector256.cs
@@ -1261,7 +1261,7 @@ namespace System.Runtime.Intrinsics
             Vector256<byte> SoftwareFallback(byte x)
             {
                 var result = Vector256<byte>.Zero;
-                Unsafe.WriteUnaligned(ref Unsafe.As<Vector256<byte>, byte>(ref result), value);
+                Unsafe.WriteUnaligned(ref Unsafe.As<Vector256<byte>, byte>(ref result), x);
                 return result;
             }
         }
@@ -1282,7 +1282,7 @@ namespace System.Runtime.Intrinsics
             Vector256<double> SoftwareFallback(double x)
             {
                 var result = Vector256<double>.Zero;
-                Unsafe.WriteUnaligned(ref Unsafe.As<Vector256<double>, byte>(ref result), value);
+                Unsafe.WriteUnaligned(ref Unsafe.As<Vector256<double>, byte>(ref result), x);
                 return result;
             }
         }
@@ -1303,7 +1303,7 @@ namespace System.Runtime.Intrinsics
             Vector256<short> SoftwareFallback(short x)
             {
                 var result = Vector256<short>.Zero;
-                Unsafe.WriteUnaligned(ref Unsafe.As<Vector256<short>, byte>(ref result), value);
+                Unsafe.WriteUnaligned(ref Unsafe.As<Vector256<short>, byte>(ref result), x);
                 return result;
             }
         }
@@ -1324,7 +1324,7 @@ namespace System.Runtime.Intrinsics
             Vector256<int> SoftwareFallback(int x)
             {
                 var result = Vector256<int>.Zero;
-                Unsafe.WriteUnaligned(ref Unsafe.As<Vector256<int>, byte>(ref result), value);
+                Unsafe.WriteUnaligned(ref Unsafe.As<Vector256<int>, byte>(ref result), x);
                 return result;
             }
         }
@@ -1345,7 +1345,7 @@ namespace System.Runtime.Intrinsics
             Vector256<long> SoftwareFallback(long x)
             {
                 var result = Vector256<long>.Zero;
-                Unsafe.WriteUnaligned(ref Unsafe.As<Vector256<long>, byte>(ref result), value);
+                Unsafe.WriteUnaligned(ref Unsafe.As<Vector256<long>, byte>(ref result), x);
                 return result;
             }
         }
@@ -1367,7 +1367,7 @@ namespace System.Runtime.Intrinsics
             Vector256<sbyte> SoftwareFallback(sbyte x)
             {
                 var result = Vector256<sbyte>.Zero;
-                Unsafe.WriteUnaligned(ref Unsafe.As<Vector256<sbyte>, byte>(ref result), value);
+                Unsafe.WriteUnaligned(ref Unsafe.As<Vector256<sbyte>, byte>(ref result), x);
                 return result;
             }
         }
@@ -1388,7 +1388,7 @@ namespace System.Runtime.Intrinsics
             Vector256<float> SoftwareFallback(float x)
             {
                 var result = Vector256<float>.Zero;
-                Unsafe.WriteUnaligned(ref Unsafe.As<Vector256<float>, byte>(ref result), value);
+                Unsafe.WriteUnaligned(ref Unsafe.As<Vector256<float>, byte>(ref result), x);
                 return result;
             }
         }
@@ -1410,7 +1410,7 @@ namespace System.Runtime.Intrinsics
             Vector256<ushort> SoftwareFallback(ushort x)
             {
                 var result = Vector256<ushort>.Zero;
-                Unsafe.WriteUnaligned(ref Unsafe.As<Vector256<ushort>, byte>(ref result), value);
+                Unsafe.WriteUnaligned(ref Unsafe.As<Vector256<ushort>, byte>(ref result), x);
                 return result;
             }
         }
@@ -1432,7 +1432,7 @@ namespace System.Runtime.Intrinsics
             Vector256<uint> SoftwareFallback(uint x)
             {
                 var result = Vector256<uint>.Zero;
-                Unsafe.WriteUnaligned(ref Unsafe.As<Vector256<uint>, byte>(ref result), value);
+                Unsafe.WriteUnaligned(ref Unsafe.As<Vector256<uint>, byte>(ref result), x);
                 return result;
             }
         }
@@ -1454,7 +1454,7 @@ namespace System.Runtime.Intrinsics
             Vector256<ulong> SoftwareFallback(ulong x)
             {
                 var result = Vector256<ulong>.Zero;
-                Unsafe.WriteUnaligned(ref Unsafe.As<Vector256<ulong>, byte>(ref result), value);
+                Unsafe.WriteUnaligned(ref Unsafe.As<Vector256<ulong>, byte>(ref result), x);
                 return result;
             }
         }
-- 
2.11.4.GIT