kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Suppress clobbered warnings on Travis-CI ppc64le-linux

Browse source
This commit is contained in:
Nobuyoshi Nakada 2021-06-03 20:07:26 +09:00 • committed by GitHub
parent dc25412042
commit 93be7a4c6b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
Notes: git 2021-06-03 20:07:53 +09:00 
Merged: https://github.com/ruby/ruby/pull/4550

Merged-By: nobu <nobu@ruby-lang.org>
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cont.c
View file

@ -2041,7 +2041,6 @@ rb_fiber_start(void)
rb_proc_t *proc;
enum ruby_tag_type state;
int need_interrupt = TRUE;
VALUE err = Qfalse;
VM_ASSERT(th->ec == GET_EC());
VM_ASSERT(FIBER_RESUMED_P(fiber));
@ -2067,6 +2066,7 @@ rb_fiber_start(void)
}
EC_POP_TAG();
VALUE err = Qfalse;
if (state) {
err = th->ec->errinfo;
VM_ASSERT(FIBER_RESUMED_P(fiber));

5
thread.c
View file

@ -4408,13 +4408,13 @@ int
rb_thread_wait_for_single_fd(int fd, int events, struct timeval *timeout)
{
struct pollfd fds[2];
int result = 0, lerrno;
rb_hrtime_t *to, rel, end = 0;
int result = 0;
int drained;
nfds_t nfds;
rb_unblock_function_t *ubf;
struct waiting_fd wfd;
int state;
volatile int lerrno;
wfd.th = GET_THREAD();
wfd.fd = fd;
@ -4427,6 +4427,7 @@ rb_thread_wait_for_single_fd(int fd, int events, struct timeval *timeout)
EC_PUSH_TAG(wfd.th->ec);
if ((state = EC_EXEC_TAG()) == TAG_NONE) {
rb_hrtime_t *to, rel, end = 0;
RUBY_VM_CHECK_INTS_BLOCKING(wfd.th->ec);
timeout_prepare(&to, &rel, &end, timeout);
fds[0].fd = fd;