mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Adjusted styles
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67504 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
d8442c4306
commit
b9e52ef8b6
5 changed files with 7 additions and 5 deletions
2
array.c
2
array.c
|
@ -1326,7 +1326,7 @@ rb_ary_shift_m(int argc, VALUE *argv, VALUE ary)
|
||||||
MJIT_FUNC_EXPORTED VALUE
|
MJIT_FUNC_EXPORTED VALUE
|
||||||
rb_ary_behead(VALUE ary, long n)
|
rb_ary_behead(VALUE ary, long n)
|
||||||
{
|
{
|
||||||
if(n<=0) return ary;
|
if (n<=0) return ary;
|
||||||
|
|
||||||
rb_ary_modify_check(ary);
|
rb_ary_modify_check(ary);
|
||||||
if (ARY_SHARED_P(ary)) {
|
if (ARY_SHARED_P(ary)) {
|
||||||
|
|
2
gc.c
2
gc.c
|
@ -5479,7 +5479,7 @@ gc_verify_heap_pages_(rb_objspace_t *objspace, struct list_head *head)
|
||||||
list_for_each(head, page, page_node) {
|
list_for_each(head, page, page_node) {
|
||||||
unpoison_memory_region(&page->freelist, sizeof(RVALUE*), false);
|
unpoison_memory_region(&page->freelist, sizeof(RVALUE*), false);
|
||||||
RVALUE *p = page->freelist;
|
RVALUE *p = page->freelist;
|
||||||
while(p) {
|
while (p) {
|
||||||
RVALUE *prev = p;
|
RVALUE *prev = p;
|
||||||
unpoison_object((VALUE)p, false);
|
unpoison_object((VALUE)p, false);
|
||||||
if (BUILTIN_TYPE(p) != T_NONE) {
|
if (BUILTIN_TYPE(p) != T_NONE) {
|
||||||
|
|
3
io.c
3
io.c
|
@ -10996,7 +10996,8 @@ nogvl_fcopyfile(struct copy_stream_struct *stp)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
switch (errno) {
|
switch (errno) {
|
||||||
case ENOTSUP:
|
case ENOTSUP:
|
||||||
case EPERM:
|
case EPERM:
|
||||||
|
|
|
@ -1180,7 +1180,8 @@ mjit_copy_cache_from_main_thread(const rb_iseq_t *iseq, struct rb_call_cache *cc
|
||||||
|
|
||||||
if (UNLIKELY(mjit_opts.wait)) {
|
if (UNLIKELY(mjit_opts.wait)) {
|
||||||
mjit_copy_job_handler((void *)job);
|
mjit_copy_job_handler((void *)job);
|
||||||
} else if (rb_workqueue_register(0, mjit_copy_job_handler, (void *)job)) {
|
}
|
||||||
|
else if (rb_workqueue_register(0, mjit_copy_job_handler, (void *)job)) {
|
||||||
CRITICAL_SECTION_START(3, "in MJIT copy job wait");
|
CRITICAL_SECTION_START(3, "in MJIT copy job wait");
|
||||||
// checking `stop_worker_p` too because `RUBY_VM_CHECK_INTS(ec)` may not
|
// checking `stop_worker_p` too because `RUBY_VM_CHECK_INTS(ec)` may not
|
||||||
// lush mjit_copy_job_handler when EC_EXEC_TAG() is not TAG_NONE, and then
|
// lush mjit_copy_job_handler when EC_EXEC_TAG() is not TAG_NONE, and then
|
||||||
|
|
|
@ -36,7 +36,7 @@ enum arg_setup_type {
|
||||||
static inline void
|
static inline void
|
||||||
arg_rest_dup(struct args_info *args)
|
arg_rest_dup(struct args_info *args)
|
||||||
{
|
{
|
||||||
if(!args->rest_dupped) {
|
if (!args->rest_dupped) {
|
||||||
args->rest = rb_ary_dup(args->rest);
|
args->rest = rb_ary_dup(args->rest);
|
||||||
args->rest_dupped = TRUE;
|
args->rest_dupped = TRUE;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue