GC update from CoreRT (dotnet/coreclr#6984)

https://github.com/dotnet/corert/tree/master/src/Native/gc dotnet/coreclr@97dd6d2cbb50901cc3651f41a53a4ff9a1052391

Commit migrated from https://github.com/dotnet/coreclr/commit/31ed0102e4421f1b3fe004960c763a4540f241ae

diff --git a/src/coreclr/src/gc/env/gcenv.base.h b/src/coreclr/src/gc/env/gcenv.base.h
index 97f1661..a94f1a6 100644 (file)
--- a/src/coreclr/src/gc/env/gcenv.base.h
+++ b/src/coreclr/src/gc/env/gcenv.base.h
@@ -73,7 +73,7 @@ inline HRESULT HRESULT_FROM_WIN32(unsigned long x)
 #define FALSE false
 
 #define CALLBACK __stdcall
-#define FORCEINLINE inline
+#define FORCEINLINE __forceinline
 
 #define INFINITE 0xFFFFFFFF
 

diff --git a/src/coreclr/src/gc/gc.cpp b/src/coreclr/src/gc/gc.cpp
index dad7133..a62b02d 100644 (file)
--- a/src/coreclr/src/gc/gc.cpp
+++ b/src/coreclr/src/gc/gc.cpp
@@ -36716,9 +36716,10 @@ void initGCShadow()
             // running we need to be in a state that will not trigger any 
             // additional AVs while we fail to allocate a shadow segment, i.e. 
             // ensure calls to updateGCShadow() checkGCWriteBarrier() don't AV
+            deleteGCShadow();
             return;
         }
-        
+
         g_GCShadowEnd += len;
     }