Skip to content

Fix flag test macro #11351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 11, 2024
Merged

Fix flag test macro #11351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04d57e2
Evaluate macro arguments just once
nobu Aug 9, 2024
21a9d76
Fix flag test macro
nobu Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions gc/default.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -865,16 +865,16 @@ RVALUE_AGE_SET(VALUE obj, int age)
#if 0
#define dont_gc_on() (fprintf(stderr, "dont_gc_on@%s:%d\n", __FILE__, __LINE__), objspace->flags.dont_gc = 1)
#define dont_gc_off() (fprintf(stderr, "dont_gc_off@%s:%d\n", __FILE__, __LINE__), objspace->flags.dont_gc = 0)
#define dont_gc_set(b) (fprintf(stderr, "dont_gc_set(%d)@%s:%d\n", __FILE__, __LINE__), (int)b), objspace->flags.dont_gc = (b))
#define dont_gc_set(b) (fprintf(stderr, "dont_gc_set(%d)@%s:%d\n", __FILE__, __LINE__), objspace->flags.dont_gc = (int)(b))
#define dont_gc_val() (objspace->flags.dont_gc)
#else
#define dont_gc_on() (objspace->flags.dont_gc = 1)
#define dont_gc_off() (objspace->flags.dont_gc = 0)
#define dont_gc_set(b) (((int)b), objspace->flags.dont_gc = (b))
#define dont_gc_set(b) (objspace->flags.dont_gc = (int)(b))
#define dont_gc_val() (objspace->flags.dont_gc)
#endif

#define gc_config_full_mark_set(b) (((int)b), objspace->gc_config.full_mark = (b))
#define gc_config_full_mark_set(b) (objspace->gc_config.full_mark = (int)(b))
#define gc_config_full_mark_val (objspace->gc_config.full_mark)

#ifndef DURING_GC_COULD_MALLOC_REGION_START
Expand Down Expand Up @@ -8035,7 +8035,7 @@ gc_config_set_key(st_data_t key, st_data_t value, st_data_t data)
rb_objspace_t *objspace = (rb_objspace_t *)data;
if (rb_sym2id(key) == rb_intern("rgengc_allow_full_mark")) {
gc_rest(objspace);
gc_config_full_mark_set(RBOOL(value));
gc_config_full_mark_set(RTEST(value));
}
return ST_CONTINUE;
}
Expand Down
4 changes: 3 additions & 1 deletion test/ruby/test_gc.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,10 @@ def test_gc_config_setting_returns_updated_config_hash

new_value = GC.config(rgengc_allow_full_mark: false)[:rgengc_allow_full_mark]
assert_false(new_value)
new_value = GC.config(rgengc_allow_full_mark: nil)[:rgengc_allow_full_mark]
assert_false(new_value)
ensure
GC.config(rgengc_allow_full_mark: true)
GC.config(rgengc_allow_full_mark: old_value)
GC.start
end

Expand Down