corert-git: Cherry-pick patches by Kyungwoo Lee (Microsoft)

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sun Jan 24 22:27:59 2016 +0100
Changeset:	8a7ab5ac8f2c1992b35466f954c2378025b1cb37

Modified Files:
	corert-git/distinfo
Added Files:
	corert-git/patches/patch-src_Native_Runtime_CachedInterfaceDispatch.cpp
	corert-git/patches/patch-src_Native_Runtime_EHHelpers.cpp

Log Message:
corert-git: Cherry-pick patches by Kyungwoo Lee (Microsoft)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8a7ab5ac8f2c1992b35466f954c2378025b1cb37

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 corert-git/distinfo                                         |  2 ++
 .../patch-src_Native_Runtime_CachedInterfaceDispatch.cpp    | 12 ++++++++++++
 corert-git/patches/patch-src_Native_Runtime_EHHelpers.cpp   | 13 +++++++++++++
 3 files changed, 27 insertions(+)

diffs:
diff --git a/corert-git/distinfo b/corert-git/distinfo
index afc7651..3fc4830 100644
--- a/corert-git/distinfo
+++ b/corert-git/distinfo
@@ -1,2 +1,4 @@
 $NetBSD$
 
+SHA1 (patch-src_Native_Runtime_CachedInterfaceDispatch.cpp) = 1485afd92ab2748e8d5f97708124e06aebd592f2
+SHA1 (patch-src_Native_Runtime_EHHelpers.cpp) = 2f64d4d24096fe6e36ef79aa80f1600bd96eda58
diff --git a/corert-git/patches/patch-src_Native_Runtime_CachedInterfaceDispatch.cpp b/corert-git/patches/patch-src_Native_Runtime_CachedInterfaceDispatch.cpp
new file mode 100644
index 0000000..b3c3303
--- /dev/null
+++ b/corert-git/patches/patch-src_Native_Runtime_CachedInterfaceDispatch.cpp
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/Native/Runtime/CachedInterfaceDispatch.cpp.orig	2016-01-23 11:26:49.000000000 +0000
++++ src/Native/Runtime/CachedInterfaceDispatch.cpp
+@@ -544,6 +544,6 @@ COOP_PINVOKE_HELPER(PTR_Code, RhpResolve
+                                                                    PInvokeTransitionFrame * pTransitionFrame))
+ {
+     CID_COUNTER_INC(CacheMisses);
+-    return (PTR_Code)ManagedCallout2((UIntTarget)pObject, (UIntTarget)pCell, RhpCidResolve, pTransitionFrame);
++    return (PTR_Code)ManagedCallout2((UIntTarget)pObject, (UIntTarget)pCell, reinterpret_cast<void*>(RhpCidResolve), pTransitionFrame);
+ }
+ #endif // FEATURE_CACHED_INTERFACE_DISPATCH
diff --git a/corert-git/patches/patch-src_Native_Runtime_EHHelpers.cpp b/corert-git/patches/patch-src_Native_Runtime_EHHelpers.cpp
new file mode 100644
index 0000000..e857b28
--- /dev/null
+++ b/corert-git/patches/patch-src_Native_Runtime_EHHelpers.cpp
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/Native/Runtime/EHHelpers.cpp.orig	2016-01-23 11:26:49.000000000 +0000
++++ src/Native/Runtime/EHHelpers.cpp
+@@ -445,7 +445,7 @@ Int32 __stdcall RhpVectoredExceptionHand
+         {
+             // Get the module handle for this runtime. Do this by passing an address definitely within the
+             // module (the address of this function) to GetModuleHandleEx with the "from address" flag.
+-            HANDLE hRuntimeModule = PalGetModuleHandleFromPointer(RhpVectoredExceptionHandler);
++            HANDLE hRuntimeModule = PalGetModuleHandleFromPointer(reinterpret_cast<void*>(RhpVectoredExceptionHandler));
+             if (!hRuntimeModule)
+             {
+                 ASSERT_UNCONDITIONALLY("Failed to locate our own module handle");