diff options
| author | Alan Wu <XrXr@users.noreply.github.com> | 2021-03-12 12:25:58 -0500 |
|---|---|---|
| committer | Alan Wu <XrXr@users.noreply.github.com> | 2021-10-20 18:19:31 -0400 |
| commit | cee597bd01ef999d5b8b86b639260282aa594467 (patch) | |
| tree | 2ee9030c91e9ee1567cfd314b4cfb512500bd78a | |
| parent | fe3bd570072b35e47e03ea23e2bc42a4d8a7681d (diff) | |
Include ruby/ruby.h before vm_core.h
This is how vm.c does it, and if we don't follow it in yjit
compilation units, rb_vm_t would have a conflicting size.
| -rw-r--r-- | yjit_core.c | 8 | ||||
| -rw-r--r-- | yjit_iface.c | 4 | ||||
| -rw-r--r-- | yjit_iface.h | 13 |
3 files changed, 5 insertions, 20 deletions
diff --git a/yjit_core.c b/yjit_core.c index 4640853d57..ecca311a46 100644 --- a/yjit_core.c +++ b/yjit_core.c @@ -1,14 +1,10 @@ -#include "vm_core.h" -#include "vm_callinfo.h" -#include "builtin.h" -#include "insns.inc" -#include "insns_info.inc" -#include "vm_sync.h" #include "yjit_asm.h" #include "yjit_utils.h" #include "yjit_iface.h" #include "yjit_core.h" #include "yjit_codegen.h" +#include "vm_sync.h" +#include "builtin.h" // Maximum number of versions per block #define MAX_VERSIONS 4 diff --git a/yjit_iface.c b/yjit_iface.c index c29b4d8e81..9d8087e4ab 100644 --- a/yjit_iface.c +++ b/yjit_iface.c @@ -1,7 +1,7 @@ -#include <assert.h> +#include "ruby/ruby.h" +#include "vm_core.h" #include "insns.inc" #include "internal.h" -#include "vm_core.h" #include "vm_sync.h" #include "vm_callinfo.h" #include "builtin.h" diff --git a/yjit_iface.h b/yjit_iface.h index d525337d24..88e65322eb 100644 --- a/yjit_iface.h +++ b/yjit_iface.h @@ -6,21 +6,10 @@ #ifndef YJIT_IFACE_H #define YJIT_IFACE_H 1 -#include "stddef.h" -#include "stdint.h" -#include "stdbool.h" -#include "internal.h" -#include "ruby/internal/attr/nodiscard.h" +#include "ruby/ruby.h" #include "vm_core.h" -#include "vm_callinfo.h" -#include "builtin.h" #include "yjit_core.h" -#ifndef rb_callcache -struct rb_callcache; -#define rb_callcache rb_callcache -#endif - #define YJIT_DECLARE_COUNTERS(...) struct rb_yjit_runtime_counters { \ int64_t __VA_ARGS__; \ }; \ |