diff options
| author | Alan Wu <XrXr@users.noreply.github.com> | 2021-09-14 15:13:15 -0400 |
|---|---|---|
| committer | Alan Wu <XrXr@users.noreply.github.com> | 2021-10-20 18:19:40 -0400 |
| commit | bc7652998eb0f05379ba4247ab5202dc853496fa (patch) | |
| tree | dcfcf35a3bdad37b20c10f3bffda3852c7d32662 | |
| parent | 0ee8c606626cd3f92a07a4b1ae7ab546e22031ab (diff) | |
Fix warnings about redefining YJIT_STATS
Follow up for ecb5b383a0c17550b9b27663005049ddac871edb. Now that
YJIT_STATS is defined in yjit.h, it shoudl be the only place that
defines it.
| -rw-r--r-- | yjit_codegen.c | 8 | ||||
| -rw-r--r-- | yjit_iface.c | 7 | ||||
| -rw-r--r-- | yjit_iface.h | 14 |
3 files changed, 8 insertions, 21 deletions
diff --git a/yjit_codegen.c b/yjit_codegen.c index e9f6e996f9..be0c7ca255 100644 --- a/yjit_codegen.c +++ b/yjit_codegen.c @@ -203,8 +203,7 @@ record_global_inval_patch(const codeblock_t *cb, uint32_t outline_block_target_p static bool jit_guard_known_klass(jitstate_t *jit, ctx_t* ctx, VALUE known_klass, insn_opnd_t insn_opnd, VALUE sample_instance, const int max_chain_depth, uint8_t *side_exit); -#if RUBY_DEBUG -# define YJIT_STATS 1 +#if YJIT_STATS // Add a comment at the current position in the code block static void @@ -290,14 +289,11 @@ verify_ctx(jitstate_t *jit, ctx_t *ctx) } #else -#ifndef YJIT_STATS -#define YJIT_STATS 0 -#endif // ifndef YJIT_STATS #define ADD_COMMENT(cb, comment) ((void)0) #define verify_ctx(jit, ctx) ((void)0) -#endif // if RUBY_DEBUG +#endif // if YJIT_STATS #if YJIT_STATS diff --git a/yjit_iface.c b/yjit_iface.c index dc38b57b5c..42f22f3939 100644 --- a/yjit_iface.c +++ b/yjit_iface.c @@ -24,13 +24,8 @@ static VALUE cYjitDisasmInsn; static VALUE mYjit; static VALUE cYjitBlock; -#if RUBY_DEBUG -# define YJIT_STATS 1 +#if YJIT_STATS static VALUE cYjitCodeComment; -#else -# ifndef YJIT_STATS -# define YJIT_STATS 0 -# endif #endif #if YJIT_STATS diff --git a/yjit_iface.h b/yjit_iface.h index 65e3c28558..a0fcb931a2 100644 --- a/yjit_iface.h +++ b/yjit_iface.h @@ -6,8 +6,9 @@ #ifndef YJIT_IFACE_H #define YJIT_IFACE_H 1 -#include "ruby/ruby.h" -#include "ruby/assert.h" // for RUBY_DEBUG +#include "ruby/internal/config.h" +#include "ruby_assert.h" // for RUBY_DEBUG +#include "yjit.h" // for YJIT_STATS #include "vm_core.h" #include "yjit_core.h" @@ -15,8 +16,7 @@ # define YJIT_DEFAULT_CALL_THRESHOLD 10 #endif -#if RUBY_DEBUG -# define YJIT_STATS 1 +#if YJIT_STATS struct yjit_comment { uint32_t offset; const char *comment; @@ -25,11 +25,7 @@ struct yjit_comment { typedef rb_darray(struct yjit_comment) yjit_comment_array_t; extern yjit_comment_array_t yjit_code_comments; -#else -# ifndef YJIT_STATS -# define YJIT_STATS 0 -# endif // ifndef YJIT_STATS -#endif // if RUBY_DEBUG +#endif // if YJIT_STATS #if YJIT_STATS |