FB, fixes

Author: jkotas

src/coreclr/inc/contract.h

@@ -1595,7 +1595,7 @@ typedef __SafeToUsePostCondition __PostConditionOK;
 #define WRAPPER_NO_CONTRACT CUSTOM_WRAPPER_NO_CONTRACT(Contract)
 
 // GC_NOTRIGGER allowed but not currently enforced at runtime
-#define GC_NOTRIGGER STATIC_CONTRACT_GC_NOTRIGGER
+#define GC_NOTRIGGER do { STATIC_CONTRACT_GC_NOTRIGGER; } while(0)
 #define GC_TRIGGERS static_assert(false, "TriggersGC not supported in utilcode contracts")
 
 #ifdef ENABLE_CONTRACTS_IMPL

src/coreclr/inc/ex.h

@@ -813,9 +813,6 @@ Exception *ExThrowWithInnerHelper(Exception *inner);
             PAL_CPP_TRY                                                                 \
             {                                                                           \
                 CAutoTryCleanup<STATETYPE> __autoCleanupTry(__state);                   \
-                /* prevent annotations from being dropped by optimizations in debug */  \
-                INDEBUG(static bool __alwayszero;)                                      \
-                INDEBUG(VolatileLoad(&__alwayszero);)                                   \
                 {                                                                       \
                     /* Disallow returns to make exception handling work. */             \
                     /* Some work is done after the catch, see EX_ENDTRY. */             \
@@ -864,9 +861,6 @@ Exception *ExThrowWithInnerHelper(Exception *inner);
             PAL_CPP_TRY                                                             \
             {                                                                       \
                 CAutoTryCleanup<STATETYPE> __autoCleanupTry(__state);               \
-                /* prevent annotations from being dropped by optimizations in debug */ \
-                INDEBUG(static bool __alwayszero;)                                  \
-                INDEBUG(VolatileLoad(&__alwayszero);)                               \
                 {                                                                   \
                     /* Disallow returns to make exception handling work. */         \
                    /* Some work is done after the catch, see EX_ENDTRY. */          \

src/coreclr/vm/common.h

@@ -254,8 +254,6 @@ namespace Loader
 #include "gcenv.interlocked.h"
 #include "gcenv.interlocked.inl"
 
-#include "eecontract.h"
-
 #include "util.hpp"
 #include "eepolicy.h"
 
@@ -266,6 +264,7 @@ namespace Loader
 #include "cgensys.h"
 #include "ceemain.h"
 #include "hash.h"
+#include "eecontract.h"
 #include "pedecoder.h"
 #include "sstring.h"
 #include "slist.h"