ag/cpython-source-deps
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix two "return" issues in x86/ffi64.c (#431)

Browse Source 
Issue #70 pointed out that at least one compiler didn't like:

    return ffi_call_efi64(cif, fn, rvalue, avalue);

... where the return type is "void".  This patch splits the statement
into two.

I also noticed that ffi_call_go here seems to do a double call.  I
suspect a "return" is missing here, so this patch adds it as well.
This commit is contained in:
Tom Tromey
2018-04-28 04:46:10 -06:00
committed by Anthony Green
parent ed3ed4d801
commit 4c2206ace0
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/x86/ffi64.c
View File

@@ -678,7 +678,10 @@ ffi_call (ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue)
{
#ifndef __ILP32__
if (cif->abi == FFI_EFI64)
return ffi_call_efi64(cif, fn, rvalue, avalue);
{
ffi_call_efi64(cif, fn, rvalue, avalue);
return;
}
#endif
ffi_call_int (cif, fn, rvalue, avalue, NULL);
}
@@ -695,7 +698,10 @@ ffi_call_go (ffi_cif *cif, void (*fn)(void), void *rvalue,
{
#ifndef __ILP32__
if (cif->abi == FFI_EFI64)
ffi_call_go_efi64(cif, fn, rvalue, avalue, closure);
{
ffi_call_go_efi64(cif, fn, rvalue, avalue, closure);
return;
}
#endif
ffi_call_int (cif, fn, rvalue, avalue, closure);
}