Count interpreter instructions when -DYJIT_STATS=1

The interpreter instruction count was enabled based on RUBY_DEBUG as
opposed to YJIT_STATS. In builds with YJIT_STATS=1 but RUBY_DEBUG=0,
the count was not available.

Move YJIT_STATS in yjit.h where declarations are expoed to code outside
of YJIT. Also reduce the changes made to the interpreter for calling
into YJIT's instruction counting function.

1 files changed, 6 insertions, 0 deletions

diff --git a/yjit.h b/yjit.h
index 2844fb2511..e3dd3a2f05 100644
--- a/yjit.h
+++ b/yjit.h
@@ -5,6 +5,8 @@
 #ifndef YJIT_H
 #define YJIT_H 1
 
+#include "ruby/internal/config.h"
+#include "ruby_assert.h" // for RUBY_DEBUG
 #include "vm_core.h"
 #include "method.h"
 
@@ -26,6 +28,10 @@
 #define YJIT_DUMP_MODE 0
 #endif
 
+#ifndef YJIT_STATS
+# define YJIT_STATS RUBY_DEBUG
+#endif // ifndef YJIT_STATS
+
 #ifndef rb_iseq_t
 typedef struct rb_iseq_struct rb_iseq_t;
 #define rb_iseq_t rb_iseq_t