diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2015-08-18 17:51:38 -0700 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2015-08-18 17:51:38 -0700 |
| commit | 0152e40aec8bf3da45c111d66eb579fed686edb2 (patch) | |
| tree | 923210f81494818be60f72cbd7d476f5bf1e6f9c | |
| parent | 50ef79d48df81635e58ca59386620f0151df6022 (diff) | |
| download | coreclr-0152e40aec8bf3da45c111d66eb579fed686edb2.tar.gz coreclr-0152e40aec8bf3da45c111d66eb579fed686edb2.tar.bz2 coreclr-0152e40aec8bf3da45c111d66eb579fed686edb2.zip | |
Add CORINFO_CALLINFO_ATYPICAL_CALLSITE flag to JIT-EE interface
CORINFO_CALLINFO_ATYPICAL_CALLSITE is meant to be used in situations where the code generator cannot guarantee that the callsite can be disassembled by delay load helper (e.g. it is not call [rel32] on x86/x64)
| -rw-r--r-- | src/inc/corinfo.h | 1 | ||||
| -rw-r--r-- | src/zap/zapinfo.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/inc/corinfo.h b/src/inc/corinfo.h index 89e53d60cd..4c9034b4a2 100644 --- a/src/inc/corinfo.h +++ b/src/inc/corinfo.h @@ -1759,6 +1759,7 @@ enum CORINFO_CALLINFO_FLAGS CORINFO_CALLINFO_VERIFICATION = 0x0008, // Gets extra verification information. CORINFO_CALLINFO_SECURITYCHECKS = 0x0010, // Perform security checks. CORINFO_CALLINFO_LDFTN = 0x0020, // Resolving target of LDFTN + CORINFO_CALLINFO_ATYPICAL_CALLSITE = 0x0040, // Atypical callsite that cannot be disassembled by delay loading helper }; enum CorInfoIsAccessAllowedResult diff --git a/src/zap/zapinfo.cpp b/src/zap/zapinfo.cpp index 0e874d0a7e..dbdd26e5b9 100644 --- a/src/zap/zapinfo.cpp +++ b/src/zap/zapinfo.cpp @@ -2955,7 +2955,7 @@ void ZapInfo::getCallInfo(CORINFO_RESOLVED_TOKEN * pResolvedToken, ZapImport * pImport; - if (flags & CORINFO_CALLINFO_LDFTN) + if (flags & (CORINFO_CALLINFO_LDFTN | CORINFO_CALLINFO_ATYPICAL_CALLSITE)) { pImport = m_pImage->GetImportTable()->GetMethodImport(ENCODE_METHOD_ENTRY, pResult->hMethod, pResolvedToken, pConstrainedResolvedToken); |