Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/corert.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kotas <jkotas@microsoft.com>2017-09-29 07:23:06 +0300
committerGitHub <noreply@github.com>2017-09-29 07:23:06 +0300
commita6a7dca8327ae11cea2bf4d57945eef3c8a8e1e9 (patch)
tree2884e97773ff51dce08df99cd6b984d93a0a38d2 /src/Native
parent590df20f31d370a3e650e9baf395bdb61a19a7cd (diff)
Update JIT/EE interface (#4631)
Diffstat (limited to 'src/Native')
-rw-r--r--src/Native/jitinterface/jitinterface.h10
-rw-r--r--src/Native/jitinterface/jitwrapper.cpp10
2 files changed, 15 insertions, 5 deletions
diff --git a/src/Native/jitinterface/jitinterface.h b/src/Native/jitinterface/jitinterface.h
index 366d87544..b2e498283 100644
--- a/src/Native/jitinterface/jitinterface.h
+++ b/src/Native/jitinterface/jitinterface.h
@@ -23,6 +23,7 @@ struct JitInterfaceCallbacks
void* (__stdcall * getMethodModule)(void * thisHandle, CorInfoException** ppException, void* method);
void (__stdcall * getMethodVTableOffset)(void * thisHandle, CorInfoException** ppException, void* method, unsigned* offsetOfIndirection, unsigned* offsetAfterIndirection, bool* isRelative);
void* (__stdcall * resolveVirtualMethod)(void * thisHandle, CorInfoException** ppException, void* virtualMethod, void* implementingClass, void* ownerType);
+ void* (__stdcall * getDefaultEqualityComparerClass)(void * thisHandle, CorInfoException** ppException, void* elemType);
void (__stdcall * expandRawHandleIntrinsic)(void * thisHandle, CorInfoException** ppException, void* pResolvedToken, void* pResult);
int (__stdcall * getIntrinsicID)(void * thisHandle, CorInfoException** ppException, void* method, bool* pMustExpand);
bool (__stdcall * isInSIMDModule)(void * thisHandle, CorInfoException** ppException, void* classHnd);
@@ -301,6 +302,15 @@ public:
return _ret;
}
+ virtual void* getDefaultEqualityComparerClass(void* elemType)
+ {
+ CorInfoException* pException = nullptr;
+ void* _ret = _callbacks->getDefaultEqualityComparerClass(_thisHandle, &pException, elemType);
+ if (pException != nullptr)
+ throw pException;
+ return _ret;
+ }
+
virtual void expandRawHandleIntrinsic(void* pResolvedToken, void* pResult)
{
CorInfoException* pException = nullptr;
diff --git a/src/Native/jitinterface/jitwrapper.cpp b/src/Native/jitinterface/jitwrapper.cpp
index 925395497..ba5f23279 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 = { /* 7f70c266-eada-427b-be8a-be1260e34b1b */
- 0x7f70c266,
- 0xeada,
- 0x427b,
- { 0xbe, 0x8a, 0xbe, 0x12, 0x60, 0xe3, 0x4b, 0x1b }
+static const GUID JITEEVersionIdentifier = { /* 76a743cd-8a07-471e-9ac4-cd5806a8ffac */
+ 0x76a743cd,
+ 0x8a07,
+ 0x471e,
+ { 0x9a, 0xc4, 0xcd, 0x58, 0x06, 0xa8, 0xff, 0xac }
};
class Jit