nobu	2018-09-21 19:19:10 +0900 (Fri, 21 Sep 2018)

  New Revision: 64806

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=64806

  Log:
    Remove -Wno-parentheses flag.
    
    [Fix GH-1958]
    
    From: Jun Aruga <jaruga@r...>

  Modified files:
    trunk/configure.ac
    trunk/ext/openssl/ossl_pkey.h
    trunk/ext/openssl/ossl_pkey_dh.c
    trunk/ext/openssl/ossl_x509name.c
    trunk/mjit_worker.c
    trunk/re.c
    trunk/signal.c
    trunk/vm_insnhelper.c
Index: mjit_worker.c
===================================================================
--- mjit_worker.c	(revision 64805)
+++ mjit_worker.c	(revision 64806)
@@ -1094,7 +1094,7 @@ convert_unit_to_func(struct rb_mjit_unit https://github.com/ruby/ruby/blob/trunk/mjit_worker.c#L1094
     success = compile_c_to_so(c_file, so_file);
 #else
     /* splitting .c -> .o step and .o -> .so step, to cache .o files in the future */
-    if (success = compile_c_to_o(c_file, o_file)) {
+    if ((success = compile_c_to_o(c_file, o_file)) != 0) {
         const char *o_files[2] = { NULL, NULL };
         o_files[0] = o_file;
         success = link_o_to_so(o_files, so_file);
Index: vm_insnhelper.c
===================================================================
--- vm_insnhelper.c	(revision 64805)
+++ vm_insnhelper.c	(revision 64806)
@@ -3868,7 +3868,7 @@ vm_trace(rb_execution_context_t *ec, rb_ https://github.com/ruby/ruby/blob/trunk/vm_insnhelper.c#L3868
 	VM_ASSERT(vm_event_flags & events);
 
 	/* increment PC because source line is calculated with PC-1 */
-	if (event = (events & (RUBY_EVENT_CLASS | RUBY_EVENT_CALL | RUBY_EVENT_B_CALL))) {
+	if ((event = (events & (RUBY_EVENT_CLASS | RUBY_EVENT_CALL | RUBY_EVENT_B_CALL))) != 0) {
 	    VM_ASSERT(event == RUBY_EVENT_CLASS ||
 		      event == RUBY_EVENT_CALL  ||
 		      event == RUBY_EVENT_B_CALL);
@@ -3889,7 +3889,7 @@ vm_trace(rb_execution_context_t *ec, rb_ https://github.com/ruby/ruby/blob/trunk/vm_insnhelper.c#L3889
 	    EXEC_EVENT_HOOK(ec, RUBY_EVENT_COVERAGE_LINE, GET_SELF(), 0, 0, 0, Qundef);
 	    reg_cfp->pc--;
 	}
-	if (event = (events & (RUBY_EVENT_END | RUBY_EVENT_RETURN | RUBY_EVENT_B_RETURN))) {
+	if ((event = (events & (RUBY_EVENT_END | RUBY_EVENT_RETURN | RUBY_EVENT_B_RETURN))) != 0) {
 	    VM_ASSERT(event == RUBY_EVENT_END ||
 		      event == RUBY_EVENT_RETURN  ||
 		      event == RUBY_EVENT_B_RETURN);
Index: configure.ac
===================================================================
--- configure.ac	(revision 64805)
+++ configure.ac	(revision 64806)
@@ -471,7 +471,7 @@ AS_IF([test "$GCC:${warnflags+set}:no" = https://github.com/ruby/ruby/blob/trunk/configure.ac#L471
     AS_IF([test $icc_version -gt 0], [
 	particular_werror_flags=no
     ])
-    for wflag in -Wno-unused-parameter -Wno-parentheses -Wno-long-long \
+    for wflag in -Wno-unused-parameter -Wno-long-long \
                  -diag-disable=175,188,2259 \
 		 -Wno-missing-field-initializers \
 		 -Wno-tautological-compare \
Index: re.c
===================================================================
--- re.c	(revision 64805)
+++ re.c	(revision 64806)
@@ -95,7 +95,7 @@ rb_memsearch_ss(const unsigned char *xs, https://github.com/ruby/ruby/blob/trunk/re.c#L95
 {
     const unsigned char *y;
 
-    if (y = memmem(ys, n, xs, m))
+    if ((y = memmem(ys, n, xs, m)) != NULL)
 	return y - ys;
     else
 	return -1;
Index: ext/openssl/ossl_x509name.c
===================================================================
--- ext/openssl/ossl_x509name.c	(revision 64805)
+++ ext/openssl/ossl_x509name.c	(revision 64806)
@@ -270,7 +270,7 @@ x509name_print(VALUE self, unsigned long https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_x509name.c#L270
     if (!out)
 	ossl_raise(eX509NameError, NULL);
     ret = X509_NAME_print_ex(out, name, 0, iflag);
-    if (ret < 0 || iflag == XN_FLAG_COMPAT && ret == 0) {
+    if (ret < 0 || (iflag == XN_FLAG_COMPAT && ret == 0)) {
 	BIO_free(out);
 	ossl_raise(eX509NameError, "X509_NAME_print_ex");
     }
Index: ext/openssl/ossl_pkey.h
===================================================================
--- ext/openssl/ossl_pkey.h	(revision 64805)
+++ ext/openssl/ossl_pkey.h	(revision 64806)
@@ -133,9 +133,9 @@ static VALUE ossl_##_keytype##_set_##_gr https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_pkey.h#L133
 	BIGNUM *bn3 = NULL, *orig_bn3 = NIL_P(v3) ? NULL : GetBNPtr(v3);\
 									\
 	Get##_type(self, obj);						\
-	if (orig_bn1 && !(bn1 = BN_dup(orig_bn1)) ||			\
-	    orig_bn2 && !(bn2 = BN_dup(orig_bn2)) ||			\
-	    orig_bn3 && !(bn3 = BN_dup(orig_bn3))) {			\
+	if ((orig_bn1 && !(bn1 = BN_dup(orig_bn1))) ||			\
+	    (orig_bn2 && !(bn2 = BN_dup(orig_bn2))) ||			\
+	    (orig_bn3 && !(bn3 = BN_dup(orig_bn3)))) {			\
 		BN_clear_free(bn1);					\
 		BN_clear_free(bn2);					\
 		BN_clear_free(bn3);					\
@@ -163,8 +163,8 @@ static VALUE ossl_##_keytype##_set_##_gr https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_pkey.h#L163
 	BIGNUM *bn2 = NULL, *orig_bn2 = NIL_P(v2) ? NULL : GetBNPtr(v2);\
 									\
 	Get##_type(self, obj);						\
-	if (orig_bn1 && !(bn1 = BN_dup(orig_bn1)) ||			\
-	    orig_bn2 && !(bn2 = BN_dup(orig_bn2))) {			\
+	if ((orig_bn1 && !(bn1 = BN_dup(orig_bn1))) ||			\
+	    (orig_bn2 && !(bn2 = BN_dup(orig_bn2)))) {			\
 		BN_clear_free(bn1);					\
 		BN_clear_free(bn2);					\
 		ossl_raise(eBNError, NULL);				\
Index: ext/openssl/ossl_pkey_dh.c
===================================================================
--- ext/openssl/ossl_pkey_dh.c	(revision 64805)
+++ ext/openssl/ossl_pkey_dh.c	(revision 64806)
@@ -262,7 +262,7 @@ ossl_dh_initialize_copy(VALUE self, VALU https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_pkey_dh.c#L262
 	BIGNUM *pub2 = BN_dup(pub);
 	BIGNUM *priv2 = BN_dup(priv);
 
-	if (!pub2 || priv && !priv2) {
+	if (!pub2 || (priv && !priv2)) {
 	    BN_clear_free(pub2);
 	    BN_clear_free(priv2);
 	    ossl_raise(eDHError, "BN_dup");
Index: signal.c
===================================================================
--- signal.c	(revision 64805)
+++ signal.c	(revision 64806)
@@ -886,7 +886,7 @@ check_stack_overflow(int sig, const uint https://github.com/ruby/ruby/blob/trunk/signal.c#L886
     /* SP in ucontext is not decremented yet when `push` failed, so
      * the fault page can be the next. */
     if (sp_page == fault_page || sp_page == fault_page + 1 ||
-	sp_page <= fault_page && fault_page <= bp_page) {
+	(sp_page <= fault_page && fault_page <= bp_page)) {
 	rb_execution_context_t *ec = GET_EC();
 	int crit = FALSE;
 	if ((uintptr_t)ec->tag->buf / pagesize <= fault_page + 1) {

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/