Fix GC_noop6 definition to avoid its calls to be optimized away

(fix commits e3ec4a5, 1586a21)

* include/private/gc_priv.h (GC_ATTR_NOINLINE): New macro (effective
for GCC/Clang and MS VC currently).
* mark.c (GC_noop6): Use GC_ATTR_NOINLINE attribute; call
AO_compiler_barrier if PARALLEL_MARK (or GC_PTHREADS and not
GC_WIN32_THREADS), otherwise call GC_noop1(0); add
comment.

diff --git a/include/private/gc_priv.h b/include/private/gc_priv.h
index cd597326df4c5df41147309a46bd67a5cd566173..fa2b90b46dd546a66bf431031bc5203f7203ea53 100644 (file)
--- a/include/private/gc_priv.h
+++ b/include/private/gc_priv.h
@@ -192,6 +192,16 @@ typedef char * ptr_t;   /* A generic pointer to which we can add        */
 # define GC_INLINE static
 #endif
 
+#ifndef GC_ATTR_NOINLINE
+# if __GNUC__ >= 4
+#   define GC_ATTR_NOINLINE __attribute__((__noinline__))
+# elif _MSC_VER >= 14
+#   define GC_ATTR_NOINLINE __declspec(noinline)
+# else
+#   define GC_ATTR_NOINLINE /* empty */
+# endif
+#endif
+
 #ifndef GC_API_OSCALL
   /* This is used to identify GC routines called by name from OS.       */
 # if defined(__GNUC__)

diff --git a/mark.c b/mark.c
index 972840fc95fe4cce4c4c18607ed5eafc1926cf14..1b4224cecd5c1b54405177901f68f2992319f1dd 100644 (file)
--- a/mark.c
+++ b/mark.c
@@ -24,11 +24,18 @@
 
 /* Make arguments appear live to compiler.  Put here to minimize the    */
 /* risk of inlining.  Used to minimize junk left in registers.          */
+GC_ATTR_NOINLINE
 void GC_noop6(word arg1 GC_ATTR_UNUSED, word arg2 GC_ATTR_UNUSED,
               word arg3 GC_ATTR_UNUSED, word arg4 GC_ATTR_UNUSED,
               word arg5 GC_ATTR_UNUSED, word arg6 GC_ATTR_UNUSED)
 {
-  /* Empty */
+  /* Avoid GC_noop6 calls to be optimized away. */
+# if defined(GC_PTHREADS) && !defined(GC_WIN32_THREADS) \
+     || defined(PARALLEL_MARK)
+    AO_compiler_barrier(); /* to serve as a special side-effect */
+# else
+    GC_noop1(0);
+# endif
 }
 
 /* Single argument version, robust against whole program analysis. */