Index: include/parrot/atomic/fallback.h
===================================================================
--- include/parrot/atomic/fallback.h	（版本 34263）
+++ include/parrot/atomic/fallback.h	（工作副本）
@@ -71,9 +71,7 @@
     do { \
         LOCK((a).lock); \
         if ((a).val == (expect)) { \
-            void * orig = (a).val; \
             (a).val = (update); \
-            UNUSED(orig) \
             (result) = 1; \
         } \
         else { \
@@ -86,9 +84,7 @@
     do { \
         LOCK((a).lock); \
         if ((a).val == (expect)) { \
-            INTVAL orig = (a).val; \
             (a).val = (update); \
-            UNUSED(orig) \
             (result) = 1; \
         } \
         else { \
Index: include/parrot/compiler.h
===================================================================
--- include/parrot/compiler.h	（版本 34263）
+++ include/parrot/compiler.h	（工作副本）
@@ -111,7 +111,7 @@
 /* UNUSED() is the old way we handled shim arguments Should still be
    used in cases where the argument should, at some point be used.
  */
-#define UNUSED(a) if (0) (void)(a);
+#define UNUSED(a...) if (0) (void)(a);
 
 #if PARROT_HAS_SAL
 #  define PARROT_CAN_RETURN_NULL      /*@null@*/ __maybenull
Index: src/stm/backend.c
===================================================================
--- src/stm/backend.c	（版本 34268）
+++ src/stm/backend.c	（工作副本）
@@ -37,14 +37,8 @@
 #  undef fprintf
 #  define STM_TRACE_SAFE(x...) fprintf(stderr, x); fprintf(stderr, "\n");
 #else
-static void STM_TRACE(const char *x, ...) /* HEADERIZER SKIP */
-{
-    UNUSED(x);
-}
-static void STM_TRACE_SAFE(const char *x, ...) /* HEADERIZER SKIP */
-{
-    UNUSED(x);
-}
+#  define STM_TRACE(x...) UNUSED(x);
+#  define STM_TRACE_SAFE(x...) UNUSED(x);
 #endif
 
 /* HEADERIZER HFILE: include/parrot/stm/backend.h */