diff options
| -rw-r--r-- | string.c | 6 | ||||
| -rw-r--r-- | thread.c | 8 |
2 files changed, 3 insertions, 11 deletions
@@ -7493,8 +7493,7 @@ rb_str_enumerate_lines(int argc, VALUE *argv, VALUE str, int wantarray) const char *ptr, *pend, *subptr, *subend, *rsptr, *hit, *adjusted; long pos, len, rslen; int rsnewline = 0; - - VALUE MAYBE_UNUSED(ary); + VALUE ary = 0; if (rb_scan_args(argc, argv, "01:", &rs, &opts) == 0) rs = rb_rs; @@ -7517,9 +7516,6 @@ rb_str_enumerate_lines(int argc, VALUE *argv, VALUE str, int wantarray) wantarray = 0; #endif } -#if defined __GNUC__ && !defined __clang__ - ASSUME(wantarray || !ary); /* if wantarray, ary does not matter */ -#endif } else { if (wantarray) @@ -3573,9 +3573,7 @@ rb_fd_select(int n, rb_fdset_t *readfds, rb_fdset_t *writefds, rb_fdset_t *excep return select(n, r, w, e, timeout); } -#if defined __GNUC__ && __GNUC__ >= 5 -# define rb_fd_no_init(fds) ASSUME(!(fds)->fdset && !(fds)->maxfd) -#endif +#define rb_fd_no_init(fds) (((fds)->fdset = 0), ((fds)->maxfd = 0)) #undef FD_ZERO #undef FD_SET @@ -3640,9 +3638,7 @@ rb_fd_set(int fd, rb_fdset_t *set) #define FD_CLR(i, f) rb_fd_clr((i), (f)) #define FD_ISSET(i, f) rb_fd_isset((i), (f)) -#if defined __GNUC__ && __GNUC__ >= 5 -# define rb_fd_no_init(fds) ASSUME(!(fds)->fdset) -#endif +#define rb_fd_no_init(fds) ((fds)->fdset = 0) #endif |