diff options
Diffstat (limited to 'src/jit')
| -rw-r--r-- | src/jit/gentree.h | 2 | ||||
| -rw-r--r-- | src/jit/importer.cpp | 4 | ||||
| -rw-r--r-- | src/jit/morph.cpp | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/jit/gentree.h b/src/jit/gentree.h index c52fc9694e..b638e68d53 100644 --- a/src/jit/gentree.h +++ b/src/jit/gentree.h @@ -3444,7 +3444,7 @@ struct GenTreeCall final : public GenTree #define GTF_CALL_M_R2R_REL_INDIRECT 0x00002000 // GT_CALL -- ready to run call is indirected through a relative address #define GTF_CALL_M_DOES_NOT_RETURN 0x00004000 // GT_CALL -- call does not return -#define GTF_CALL_M_SECURE_DELEGATE_INV 0x00008000 // GT_CALL -- call is in secure delegate +#define GTF_CALL_M_WRAPPER_DELEGATE_INV 0x00008000 // GT_CALL -- call is in wrapper delegate #define GTF_CALL_M_FAT_POINTER_CHECK 0x00010000 // GT_CALL -- CoreRT managed calli needs transformation, that checks // special bit in calli address. If it is set, then it is necessary // to restore real function address and load hidden argument diff --git a/src/jit/importer.cpp b/src/jit/importer.cpp index 50ddc58d89..98aa46d237 100644 --- a/src/jit/importer.cpp +++ b/src/jit/importer.cpp @@ -7842,9 +7842,9 @@ var_types Compiler::impImportCall(OPCODE opcode, /* Set the delegate flag */ call->gtCall.gtCallMoreFlags |= GTF_CALL_M_DELEGATE_INV; - if (callInfo->secureDelegateInvoke) + if (callInfo->wrapperDelegateInvoke) { - call->gtCall.gtCallMoreFlags |= GTF_CALL_M_SECURE_DELEGATE_INV; + call->gtCall.gtCallMoreFlags |= GTF_CALL_M_WRAPPER_DELEGATE_INV; } if (opcode == CEE_CALLVIRT) diff --git a/src/jit/morph.cpp b/src/jit/morph.cpp index afdb3c9512..becb0bb215 100644 --- a/src/jit/morph.cpp +++ b/src/jit/morph.cpp @@ -2782,13 +2782,13 @@ void Compiler::fgInitArgInfo(GenTreeCall* call) } #endif // defined(_TARGET_X86_) || defined(_TARGET_ARM_) #if defined(_TARGET_ARM_) - // A non-standard calling convention using secure delegate invoke is used on ARM, only, but not for secure + // A non-standard calling convention using wrapper delegate invoke is used on ARM, only, for wrapper // delegates. It is used for VSD delegate calls where the VSD custom calling convention ABI requires passing // R4, a callee-saved register, with a special value. Since R4 is a callee-saved register, its value needs - // to be preserved. Thus, the VM uses a secure delegate IL stub, which preserves R4 and also sets up R4 - // correctly for the VSD call. The VM is simply reusing an existing mechanism (secure delegate IL stub) + // to be preserved. Thus, the VM uses a wrapper delegate IL stub, which preserves R4 and also sets up R4 + // correctly for the VSD call. The VM is simply reusing an existing mechanism (wrapper delegate IL stub) // to achieve its goal for delegate VSD call. See COMDelegate::NeedsWrapperDelegate() in the VM for details. - else if (call->gtCallMoreFlags & GTF_CALL_M_SECURE_DELEGATE_INV) + else if (call->gtCallMoreFlags & GTF_CALL_M_WRAPPER_DELEGATE_INV) { GenTree* arg = call->gtCallObjp; if (arg->OperIsLocal()) @@ -2805,7 +2805,7 @@ void Compiler::fgInitArgInfo(GenTreeCall* call) noway_assert(arg != nullptr); GenTree* newArg = new (this, GT_ADDR) - GenTreeAddrMode(TYP_BYREF, arg, nullptr, 0, eeGetEEInfo()->offsetOfSecureDelegateIndirectCell); + GenTreeAddrMode(TYP_BYREF, arg, nullptr, 0, eeGetEEInfo()->offsetOfWrapperDelegateIndirectCell); // Append newArg as the last arg GenTreeArgList** insertionPoint = &call->gtCallArgs; |