Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit c1a5ed7

Browse files
authored
Merge pull request #6467 from briansull/multireg-return2
Enable multireg returns on Arm64
2 parents e87474f + feb33b9 commit c1a5ed7

30 files changed

+1890
-993
lines changed

src/jit/codegen.h

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -443,26 +443,26 @@ protected :
443443

444444
void genPrologPadForReJit();
445445

446-
void genEmitCall(int callType,
447-
CORINFO_METHOD_HANDLE methHnd,
448-
INDEBUG_LDISASM_COMMA(CORINFO_SIG_INFO* sigInfo)
449-
void* addr
450-
X86_ARG(ssize_t argSize),
451-
emitAttr retSize
452-
FEATURE_UNIX_AMD64_STRUCT_PASSING_ONLY_ARG(emitAttr secondRetSize),
453-
IL_OFFSETX ilOffset,
454-
regNumber base = REG_NA,
455-
bool isJump = false,
456-
bool isNoGC = false);
446+
void genEmitCall(int callType,
447+
CORINFO_METHOD_HANDLE methHnd,
448+
INDEBUG_LDISASM_COMMA(CORINFO_SIG_INFO* sigInfo)
449+
void* addr
450+
X86_ARG(ssize_t argSize),
451+
emitAttr retSize
452+
MULTIREG_HAS_SECOND_GC_RET_ONLY_ARG(emitAttr secondRetSize),
453+
IL_OFFSETX ilOffset,
454+
regNumber base = REG_NA,
455+
bool isJump = false,
456+
bool isNoGC = false);
457457

458-
void genEmitCall(int callType,
459-
CORINFO_METHOD_HANDLE methHnd,
460-
INDEBUG_LDISASM_COMMA(CORINFO_SIG_INFO* sigInfo)
461-
GenTreeIndir* indir
462-
X86_ARG(ssize_t argSize),
463-
emitAttr retSize
464-
FEATURE_UNIX_AMD64_STRUCT_PASSING_ONLY_ARG(emitAttr secondRetSize),
465-
IL_OFFSETX ilOffset);
458+
void genEmitCall(int callType,
459+
CORINFO_METHOD_HANDLE methHnd,
460+
INDEBUG_LDISASM_COMMA(CORINFO_SIG_INFO* sigInfo)
461+
GenTreeIndir* indir
462+
X86_ARG(ssize_t argSize),
463+
emitAttr retSize
464+
MULTIREG_HAS_SECOND_GC_RET_ONLY_ARG(emitAttr secondRetSize),
465+
IL_OFFSETX ilOffset);
466466

467467

468468
//
@@ -900,7 +900,7 @@ public :
900900
void instEmit_indCall(GenTreePtr call,
901901
size_t argSize,
902902
emitAttr retSize
903-
FEATURE_UNIX_AMD64_STRUCT_PASSING_ONLY_ARG(emitAttr secondRetSize));
903+
MULTIREG_HAS_SECOND_GC_RET_ONLY_ARG(emitAttr secondRetSize));
904904

905905
void instEmit_RM (instruction ins,
906906
GenTreePtr tree,

0 commit comments

Comments
 (0)