Add Marshal.GetExceptionPointers (#11125)

yizhang82 · janvorli · commit de27abba871b · 2017-04-21T02:01:40.000-07:00
* Add Marshal.GetExceptionPointers

* Remove SecurityCritical
diff --git a/src/mscorlib/src/System/Runtime/InteropServices/Marshal.cs b/src/mscorlib/src/System/Runtime/InteropServices/Marshal.cs
@@ -823,6 +823,9 @@ public static void PrelinkAll(Type c)
             }
         }
 
+        [MethodImplAttribute(MethodImplOptions.InternalCall)]
+        public static extern /* struct _EXCEPTION_POINTERS* */ IntPtr GetExceptionPointers();
+        
         [MethodImplAttribute(MethodImplOptions.InternalCall)]
         public static extern int GetExceptionCode();
 
diff --git a/src/vm/ecalllist.h b/src/vm/ecalllist.h
@@ -946,6 +946,7 @@ FCFuncStart(gInteropMarshalFuncs)
     FCFuncElement("DestroyStructure", MarshalNative::DestroyStructure)
     FCFuncElement("UnsafeAddrOfPinnedArrayElement", MarshalNative::FCUnsafeAddrOfPinnedArrayElement)
     FCFuncElement("GetExceptionCode", ExceptionNative::GetExceptionCode)
+    FCFuncElement("GetExceptionPointers", ExceptionNative::GetExceptionPointers)
     QCFuncElement("GetHINSTANCE", COMModule::GetHINSTANCE)
 
     FCFuncElement("OffsetOfHelper", MarshalNative::OffsetOfHelper)

Original file line number	Diff line number	Diff line change
`@@ -823,6 +823,9 @@ public static void PrelinkAll(Type c)`
`823`	`823`	`}`
`824`	`824`	`}`
`825`	`825`
	`826`	`+ [MethodImplAttribute(MethodImplOptions.InternalCall)]`
	`827`	`+ public static extern /* struct _EXCEPTION_POINTERS* */ IntPtr GetExceptionPointers();`
	`828`	`+`
`826`	`829`	`[MethodImplAttribute(MethodImplOptions.InternalCall)]`
`827`	`830`	`public static extern int GetExceptionCode();`
`828`	`831`