зеркало из https://github.com/github/ruby.git
Fix -Wclobbered warnings
This commit is contained in:
Родитель
f630b24d7a
Коммит
da69c9235f
2
load.c
2
load.c
|
@ -1284,7 +1284,7 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception, bool wa
|
||||||
else {
|
else {
|
||||||
switch (found) {
|
switch (found) {
|
||||||
case 'r':
|
case 'r':
|
||||||
load_iseq_eval(ec, path);
|
load_iseq_eval(saved.ec, path);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 's':
|
case 's':
|
||||||
|
|
2
thread.c
2
thread.c
|
@ -1790,6 +1790,7 @@ rb_thread_io_blocking_call(rb_blocking_function_t *func, void *data1, int fd, in
|
||||||
{
|
{
|
||||||
EC_PUSH_TAG(ec);
|
EC_PUSH_TAG(ec);
|
||||||
if ((state = EC_EXEC_TAG()) == TAG_NONE) {
|
if ((state = EC_EXEC_TAG()) == TAG_NONE) {
|
||||||
|
volatile enum ruby_tag_type saved_state = state; /* for BLOCKING_REGION */
|
||||||
retry:
|
retry:
|
||||||
BLOCKING_REGION(waiting_fd.th, {
|
BLOCKING_REGION(waiting_fd.th, {
|
||||||
val = func(data1);
|
val = func(data1);
|
||||||
|
@ -1803,6 +1804,7 @@ rb_thread_io_blocking_call(rb_blocking_function_t *func, void *data1, int fd, in
|
||||||
RUBY_VM_CHECK_INTS_BLOCKING(ec);
|
RUBY_VM_CHECK_INTS_BLOCKING(ec);
|
||||||
goto retry;
|
goto retry;
|
||||||
}
|
}
|
||||||
|
state = saved_state;
|
||||||
}
|
}
|
||||||
EC_POP_TAG();
|
EC_POP_TAG();
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче