@@ -145,7 +145,7 @@ WCHAR *g_pFailFastBuffer = g_szFailFastBuffer;
145
145
146
146
// This is the common code for FailFast processing that is wrapped by the two
147
147
// FailFast FCalls below.
148
- void SystemNative::GenericFailFast (STRINGREF refMesgString, EXCEPTIONREF refExceptionForWatsonBucketing, UINT_PTR retAddress, UINT exitCode, STRINGREF refErrorSourceString)
148
+ void SystemNative::GenericFailFast (STRINGREF refMesgString, EXCEPTIONREF refExceptionForWatsonBucketing, UINT_PTR retAddress, STRINGREF refErrorSourceString)
149
149
{
150
150
CONTRACTL
151
151
{
@@ -282,7 +282,7 @@ void SystemNative::GenericFailFast(STRINGREF refMesgString, EXCEPTIONREF refExce
282
282
if (gc.refExceptionForWatsonBucketing != NULL )
283
283
pThread->SetLastThrownObject (gc.refExceptionForWatsonBucketing );
284
284
285
- EEPolicy::HandleFatalError (exitCode , retAddress, pszMessage, NULL , errorSourceString, argExceptionString);
285
+ EEPolicy::HandleFatalError (COR_E_FAILFAST , retAddress, pszMessage, NULL , errorSourceString, argExceptionString);
286
286
287
287
GCPROTECT_END ();
288
288
}
@@ -301,25 +301,7 @@ FCIMPL1(VOID, SystemNative::FailFast, StringObject* refMessageUNSAFE)
301
301
UINT_PTR retaddr = HELPER_METHOD_FRAME_GET_RETURN_ADDRESS ();
302
302
303
303
// Call the actual worker to perform failfast
304
- GenericFailFast (refMessage, NULL , retaddr, COR_E_FAILFAST, NULL );
305
-
306
- HELPER_METHOD_FRAME_END ();
307
- }
308
- FCIMPLEND
309
-
310
- FCIMPL2 (VOID, SystemNative::FailFastWithExitCode, StringObject* refMessageUNSAFE, UINT exitCode)
311
- {
312
- FCALL_CONTRACT;
313
-
314
- STRINGREF refMessage = (STRINGREF)refMessageUNSAFE;
315
-
316
- HELPER_METHOD_FRAME_BEGIN_1 (refMessage);
317
-
318
- // The HelperMethodFrame knows how to get the return address.
319
- UINT_PTR retaddr = HELPER_METHOD_FRAME_GET_RETURN_ADDRESS ();
320
-
321
- // Call the actual worker to perform failfast
322
- GenericFailFast (refMessage, NULL , retaddr, exitCode, NULL );
304
+ GenericFailFast (refMessage, NULL , retaddr, NULL );
323
305
324
306
HELPER_METHOD_FRAME_END ();
325
307
}
@@ -338,7 +320,7 @@ FCIMPL2(VOID, SystemNative::FailFastWithException, StringObject* refMessageUNSAF
338
320
UINT_PTR retaddr = HELPER_METHOD_FRAME_GET_RETURN_ADDRESS ();
339
321
340
322
// Call the actual worker to perform failfast
341
- GenericFailFast (refMessage, refException, retaddr, COR_E_FAILFAST, NULL );
323
+ GenericFailFast (refMessage, refException, retaddr, NULL );
342
324
343
325
HELPER_METHOD_FRAME_END ();
344
326
}
@@ -358,7 +340,7 @@ FCIMPL3(VOID, SystemNative::FailFastWithExceptionAndSource, StringObject* refMes
358
340
UINT_PTR retaddr = HELPER_METHOD_FRAME_GET_RETURN_ADDRESS ();
359
341
360
342
// Call the actual worker to perform failfast
361
- GenericFailFast (refMessage, refException, retaddr, COR_E_FAILFAST, errorSource);
343
+ GenericFailFast (refMessage, refException, retaddr, errorSource);
362
344
363
345
HELPER_METHOD_FRAME_END ();
364
346
}
0 commit comments