From patchwork Thu May 11 14:25:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Sidwell X-Patchwork-Id: 761094 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3wNwPm4z5mz9s3s for ; Fri, 12 May 2017 00:25:47 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="gWPA0wMe"; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to:cc :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=eRINinTnYXis4JZI/BRYtxzwcOcyGHKpmAzVXIXH3hp/xjbyZS 2CtPznkLkFMsnTA/1ZRVY+N4I+SL9x2OKx7+tuqZPiUbfqFWEF4QZKSqWl73ZA7V O8FMPCEFWyYHw4v8ofiybnkz5fuBhJjteU9/dLtiBwuS+Pge5ONbwEMPM= 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:to:cc :from:subject:message-id:date:mime-version:content-type; s= default; bh=3riEckj9qRd3l6Tfd8kB3VYTQGw=; b=gWPA0wMeme1nOWLvpPDU kSUK2cBpfYkxaf88kd4M9fP9/esPKLH1RSlbK3Pqshp9xNgTPO6TsLaX+uHDRD81 AqjvjRf4p7aVobL3hnIYEzxIttQ2uZt6zohoJPUUvcq0Jnhi/EhGqBahYSHMjuJ2 4u/5p8mpyXiPM6V9SVloPTk= Received: (qmail 86728 invoked by alias); 11 May 2017 14:25:26 -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 86680 invoked by uid 89); 11 May 2017 14:25:26 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-15.6 required=5.0 tests=BAYES_00, FREEMAIL_FROM, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_ASCII_DIVIDERS, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail-yw0-f176.google.com Received: from mail-yw0-f176.google.com (HELO mail-yw0-f176.google.com) (209.85.161.176) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 11 May 2017 14:25:24 +0000 Received: by mail-yw0-f176.google.com with SMTP id b68so13339476ywe.3 for ; Thu, 11 May 2017 07:25:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:to:cc:from:subject:message-id:date :user-agent:mime-version:content-language; bh=6V2TX2u+4/vivyEY6ytGNkNtmGnXLwB3spfjL0hU9xs=; b=UyxC2fyaCvP2ERyUyZFv3/5z2o7MEcf7hKp4EiUGb/NElgAceU16rlVTf0eO+aRCtc Z8S7NHZzKr4tnqwJ1VmsrSaHjnnOfGnKlj3FJSzYOjkZpYCVvr5Hfmg7D6F1Bu/5xejn fj74y/odhSwRr8Te8x7cTHo8qoZJyzLYv8b3dh6ytyDUY0WO4gzswWY/SMGj9e49EOk3 mSlFh3KaA8HYBF/Na7N5Yw1gMUvqQPLZ6b/Y2T8agyf9f6uNYwa5nvCbDuhdKmWPpRZq 6fYIrIu9rUsIKkYYfGFlmSccPB3M2cVSmjEnYjzh/snbjbyCgexiTecIQoaJYn6AGI2h eAAg== X-Gm-Message-State: AODbwcAKfAwCy1jsl5ecIMK0Y799SHKQYtiJpGy8+ueC1q1LI+r7HxGE IKmUWg500SyXtw== X-Received: by 10.129.54.10 with SMTP id d10mr503116ywa.7.1494512725516; Thu, 11 May 2017 07:25:25 -0700 (PDT) Received: from ?IPv6:2620:10d:c0a3:20fb:f6d0:5ac5:64cd:f102? ([2620:10d:c091:200::7:4a1a]) by smtp.googlemail.com with ESMTPSA id z2sm147884ywd.42.2017.05.11.07.25.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 May 2017 07:25:24 -0700 (PDT) To: GCC Patches Cc: Jakub Jelinek , Uros Bizjak From: Nathan Sidwell Subject: [PATCH] fix -da Message-ID: <25abf866-1e1d-74dd-90e3-40323d91a3b0@acm.org> Date: Thu, 11 May 2017 10:25:22 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.0 MIME-Version: 1.0 A simple thinko caused -da to start including ipa dumps. While investigating I noticed we might also place the kind enumeration into pflags, so defensively stripped that out. Fixed thusly & committed. nathan 2017-05-11 Nathan Sidwell * dumpfile.h (TDF_FLAGS): New. * dumpfile.c (dump_start): Use TDF_FLAGS. (dump_enable_all): Fix TDF_KIND check thinko. Index: dumpfile.c =================================================================== --- dumpfile.c (revision 247902) +++ dumpfile.c (working copy) @@ -490,7 +490,7 @@ dump_start (int phase, int *flag_ptr) dfi->pstream = stream; dump_file = dfi->pstream; /* Initialize current dump flags. */ - pflags = dfi->pflags; + pflags = TDF_FLAGS (dfi->pflags); } stream = dump_open_alternate_stream (dfi); @@ -500,7 +500,7 @@ dump_start (int phase, int *flag_ptr) count++; alt_dump_file = dfi->alt_stream; /* Initialize current -fopt-info flags. */ - alt_flags = dfi->alt_flags; + alt_flags = TDF_FLAGS (dfi->alt_flags); } if (flag_ptr) @@ -682,7 +682,7 @@ dump_enable_all (int flags, const char * for (i = 0; i < m_extra_dump_files_in_use; i++) { - if (TDF_KIND (m_extra_dump_files[i].pflags) & ir_dump_type) + if (TDF_KIND (m_extra_dump_files[i].pflags) == ir_dump_type) { const char *old_filename = m_extra_dump_files[i].pfilename; m_extra_dump_files[i].pstate = -1; Index: dumpfile.h =================================================================== --- dumpfile.h (revision 247902) +++ dumpfile.h (working copy) @@ -55,6 +55,7 @@ enum tree_dump_index #define TDF_IPA 3 /* is an IPA dump */ #define TDF_KIND_MASK 3 #define TDF_KIND(X) ((X) & TDF_KIND_MASK) +#define TDF_FLAGS(X) ((X) & ~TDF_KIND_MASK) /* Bit 2 unused, available for hire. */ #define TDF_ADDRESS (1 << 3) /* dump node addresses */