diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2018-06-20 06:34:09 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-20 06:34:09 +0300 |
| commit | 756e71269169c3a57d087efc71221963944e80a8 (patch) | |
| tree | 47c9d8ddfeb6fbdff0e993b62cd3d7c904c7bfdd /src/Native | |
| parent | 46845627c591d8fdc95945233c23f0b942bae6f8 (diff) | |
Update RyuJIT (#5969)
Diffstat (limited to 'src/Native')
| -rw-r--r-- | src/Native/jitinterface/jitinterface.h | 10 | ||||
| -rw-r--r-- | src/Native/jitinterface/jitwrapper.cpp | 10 |
2 files changed, 15 insertions, 5 deletions
diff --git a/src/Native/jitinterface/jitinterface.h b/src/Native/jitinterface/jitinterface.h index 9902df650..5d115bde5 100644 --- a/src/Native/jitinterface/jitinterface.h +++ b/src/Native/jitinterface/jitinterface.h @@ -164,6 +164,7 @@ struct JitInterfaceCallbacks void* (* GetDelegateCtor)(void * thisHandle, CorInfoException** ppException, void* methHnd, void* clsHnd, void* targetMethodHnd, void* pCtorData); void (* MethodCompileComplete)(void * thisHandle, CorInfoException** ppException, void* methHnd); void* (* getTailCallCopyArgsThunk)(void * thisHandle, CorInfoException** ppException, void* pSig, int flags); + bool (* convertPInvokeCalliToCall)(void * thisHandle, CorInfoException** ppException, void* pResolvedToken, bool mustConvert); void* (* getMemoryManager)(void * thisHandle, CorInfoException** ppException); void (* allocMem)(void * thisHandle, CorInfoException** ppException, unsigned int hotCodeSize, unsigned int coldCodeSize, unsigned int roDataSize, unsigned int xcptnsCount, int flag, void** hotCodeBlock, void** coldCodeBlock, void** roDataBlock); void (* reserveUnwindInfo)(void * thisHandle, CorInfoException** ppException, int isFunclet, int isColdCode, unsigned int unwindSize); @@ -1516,6 +1517,15 @@ public: return _ret; } + virtual bool convertPInvokeCalliToCall(void* pResolvedToken, bool mustConvert) + { + CorInfoException* pException = nullptr; + bool _ret = _callbacks->convertPInvokeCalliToCall(_thisHandle, &pException, pResolvedToken, mustConvert); + if (pException != nullptr) + throw pException; + return _ret; + } + virtual void* getMemoryManager(); virtual void allocMem(unsigned int hotCodeSize, unsigned int coldCodeSize, unsigned int roDataSize, unsigned int xcptnsCount, int flag, void** hotCodeBlock, void** coldCodeBlock, void** roDataBlock) { diff --git a/src/Native/jitinterface/jitwrapper.cpp b/src/Native/jitinterface/jitwrapper.cpp index ac5264b7d..d42d54a8f 100644 --- a/src/Native/jitinterface/jitwrapper.cpp +++ b/src/Native/jitinterface/jitwrapper.cpp @@ -27,11 +27,11 @@ private: unsigned __int64 corJitFlags; }; -static const GUID JITEEVersionIdentifier = { /* 0ba106c8-81a0-407f-99a1-928448c1eb62 */ - 0x0ba106c8, - 0x81a0, - 0x407f, - {0x99, 0xa1, 0x92, 0x84, 0x48, 0xc1, 0xeb, 0x62} +static const GUID JITEEVersionIdentifier = { /* dc72a60f-22f2-49fb-809f-00077f3eb1a8 */ + 0xdc72a60f, + 0x22f2, + 0x49fb, + { 0x80, 0x9f, 0x0, 0x7, 0x7f, 0x3e, 0xb1, 0xa8 } }; class Jit |