mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Adjusted spaces [ci skip]
This commit is contained in:
parent
293c6c8cc3
commit
0c6f36668a
12 changed files with 78 additions and 72 deletions
|
@ -8968,7 +8968,8 @@ rb_iseq_mark_insn_storage(struct iseq_compile_data_storage *storage)
|
||||||
if (offset > storage->size || offset > storage->pos) {
|
if (offset > storage->size || offset > storage->pos) {
|
||||||
pos = 0;
|
pos = 0;
|
||||||
storage = storage->next;
|
storage = storage->next;
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
#ifdef STRICT_ALIGNMENT
|
#ifdef STRICT_ALIGNMENT
|
||||||
pos += (int)padding;
|
pos += (int)padding;
|
||||||
#endif /* STRICT_ALIGNMENT */
|
#endif /* STRICT_ALIGNMENT */
|
||||||
|
|
|
@ -292,7 +292,8 @@ do_mutex_lock(VALUE self, int interruptible_p)
|
||||||
mutex->th = th;
|
mutex->th = th;
|
||||||
mutex_locked(th, self);
|
mutex_locked(th, self);
|
||||||
}
|
}
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
if (mutex->th == th) mutex_locked(th, self);
|
if (mutex->th == th) mutex_locked(th, self);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1011,7 +1011,8 @@ rb_vm_bugreport(const void *ctx)
|
||||||
if (map.is_submap) {
|
if (map.is_submap) {
|
||||||
// We only look at main addresses
|
// We only look at main addresses
|
||||||
depth++;
|
depth++;
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
fprintf(stderr, "%lx-%lx %s%s%s", addr, (addr+size),
|
fprintf(stderr, "%lx-%lx %s%s%s", addr, (addr+size),
|
||||||
((map.protection & VM_PROT_READ) != 0 ? "r" : "-"),
|
((map.protection & VM_PROT_READ) != 0 ? "r" : "-"),
|
||||||
((map.protection & VM_PROT_WRITE) != 0 ? "w" : "-"),
|
((map.protection & VM_PROT_WRITE) != 0 ? "w" : "-"),
|
||||||
|
|
|
@ -4384,13 +4384,16 @@ vm_opt_nil_p(CALL_INFO ci, CALL_CACHE cc, VALUE recv)
|
||||||
if (recv == Qnil) {
|
if (recv == Qnil) {
|
||||||
if (BASIC_OP_UNREDEFINED_P(BOP_NIL_P, NIL_REDEFINED_OP_FLAG)) {
|
if (BASIC_OP_UNREDEFINED_P(BOP_NIL_P, NIL_REDEFINED_OP_FLAG)) {
|
||||||
return Qtrue;
|
return Qtrue;
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
return Qundef;
|
return Qundef;
|
||||||
}
|
}
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
if (vm_method_cfunc_is(ci, cc, recv, rb_false)) {
|
if (vm_method_cfunc_is(ci, cc, recv, rb_false)) {
|
||||||
return Qfalse;
|
return Qfalse;
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
return Qundef;
|
return Qundef;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue