Skip to content

Commit e79dee3

Browse files
mamemame
committed
Remove the dependency from internal/cont.h to prism
1 parent fbaad48 commit e79dee3

File tree

5 files changed

+8
-78
lines changed

5 files changed

+8
-78
lines changed

‎common.mk‎

Lines changed: 0 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -4107,26 +4107,6 @@ cont.$(OBJEXT): $(top_srcdir)/internal/thread.h
41074107
cont.$(OBJEXT): $(top_srcdir)/internal/variable.h
41084108
cont.$(OBJEXT): $(top_srcdir)/internal/vm.h
41094109
cont.$(OBJEXT): $(top_srcdir)/internal/warnings.h
4110-
cont.$(OBJEXT): $(top_srcdir)/prism/defines.h
4111-
cont.$(OBJEXT): $(top_srcdir)/prism/encoding.h
4112-
cont.$(OBJEXT): $(top_srcdir)/prism/node.h
4113-
cont.$(OBJEXT): $(top_srcdir)/prism/options.h
4114-
cont.$(OBJEXT): $(top_srcdir)/prism/pack.h
4115-
cont.$(OBJEXT): $(top_srcdir)/prism/parser.h
4116-
cont.$(OBJEXT): $(top_srcdir)/prism/prettyprint.h
4117-
cont.$(OBJEXT): $(top_srcdir)/prism/prism.h
4118-
cont.$(OBJEXT): $(top_srcdir)/prism/regexp.h
4119-
cont.$(OBJEXT): $(top_srcdir)/prism/static_literals.h
4120-
cont.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
4121-
cont.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
4122-
cont.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
4123-
cont.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h
4124-
cont.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h
4125-
cont.$(OBJEXT): $(top_srcdir)/prism/util/pm_memchr.h
4126-
cont.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
4127-
cont.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
4128-
cont.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h
4129-
cont.$(OBJEXT): $(top_srcdir)/prism/util/pm_strpbrk.h
41304110
cont.$(OBJEXT): {$(VPATH)}$(COROUTINE_H)
41314111
cont.$(OBJEXT): {$(VPATH)}assert.h
41324112
cont.$(OBJEXT): {$(VPATH)}atomic.h
@@ -4307,10 +4287,6 @@ cont.$(OBJEXT): {$(VPATH)}missing.h
43074287
cont.$(OBJEXT): {$(VPATH)}node.h
43084288
cont.$(OBJEXT): {$(VPATH)}onigmo.h
43094289
cont.$(OBJEXT): {$(VPATH)}oniguruma.h
4310-
cont.$(OBJEXT): {$(VPATH)}prism/ast.h
4311-
cont.$(OBJEXT): {$(VPATH)}prism/diagnostic.h
4312-
cont.$(OBJEXT): {$(VPATH)}prism/version.h
4313-
cont.$(OBJEXT): {$(VPATH)}prism_compile.h
43144290
cont.$(OBJEXT): {$(VPATH)}ractor.h
43154291
cont.$(OBJEXT): {$(VPATH)}ractor_core.h
43164292
cont.$(OBJEXT): {$(VPATH)}ruby_assert.h
@@ -7603,26 +7579,6 @@ gc.$(OBJEXT): $(top_srcdir)/internal/thread.h
76037579
gc.$(OBJEXT): $(top_srcdir)/internal/variable.h
76047580
gc.$(OBJEXT): $(top_srcdir)/internal/vm.h
76057581
gc.$(OBJEXT): $(top_srcdir)/internal/warnings.h
7606-
gc.$(OBJEXT): $(top_srcdir)/prism/defines.h
7607-
gc.$(OBJEXT): $(top_srcdir)/prism/encoding.h
7608-
gc.$(OBJEXT): $(top_srcdir)/prism/node.h
7609-
gc.$(OBJEXT): $(top_srcdir)/prism/options.h
7610-
gc.$(OBJEXT): $(top_srcdir)/prism/pack.h
7611-
gc.$(OBJEXT): $(top_srcdir)/prism/parser.h
7612-
gc.$(OBJEXT): $(top_srcdir)/prism/prettyprint.h
7613-
gc.$(OBJEXT): $(top_srcdir)/prism/prism.h
7614-
gc.$(OBJEXT): $(top_srcdir)/prism/regexp.h
7615-
gc.$(OBJEXT): $(top_srcdir)/prism/static_literals.h
7616-
gc.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
7617-
gc.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
7618-
gc.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
7619-
gc.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h
7620-
gc.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h
7621-
gc.$(OBJEXT): $(top_srcdir)/prism/util/pm_memchr.h
7622-
gc.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
7623-
gc.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
7624-
gc.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h
7625-
gc.$(OBJEXT): $(top_srcdir)/prism/util/pm_strpbrk.h
76267582
gc.$(OBJEXT): {$(VPATH)}assert.h
76277583
gc.$(OBJEXT): {$(VPATH)}atomic.h
76287584
gc.$(OBJEXT): {$(VPATH)}backward/2/assume.h
@@ -7807,10 +7763,6 @@ gc.$(OBJEXT): {$(VPATH)}missing.h
78077763
gc.$(OBJEXT): {$(VPATH)}node.h
78087764
gc.$(OBJEXT): {$(VPATH)}onigmo.h
78097765
gc.$(OBJEXT): {$(VPATH)}oniguruma.h
7810-
gc.$(OBJEXT): {$(VPATH)}prism/ast.h
7811-
gc.$(OBJEXT): {$(VPATH)}prism/diagnostic.h
7812-
gc.$(OBJEXT): {$(VPATH)}prism/version.h
7813-
gc.$(OBJEXT): {$(VPATH)}prism_compile.h
78147766
gc.$(OBJEXT): {$(VPATH)}probes.dmyh
78157767
gc.$(OBJEXT): {$(VPATH)}probes.h
78167768
gc.$(OBJEXT): {$(VPATH)}ractor.h
@@ -8111,26 +8063,6 @@ hash.$(OBJEXT): $(top_srcdir)/internal/time.h
81118063
hash.$(OBJEXT): $(top_srcdir)/internal/variable.h
81128064
hash.$(OBJEXT): $(top_srcdir)/internal/vm.h
81138065
hash.$(OBJEXT): $(top_srcdir)/internal/warnings.h
8114-
hash.$(OBJEXT): $(top_srcdir)/prism/defines.h
8115-
hash.$(OBJEXT): $(top_srcdir)/prism/encoding.h
8116-
hash.$(OBJEXT): $(top_srcdir)/prism/node.h
8117-
hash.$(OBJEXT): $(top_srcdir)/prism/options.h
8118-
hash.$(OBJEXT): $(top_srcdir)/prism/pack.h
8119-
hash.$(OBJEXT): $(top_srcdir)/prism/parser.h
8120-
hash.$(OBJEXT): $(top_srcdir)/prism/prettyprint.h
8121-
hash.$(OBJEXT): $(top_srcdir)/prism/prism.h
8122-
hash.$(OBJEXT): $(top_srcdir)/prism/regexp.h
8123-
hash.$(OBJEXT): $(top_srcdir)/prism/static_literals.h
8124-
hash.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
8125-
hash.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
8126-
hash.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
8127-
hash.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h
8128-
hash.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h
8129-
hash.$(OBJEXT): $(top_srcdir)/prism/util/pm_memchr.h
8130-
hash.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
8131-
hash.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
8132-
hash.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h
8133-
hash.$(OBJEXT): $(top_srcdir)/prism/util/pm_strpbrk.h
81348066
hash.$(OBJEXT): {$(VPATH)}assert.h
81358067
hash.$(OBJEXT): {$(VPATH)}atomic.h
81368068
hash.$(OBJEXT): {$(VPATH)}backward/2/assume.h
@@ -8311,10 +8243,6 @@ hash.$(OBJEXT): {$(VPATH)}missing.h
83118243
hash.$(OBJEXT): {$(VPATH)}node.h
83128244
hash.$(OBJEXT): {$(VPATH)}onigmo.h
83138245
hash.$(OBJEXT): {$(VPATH)}oniguruma.h
8314-
hash.$(OBJEXT): {$(VPATH)}prism/ast.h
8315-
hash.$(OBJEXT): {$(VPATH)}prism/diagnostic.h
8316-
hash.$(OBJEXT): {$(VPATH)}prism/version.h
8317-
hash.$(OBJEXT): {$(VPATH)}prism_compile.h
83188246
hash.$(OBJEXT): {$(VPATH)}probes.dmyh
83198247
hash.$(OBJEXT): {$(VPATH)}probes.h
83208248
hash.$(OBJEXT): {$(VPATH)}ractor.h

‎internal/cont.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
* @brief Internal header for Fiber.
1010
*/
1111
#include "ruby/ruby.h" /* for VALUE */
12-
#include "iseq.h"
1312

1413
struct rb_thread_struct; /* in vm_core.h */
1514
struct rb_fiber_struct; /* in cont.c */
@@ -18,9 +17,6 @@ struct rb_execution_context_struct; /* in vm_core.c */
1817
/* cont.c */
1918
void rb_fiber_reset_root_local_storage(struct rb_thread_struct *);
2019
void ruby_register_rollback_func_for_ensure(VALUE (*ensure_func)(VALUE), VALUE (*rollback_func)(VALUE));
21-
void rb_jit_cont_init(void);
22-
void rb_jit_cont_each_iseq(rb_iseq_callback callback, void *data);
23-
void rb_jit_cont_finish(void);
2420

2521
/* vm.c */
2622
void rb_free_shared_fiber_pool(void);

‎internal/thread.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include "ruby/ruby.h" /* for VALUE */
1212
#include "ruby/intern.h" /* for rb_blocking_function_t */
1313
#include "ccan/list/list.h" /* for list in rb_io_close_wait_list */
14+
#include "iseq.h"
1415

1516
struct rb_thread_struct; /* in vm_core.h */
1617
struct rb_io;
@@ -107,4 +108,9 @@ void rb_ractor_interrupt_exec(struct rb_ractor_struct *target_r,
107108

108109
void rb_threadptr_interrupt_exec_task_mark(struct rb_thread_struct *th);
109110

111+
/* cont.c */
112+
void rb_jit_cont_init(void);
113+
void rb_jit_cont_each_iseq(rb_iseq_callback callback, void *data);
114+
void rb_jit_cont_finish(void);
115+
110116
#endif /* INTERNAL_THREAD_H */

‎yjit/bindgen/src/main.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ fn main() {
361361
// From internal/compile.h
362362
.allowlist_function("rb_vm_insn_decode")
363363

364-
// from internal/cont.h
364+
// from internal/thread.h
365365
.allowlist_function("rb_jit_cont_each_iseq")
366366

367367
// From iseq.h

‎zjit/bindgen/src/main.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ fn main() {
367367
// From internal/compile.h
368368
.allowlist_function("rb_vm_insn_decode")
369369

370-
// from internal/cont.h
370+
// from internal/thread.h
371371
.allowlist_function("rb_jit_cont_each_iseq")
372372

373373
// From iseq.h

0 commit comments

Comments
 (0)