From b80c265fa46d9ce3e116c0746341ec1b5dfac1cb Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 10 Mar 2017 07:18:03 +0000
Subject: debug_counter.c: debug_counter_names [ci skip]

* debug_counter.c (debug_counter_names): stringize debug counter
  names by preprocessor.

* debug_counter.h (RB_DEBUG_COUNTER): define counter names outside
  the include guard, to expand multiple times.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57826 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 debug_counter.h | 46 +++++++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 21 deletions(-)

(limited to 'debug_counter.h')

diff --git a/debug_counter.h b/debug_counter.h
index e16d5fae4a..718486bf34 100644
--- a/debug_counter.h
+++ b/debug_counter.h
@@ -8,42 +8,46 @@
 
 **********************************************************************/
 
-#ifndef RUBY_DEBUG_COUNTER_H
-#define RUBY_DEBUG_COUNTER_H 1
-
 #ifndef USE_DEBUG_COUNTER
 #define USE_DEBUG_COUNTER 0
 #endif
 
+#ifdef RB_DEBUG_COUNTER
+RB_DEBUG_COUNTER(mc_inline_hit)
+RB_DEBUG_COUNTER(mc_inline_miss)
+RB_DEBUG_COUNTER(mc_global_hit)
+RB_DEBUG_COUNTER(mc_global_miss)
+RB_DEBUG_COUNTER(mc_global_state_miss)
+RB_DEBUG_COUNTER(mc_class_serial_miss)
+RB_DEBUG_COUNTER(mc_cme_complement)
+RB_DEBUG_COUNTER(mc_cme_complement_hit)
+RB_DEBUG_COUNTER(mc_search_super)
+RB_DEBUG_COUNTER(ivar_get_hit)
+RB_DEBUG_COUNTER(ivar_get_miss)
+RB_DEBUG_COUNTER(ivar_set_hit)
+RB_DEBUG_COUNTER(ivar_set_miss)
+RB_DEBUG_COUNTER(ivar_get)
+RB_DEBUG_COUNTER(ivar_set)
+#endif
+
+#ifndef RUBY_DEBUG_COUNTER_H
+#define RUBY_DEBUG_COUNTER_H 1
+
 #if !defined(__GNUC__) && USE_DEBUG_COUNTER
 #error "USE_DEBUG_COUNTER is not supported by other than __GNUC__"
 #endif
 
 enum rb_debug_counter_type {
-#define COUNTER(name) RB_DEBUG_COUNTER_##name
-    COUNTER(mc_inline_hit),
-    COUNTER(mc_inline_miss),
-    COUNTER(mc_global_hit),
-    COUNTER(mc_global_miss),
-    COUNTER(mc_global_state_miss),
-    COUNTER(mc_class_serial_miss),
-    COUNTER(mc_cme_complement),
-    COUNTER(mc_cme_complement_hit),
-    COUNTER(mc_search_super),
-    COUNTER(ivar_get_hit),
-    COUNTER(ivar_get_miss),
-    COUNTER(ivar_set_hit),
-    COUNTER(ivar_set_miss),
-    COUNTER(ivar_get),
-    COUNTER(ivar_set),
+#define RB_DEBUG_COUNTER(name) RB_DEBUG_COUNTER_##name,
+#include "debug_counter.h"
     RB_DEBUG_COUNTER_MAX
-#undef COUNTER
+#undef RB_DEBUG_COUNTER
 };
 
 #if USE_DEBUG_COUNTER
 #include "ruby/ruby.h"
 
-extern size_t rb_debug_counter[RB_DEBUG_COUNTER_MAX + 1];
+extern size_t rb_debug_counter[];
 
 inline static int
 rb_debug_counter_add(enum rb_debug_counter_type type, int add, int cond)
-- 
cgit v1.2.3