Skip to content

[release/7.0] [mono][jit] Zero extend the return when we might be invoking llvm generated code #74991

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
merged 1 commit into from
Sep 6, 2022
Merged

[release/7.0] [mono][jit] Zero extend the return when we might be invoking llvm generated code #74991

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
11 changes: 10 additions & 1 deletion src/mono/mono/mini/method-to-ir.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2232,7 +2232,16 @@ static MonoInst*
mono_emit_widen_call_res (MonoCompile *cfg, MonoInst *ins, MonoMethodSignature *fsig)
{
if (!MONO_TYPE_IS_VOID (fsig->ret)) {
if ((fsig->pinvoke || LLVM_ENABLED) && !m_type_is_byref (fsig->ret)) {
// FIXME
// LLVM code doesn't uses zero extend the full word while jit expects it.
// A proper fix would be to detect if we are actually using llvm code from aot images
// or make sure llvm code actually zero extends the return.
#ifdef MONO_ARCH_LLVM_SUPPORTED
gboolean might_use_llvm = TRUE;
#else
gboolean might_use_llvm = FALSE;
#endif
if ((fsig->pinvoke || might_use_llvm) && !m_type_is_byref (fsig->ret)) {
int widen_op = -1;

/*
Expand Down