Skip to content

JIT: Disallow parameters passed in float regs from being enregistered in int regs #99286

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

Merged
jakobbotsch merged 4 commits into from
Mar 8, 2024
Merged

JIT: Disallow parameters passed in float regs from being enregistered in int regs #99286

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
17f8913
JIT: Validate some reg homing logic
jakobbotsch Mar 5, 2024
048f94c
Stop enregistering problematic case
jakobbotsch Mar 7, 2024
893f01f
Better fix
jakobbotsch Mar 7, 2024
33cdb8e
Clean up
jakobbotsch Mar 7, 2024
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
Prev Previous commit
Next Next commit
Stop enregistering problematic case
  • Loading branch information
@jakobbotsch
jakobbotsch committed Mar 7, 2024
commit 048f94c0b8b0ecbe55d8f9df37a121a86cea9962
14 changes: 8 additions & 6 deletions src/coreclr/jit/lclvars.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3843,18 +3843,15 @@ var_types LclVarDsc::GetRegisterType(const GenTreeLclVarCommon* tree) const

if (targetType == TYP_STRUCT)
{
ClassLayout* layout;
if (tree->OperIs(GT_LCL_FLD, GT_STORE_LCL_FLD))
{
layout = tree->AsLclFld()->GetLayout();
targetType = tree->AsLclFld()->GetLayout()->GetRegisterType();
}
else
{
assert((TypeGet() == TYP_STRUCT) && tree->OperIs(GT_LCL_VAR, GT_STORE_LCL_VAR));
layout = GetLayout();
targetType = GetRegisterType();
}

targetType = layout->GetRegisterType();
}

#ifdef DEBUG
Expand Down Expand Up @@ -3888,7 +3885,12 @@ var_types LclVarDsc::GetRegisterType() const
return TypeGet();
}
assert(m_layout != nullptr);
return m_layout->GetRegisterType();
var_types result = m_layout->GetRegisterType();
if ((result != TYP_UNDEF) && varTypeUsesIntReg(result) && lvIsRegArg && !lvPromoted && genIsValidFloatReg(GetArgReg()))
{
result = TYP_UNDEF;
}
return result;
}

//------------------------------------------------------------------------
Expand Down