Skip to content

Update unhandled exception handler API to match approved shape. #110254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkotas merged 6 commits into from
Nov 30, 2024
Merged

Update unhandled exception handler API to match approved shape. #110254

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
06be77a
Update unhandled exception handler API to match approved shape.
teo-tsirpanis Nov 28, 2024
896c469
Update the correct API in the reference assembly.
teo-tsirpanis Nov 28, 2024
72f772e
declare Func`2 in Test.CoreLib
VSadov Nov 29, 2024
44cb810
Revert "declare Func`2 in Test.CoreLib"
VSadov Nov 29, 2024
aa0a416
IsHandledByGlobalHandler helper
VSadov Nov 29, 2024
fb59614
Update src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/__Finali…
jkotas Nov 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/coreclr/nativeaot/Test.CoreLib/src/System/Runtime/ExceptionServices/ExceptionHandling.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@

namespace System.Runtime.ExceptionServices
{
public delegate bool UnhandledExceptionHandler(System.Exception exception);

public static class ExceptionHandling
{
internal static UnhandledExceptionHandler? s_handler;
internal static Func<Exception, bool>? s_handler;
}
}
6 changes: 2 additions & 4 deletions ...ibraries/System.Private.CoreLib/src/System/Runtime/ExceptionServices/ExceptionHandling.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,16 @@

namespace System.Runtime.ExceptionServices
{
public delegate bool UnhandledExceptionHandler(System.Exception exception);

public static class ExceptionHandling
{
internal static UnhandledExceptionHandler? s_handler;
internal static Func<Exception, bool>? s_handler;

/// <summary>
/// Sets a handler for unhandled exceptions.
/// </summary>
/// <exception cref="ArgumentNullException">If handler is null</exception>
/// <exception cref="InvalidOperationException">If a handler is already set</exception>
public static void SetUnhandledExceptionHandler(UnhandledExceptionHandler handler)
public static void SetUnhandledExceptionHandler(Func<Exception, bool> handler)
{
ArgumentNullException.ThrowIfNull(handler);

Expand Down
3 changes: 1 addition & 2 deletions src/libraries/System.Runtime/ref/System.Runtime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13975,7 +13975,7 @@ internal ExceptionDispatchInfo() { }
}
public static partial class ExceptionHandling
{
public static void SetUnhandledExceptionHandler(System.Runtime.ExceptionServices.UnhandledExceptionHandler handler) { }
public static void SetUnhandledExceptionHandler(System.Func<System.Exception,bool> handler) { }
}
public partial class FirstChanceExceptionEventArgs : System.EventArgs
{
Expand All @@ -13988,7 +13988,6 @@ public sealed partial class HandleProcessCorruptedStateExceptionsAttribute : Sys
{
public HandleProcessCorruptedStateExceptionsAttribute() { }
}
public delegate bool UnhandledExceptionHandler(System.Exception exception);
}
namespace System.Runtime.InteropServices
{
Expand Down