From patchwork Sun Aug 13 15:25:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Kolpackov X-Patchwork-Id: 801007 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-460276-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="rrCo0xLz"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xVjKR34p2z9sPr for ; Mon, 14 Aug 2017 01:27:20 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:mime-version:content-type; q=dns; s= default; b=p02YfpHnO5m877p4rWOnsGvaRM6of6wCwQuqZjNHd2yJ/I1Yql+RL uLvrYd+dpZkQBC1ZGyetqlHHsHKGKOobHl0TC2vsCjLxtgsJP9UJSuZ9eltGYBBV WPn86soHNcnkIjSPXe4/DpC+PvNhdk23pXLp27XMzQUcxEGUSlhWf4= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:mime-version:content-type; s= default; bh=iSsM/TYj4l0R+/FnPHoqn/s+DiE=; b=rrCo0xLzlw23Q7KrEX6U gK7atEbiuXw02kojqGhBNMf+4mcYDAkAGHFlcuMMMQd/rqT33A8Dv9Ok35Ypbz/K t9ees/4x6dbFp44BjVeX9NzFS7RElB7ym2RtWZ8AM0HXDbVIeuitF9HVhYlVfQ9L yNG2ylI2ntWf++VdPMUvmyM= Received: (qmail 107464 invoked by alias); 13 Aug 2017 15:26:36 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 85372 invoked by uid 89); 13 Aug 2017 15:25:59 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-10.8 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3, KAM_ASCII_DIVIDERS, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS, URIBL_RED autolearn=ham version=3.3.2 spammy= X-HELO: codesynthesis.com Received: from codesynthesis.com (HELO codesynthesis.com) (70.85.31.65) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 13 Aug 2017 15:25:58 +0000 Received: from brak.codesynthesis.com (80-110-81-194.cgn.dynamic.surfer.at [80.110.81.194]) (authenticated bits=0) by codesynthesis.com (8.14.4/8.14.4/Debian-4) with ESMTP id v7DFPmKi025552 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 13 Aug 2017 11:25:54 -0400 Received: by brak.codesynthesis.com (Postfix, from userid 1000) id A52251A800E0; Sun, 13 Aug 2017 17:25:42 +0200 (SAST) Date: Sun, 13 Aug 2017 17:25:42 +0200 From: Boris Kolpackov To: gcc-patches@gcc.gnu.org Subject: [PATCH] Write dependency information (-M*) even if there are errors Message-ID: MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) X-IsSubscribed: yes Hi, I've been instructed to resend this patch from the gcc mailing list: Currently GCC does not write extracted header dependency information if there are errors. However, this can be useful when dealing with outdated generated headers that trigger errors which would have been resolved if we could update it. A concrete example in our case is a version check with #error. The included (trivial) patch changes this behavior. Note also that this is how Clang already behaves. I've tested the patch in build2 and everything works well (i.e., no invalid dependency output in the face of various preprocessor errors such as #error, stray #else, etc). While I don't foresee any backwards-compatibility issues with such an unconditional change (after all, the compiler still exists with an error status), if there are concerns, I could re-do it via an option (e.g., -ME, analogous to -MG). Joseph Myers writes: > I suppose a question for the present proposal would be making sure any > dependencies generated in this case do not include dependencies on files > that don't exist (so #include "some-misspelling.h" doesn't create any sort > of dependency on such a header). Good point. I've tested this and I believe everything is in order: unless -MG is specified, a non-existent header is treated as a fatal error so we don't even get to writing the dependency info. And if -MG is specified, then there is no error and we get the missing header in the dependency output, as requested. P.S. I have the paperwork necessary to contribute on file with FSF. Thanks, Boris Index: gcc/c-family/ChangeLog =================================================================== --- gcc/c-family/ChangeLog (revision 250514) +++ gcc/c-family/ChangeLog (working copy) @@ -1,3 +1,8 @@ +2017-08-06 Boris Kolpackov + + * c-opts.c (c_common_finish): Write dependency information even if + there are errors. + 2017-07-14 David Malcolm * c-common.c (try_to_locate_new_include_insertion_point): New Index: gcc/c-family/c-opts.c =================================================================== --- gcc/c-family/c-opts.c (revision 250514) +++ gcc/c-family/c-opts.c (working copy) @@ -1152,8 +1157,11 @@ { FILE *deps_stream = NULL; - /* Don't write the deps file if there are errors. */ - if (cpp_opts->deps.style != DEPS_NONE && !seen_error ()) + /* Note that we write the dependencies even if there are errors. This is + useful for handling outdated generated headers that now trigger errors + (for example, with #error) which would be resolved by re-generating + them. In a sense, this complements -MG. */ + if (cpp_opts->deps.style != DEPS_NONE) { /* If -M or -MM was seen without -MF, default output to the output stream. */