Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release/8.0] JIT: Handle mistyped commas in morph in pre-order too #91718

Merged
merged 4 commits into from
Sep 11, 2023
Merged

[release/8.0] JIT: Handle mistyped commas in morph in pre-order too #91718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
26b683b
JIT: Compensate for mistyped commas in morph pre-order too
jakobbotsch Sep 5, 2023
99b7f1f
Fix build
jakobbotsch Sep 5, 2023
b687454
Merge branch 'release/8.0' into backport/pr-91587-to-release/8.0
jeffschwMSFT Sep 11, 2023
01fcc10
Merge branch 'release/8.0' into backport/pr-91587-to-release/8.0
jeffschwMSFT Sep 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/coreclr/jit/morph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8919,6 +8919,14 @@ GenTree* Compiler::fgMorphSmpOp(GenTree* tree, MorphAddrContext* mac, bool* optA
break;
#endif

case GT_COMMA:
if (op2->OperIsStore() || (op2->OperGet() == GT_COMMA && op2->TypeGet() == TYP_VOID) || fgIsThrow(op2))
{
typ = tree->gtType = TYP_VOID;
}

break;

default:
break;
}
Expand Down
23 changes: 23 additions & 0 deletions src/tests/JIT/Regression/JitBlue/Runtime_91443/Runtime_91443.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Numerics;
using System.Runtime.CompilerServices;
using Xunit;

public class Runtime_91443
{
[Fact]
public static void TestEntryPoint()
{
new Runtime_91443().Method0();
}

static Vector3 s;

[MethodImpl(MethodImplOptions.NoInlining)]
private void Method0()
{
Vector3.Cross(s, s);
}
}
8 changes: 8 additions & 0 deletions src/tests/JIT/Regression/JitBlue/Runtime_91443/Runtime_91443.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Optimize>True</Optimize>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(MSBuildProjectName).cs" />
</ItemGroup>
</Project>
Loading