diff options
author | Jan Kotas <jkotas@microsoft.com> | 2015-12-30 22:06:01 +0300 |
---|---|---|
committer | Jan Kotas <jkotas@microsoft.com> | 2015-12-30 22:13:50 +0300 |
commit | c4d265a26ce263b0685ba1df315e1241d39e7aff (patch) | |
tree | c045977f06afb14e171aabed3c18902afc6da525 /src/JitInterface | |
parent | ec8865f2166aabd2a3e39f84f42ece6f088446eb (diff) |
Miscellaneous fixes for trivial issues found by adhoc testing
- Add intrisic attributes to Object.GetType/Type.GetTypeFromHandle (Object.GetType is commented out under TODO)
- Implement temporary marshalling for bool since it is used by every other Win32 API
- Implement HandleException method on JIT-EE interface
Diffstat (limited to 'src/JitInterface')
-rw-r--r-- | src/JitInterface/src/CorInfoImpl.cs | 8 | ||||
-rw-r--r-- | src/JitInterface/src/ThunkGenerator/ThunkInput.txt | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/JitInterface/src/CorInfoImpl.cs b/src/JitInterface/src/CorInfoImpl.cs index 44a3c2967..f6e621e14 100644 --- a/src/JitInterface/src/CorInfoImpl.cs +++ b/src/JitInterface/src/CorInfoImpl.cs @@ -1425,7 +1425,13 @@ namespace Internal.JitInterface } private void HandleException(_EXCEPTION_POINTERS* pExceptionPointers) - { throw new NotImplementedException("HandleException"); } + { + // This method is completely handled by the C++ wrapper to the JIT-EE interface, + // and should never reach the managed implementation. + Debug.Assert(false, "CorInfoImpl.HandleException should not be called"); + throw new NotSupportedException("HandleException"); + } + private void ThrowExceptionForJitResult(HRESULT result) { throw new NotImplementedException("ThrowExceptionForJitResult"); } private void ThrowExceptionForHelper(ref CORINFO_HELPER_DESC throwHelper) diff --git a/src/JitInterface/src/ThunkGenerator/ThunkInput.txt b/src/JitInterface/src/ThunkGenerator/ThunkInput.txt index 50670501f..db5a3fd5d 100644 --- a/src/JitInterface/src/ThunkGenerator/ThunkInput.txt +++ b/src/JitInterface/src/ThunkGenerator/ThunkInput.txt @@ -250,7 +250,7 @@ FUNCTIONS HRESULT GetErrorHRESULT(struct _EXCEPTION_POINTERS *pExceptionPointers); ULONG GetErrorMessage(LPWSTR buffer, ULONG bufferLength); [ManualNativeWrapper] int FilterException(struct _EXCEPTION_POINTERS* pExceptionPointers); - void HandleException(struct _EXCEPTION_POINTERS* pExceptionPointers); + [ManualNativeWrapper] void HandleException(struct _EXCEPTION_POINTERS* pExceptionPointers); void ThrowExceptionForJitResult(HRESULT result); void ThrowExceptionForHelper(const CORINFO_HELPER_DESC* throwHelper); void getEEInfo(CORINFO_EE_INFO* pEEInfoOut); |