Skip to content

Commit b4faef4

Browse files
author
Sergey Andreenko
committed
Reenable HVA merge cases.
Closes #37341, closes #37880.
1 parent 5ae2554 commit b4faef4

File tree

1 file changed

+20
-21
lines changed

1 file changed

+20
-21
lines changed

src/coreclr/tests/src/JIT/Directed/StructABI/structreturn.cs

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1219,27 +1219,26 @@ static Vector<T> ReturnVectorT<T>() where T : struct
12191219
[MethodImpl(MethodImplOptions.NoInlining)]
12201220
static Vector<T> ReturnVectorTWithMerge<T>(int v, T init1, T init2, T init3, T init4) where T : struct
12211221
{
1222-
// issue https://github.com/dotnet/runtime/issues/37341
1223-
// if (v == 0)
1224-
// {
1225-
// return new Vector<T>();
1226-
// }
1227-
// else if (v == 1)
1228-
// {
1229-
// return new Vector<T>(init1);
1230-
// }
1231-
// else if (v == 2)
1232-
// {
1233-
// return new Vector<T>(init2);
1234-
// }
1235-
// else if (v == 3)
1236-
// {
1237-
// return new Vector<T>(init3);
1238-
// }
1239-
// else
1240-
// {
1241-
// return new Vector<T>(init4);
1242-
// }
1222+
if (v == 0)
1223+
{
1224+
return new Vector<T>();
1225+
}
1226+
else if (v == 1)
1227+
{
1228+
return new Vector<T>(init1);
1229+
}
1230+
else if (v == 2)
1231+
{
1232+
return new Vector<T>(init2);
1233+
}
1234+
else if (v == 3)
1235+
{
1236+
return new Vector<T>(init3);
1237+
}
1238+
else
1239+
{
1240+
return new Vector<T>(init4);
1241+
}
12431242
return new Vector<T>();
12441243
}
12451244

0 commit comments

Comments
 (0)