Fix x86 build
authorJan Kotas <jkotas@microsoft.com>
Sat, 25 Apr 2020 20:01:09 +0000 (13:01 -0700)
committerJan Kotas <jkotas@microsoft.com>
Sat, 25 Apr 2020 20:01:09 +0000 (13:01 -0700)
src/coreclr/src/vm/excep.cpp
src/coreclr/src/vm/i386/excepx86.cpp

index 6f87d46..831d99a 100644 (file)
@@ -11221,7 +11221,7 @@ BOOL CEHelper::CanMethodHandleCE(PTR_MethodDesc pMethodDesc, CorruptionSeverity
 #ifndef DACCESS_COMPILE
     CONTRACTL
     {
-        GC_TRIGGERS;
+        GC_NOTRIGGER;
         THROWS;
         MODE_ANY;
         PRECONDITION(pMethodDesc != NULL);
@@ -11268,7 +11268,7 @@ BOOL CEHelper::CanMethodHandleException(CorruptionSeverity severity, PTR_MethodD
 {
     CONTRACTL
     {
-        GC_TRIGGERS;
+        GC_NOTRIGGER;
         THROWS;
         MODE_ANY;
         PRECONDITION(pMethodDesc != NULL);
index 1f8386e..5b333e9 100644 (file)
@@ -2757,7 +2757,7 @@ StackWalkAction COMPlusUnwindCallback (CrawlFrame *pCf, ThrowCallbackType *pData
             // that won't be reflected via the IL stub's MethodDesc.
             pFuncWithCEAttribute = GetUserMethodForILStub(pThread, (UINT_PTR)pStack, pFunc, &pILStubFrame);
         }
-        fCanMethodHandleException = CEHelper::CanMethodHandleException(currentSeverity, pFuncWithCEAttribute, FALSE);
+        fCanMethodHandleException = CEHelper::CanMethodHandleException(currentSeverity, pFuncWithCEAttribute);
     }
 #endif // FEATURE_CORRUPTING_EXCEPTIONS