Skip to content

[RISC-V][JIT] Fix assert on passing double in struct #84584

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 1 commit into from
Apr 12, 2023
Merged

[RISC-V][JIT] Fix assert on passing double in struct #84584

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 6 additions & 2 deletions src/coreclr/jit/scopeinfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -942,7 +942,7 @@ void CodeGen::psiBegProlog()
if (!isStructHandled)
{
#ifdef DEBUG
#ifdef TARGET_LOONGARCH64
#if defined(TARGET_LOONGARCH64) || defined(TARGET_RISCV64)
var_types regType;
if (varTypeIsStruct(lclVarDsc))
{
Expand All @@ -961,19 +961,23 @@ void CodeGen::psiBegProlog()
else
{
regType = compiler->mangleVarArgsType(lclVarDsc->TypeGet());
#ifdef TARGET_LOONGARCH
Copy link
Contributor

@shushanhf shushanhf Apr 21, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@t-mustafin
Please don't destroy the LoongArch64's code.

I revert it by #85151

Copy link
Contributor Author

@t-mustafin t-mustafin May 1, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@shushanhf My mistake, sorry for that.

if (emitter::isGeneralRegisterOrR0(lclVarDsc->GetArgReg()) && isFloatRegType(regType))
{
// For LoongArch64's ABI, the float args may be passed by integer register.
regType = TYP_LONG;
}
#else // TARGET_RISCV64
// For RV64GC -mabi=lp64d is assumed, so floats are not passed through integer registers.
#endif
}
#else
var_types regType = compiler->mangleVarArgsType(lclVarDsc->TypeGet());
if (lclVarDsc->lvIsHfaRegArg())
{
regType = lclVarDsc->GetHfaType();
}
#endif
#endif // defined(TARGET_LOONGARCH64) || defined(TARGET_RISCV64)
assert(genMapRegNumToRegArgNum(lclVarDsc->GetArgReg(), regType) != (unsigned)-1);
#endif // DEBUG
varLocation.storeVariableInRegisters(lclVarDsc->GetArgReg(), REG_NA);
Expand Down