From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 79046 invoked by alias); 22 Nov 2015 09:14:55 -0000 Mailing-List: contact fortran-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: fortran-owner@gcc.gnu.org Received: (qmail 79006 invoked by uid 89); 22 Nov 2015 09:14:54 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.5 required=5.0 tests=AWL,BAYES_00,KAM_ASCII_DIVIDERS,KAM_LAZY_DOMAIN_SECURITY,RP_MATCHES_RCVD autolearn=no version=3.3.2 X-Spam-User: qpsmtpd, 3 recipients X-HELO: nef2.ens.fr Received: from nef2.ens.fr (HELO nef2.ens.fr) (129.199.96.40) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 22 Nov 2015 09:14:53 +0000 Received: from mailhost.lps.ens.fr (tournesol.lps.ens.fr [129.199.120.1]) by nef2.ens.fr (8.13.6/1.01.28121999) with ESMTP id tAM9EnKA054869 ; Sun, 22 Nov 2015 10:14:49 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mailhost.lps.ens.fr (Postfix) with ESMTP id A46EE156; Sun, 22 Nov 2015 10:14:49 +0100 (CET) Received: from mailhost.lps.ens.fr ([127.0.0.1]) by localhost (tournesol.lps.ens.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QC47ctFtRYGJ; Sun, 22 Nov 2015 10:14:49 +0100 (CET) Received: from [192.168.1.14] (log78-1-82-242-47-10.fbx.proxad.net [82.242.47.10]) by mailhost.lps.ens.fr (Postfix) with ESMTPSA id 60EF6155; Sun, 22 Nov 2015 10:14:49 +0100 (CET) From: =?utf-8?Q?Dominique_d=27Humi=C3=A8res?= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: [Back port r227760] PR67460 [5 Regression] Spurious: f951: all warnings being treated as errors Date: Sun, 22 Nov 2015 09:14:00 -0000 Message-Id: <8C363A46-CDE9-454C-AFAB-27A86FDAE042@lps.ens.fr> Cc: manu@gcc.gnu.org, gcc-patches To: fortran@gcc.gnu.org Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2104\)) X-SW-Source: 2015-11/txt/msg00140.txt.bz2 Is it OK to back port revision r227760 to 5.3? Tested on x86_64-apple-darwin14 Dominique Index: gcc/ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- gcc/ChangeLog (revision 230703) +++ gcc/ChangeLog (working copy) @@ -1,3 +1,17 @@ +2015-11-22 Dominique d'Humieres + + Backport from mainline + 2015-09-14 Manuel L=C3=B3pez-Ib=C3=A1=C3=B1e + + PR fortran/67460 + * diagnostic.c (diagnostic_initialize): Do not set + some_warnings_are_errors. + (diagnostic_finish): Use DK_WERROR count instead. + (diagnostic_report_diagnostic): Do not set + some_warnings_are_errors. + * diagnostic.h (struct diagnostic_context): Remove + some_warnings_are_errors. + 2015-11-21 Jakub Jelinek =20 PR debug/66432 Index: gcc/diagnostic.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- gcc/diagnostic.h (revision 230703) +++ gcc/diagnostic.h (working copy) @@ -65,10 +65,6 @@ /* The number of times we have issued diagnostics. */ int diagnostic_count[DK_LAST_DIAGNOSTIC_KIND]; =20 - /* True if we should display the "warnings are being tread as error" - message, usually displayed once per compiler run. */ - bool some_warnings_are_errors; - /* True if it has been requested that warnings be treated as errors. */ bool warning_as_error_requested; =20 Index: gcc/diagnostic.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- gcc/diagnostic.c (revision 230703) +++ gcc/diagnostic.c (working copy) @@ -138,7 +138,6 @@ new (context->printer) pretty_printer (); =20 memset (context->diagnostic_count, 0, sizeof context->diagnostic_count); - context->some_warnings_are_errors =3D false; context->warning_as_error_requested =3D false; context->n_opts =3D n_opts; context->classify_diagnostic =3D XNEWVEC (diagnostic_t, n_opts); @@ -204,7 +203,7 @@ diagnostic_finish (diagnostic_context *context) { /* Some of the errors may actually have been warnings. */ - if (context->some_warnings_are_errors) + if (diagnostic_kind_count (context, DK_WERROR)) { /* -Werror was given. */ if (context->warning_as_error_requested) @@ -811,9 +810,6 @@ return false; } =20 - if (orig_diag_kind =3D=3D DK_WARNING && diagnostic->kind =3D=3D DK_ERROR) - context->some_warnings_are_errors =3D true; - context->lock++; =20 if (diagnostic->kind =3D=3D DK_ICE || diagnostic->kind =3D=3D DK_ICE_NOB= T) Index: gcc/testsuite/ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- gcc/testsuite/ChangeLog (revision 230703) +++ gcc/testsuite/ChangeLog (working copy) @@ -1,3 +1,11 @@ +2015-11-22 Dominique d'Humieres + + Backport from mainline + 2015-09-14 Manuel L=C3=B3pez-Ib=C3=A1=C3=B1e + + PR fortran/67460 + * gfortran.dg/pr67460.f90: New test. + 2015-11-21 Jakub Jelinek =20 PR debug/66432 Index: gcc/testsuite/gfortran.dg/pr67460.f90 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- gcc/testsuite/gfortran.dg/pr67460.f90 (nonexistent) +++ gcc/testsuite/gfortran.dg/pr67460.f90 (working copy) @@ -0,0 +1,24 @@ +! Bogus "all warnings being treated as errors" +! { dg-do compile } +! { dg-options "-std=3Df2003 -Werror" } +MODULE btree_i8_k_sp2d_v + TYPE btree_node + INTEGER id + TYPE(btree_node_p), DIMENSION(:), POINTER :: subtrees + TYPE(btree_node), POINTER :: parent + END TYPE btree_node + TYPE btree_node_p + TYPE(btree_node), POINTER :: node + END TYPE btree_node_p +CONTAINS + RECURSIVE SUBROUTINE btree_verify_node (tree, node, level, nids, lastv,& + count, num_nodes, max_leaf_level, min_leaf_level, printing) + TYPE(btree_node), INTENT(IN) :: node + INTEGER :: branch + IF (ASSOCIATED (node%subtrees(branch)%node)) THEN + IF (node%subtrees(branch)%node%parent%id .NE. node%id) THEN + WRITE(*,*)'foo' + ENDIF + ENDIF + END SUBROUTINE btree_verify_node +END MODULE btree_i8_k_sp2d_v