From 2a1428084c0fedc41e44e4e71b89a7d5dce3af2e Mon Sep 17 00:00:00 2001 From: Noah Falk Date: Mon, 8 Aug 2022 12:07:03 -0700 Subject: Revert "Enable inlining P/Invokes into try blocks with no catch or filter clauses (#73032)" (#73551) This reverts commit 4c07f3dbe5a439e5c6ac66fd14c4fed51aa819ce. We believe it is causing recent CI failures. See #73247 --- .../exceptioninterop/ExceptionInterop.cs | 34 ---------------------- 1 file changed, 34 deletions(-) (limited to 'src/tests/baseservices') diff --git a/src/tests/baseservices/exceptions/exceptioninterop/ExceptionInterop.cs b/src/tests/baseservices/exceptions/exceptioninterop/ExceptionInterop.cs index f0f479dfc55..1c6f43e12e4 100644 --- a/src/tests/baseservices/exceptions/exceptioninterop/ExceptionInterop.cs +++ b/src/tests/baseservices/exceptions/exceptioninterop/ExceptionInterop.cs @@ -122,38 +122,4 @@ public unsafe static class ExceptionInterop Assert.True(caughtException); } - - [Fact] - [PlatformSpecific(TestPlatforms.Windows)] - [SkipOnMono("Exception interop not supported on Mono.")] - public static void ThrowNativeExceptionInFrameWithFinallyCatchInOuterFrame() - { - bool caughtException = false; - try - { - ThrowInFrameWithFinally(); - } - catch - { - caughtException = true; - } - - Assert.True(caughtException); - - [MethodImpl(MethodImplOptions.NoInlining)] - static void ThrowInFrameWithFinally() - { - try - { - ThrowException(); - } - finally - { - // Try calling another P/Invoke in the finally block before the catch - // to make sure we have everything set up - // to recover from the exceptional control flow. - NativeFunction(); - } - } - } } -- cgit v1.2.3