From patchwork Mon Oct 27 20:41:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Malcolm X-Patchwork-Id: 403958 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 8D896140082 for ; Tue, 28 Oct 2014 08:00:12 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:in-reply-to:references; q=dns; s= default; b=XNMbq/6aJN720YUWeDCkAVxJM5546LgmOSE0O16k3NHFheAMudXQ4 EHkF8dtyShg2FX5g4Y+PoEHw5OR0xbayz9idtavNWRG7dL8VXEhoR4dPeh3HuGsQ K5k5P4zP4HWQ2nnyh8ucJ73H4ECtphoYJHtLe8GHaMbpmvzftTbV/A= 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:from :to:cc:subject:date:message-id:in-reply-to:references; s= default; bh=a6QrtxXOvQ4gv0SlMERCy/3OTzs=; b=dRghAGD+X2PWOyYe0yPp Tyk/9GRSIeBGHQll7BmbEQHxnO1U0fXrOgo1GFycxtZQ4YdvB0sBDLVjBEwJOStE lvPqhz6S8uhfO/MuXM4p66aLHgrKdBPWcG9/tgtgASRAMcQH1vfzf6WZ6Xucd2bW eZbw84ObF6Ay+zXajLHT1ac= Received: (qmail 31145 invoked by alias); 27 Oct 2014 20:56:00 -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 31070 invoked by uid 89); 27 Oct 2014 20:55:59 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL, BAYES_00 autolearn=ham version=3.3.2 X-HELO: eggs.gnu.org Received: from eggs.gnu.org (HELO eggs.gnu.org) (208.118.235.92) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Mon, 27 Oct 2014 20:55:58 +0000 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xir1l-00086e-9V for gcc-patches@gcc.gnu.org; Mon, 27 Oct 2014 16:36:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41570) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xir1l-00086P-1C for gcc-patches@gcc.gnu.org; Mon, 27 Oct 2014 16:36:33 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s9RKZW30004620 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 27 Oct 2014 16:35:32 -0400 Received: from c64.redhat.com (vpn-236-51.phx2.redhat.com [10.3.236.51]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s9RKYt5k021050; Mon, 27 Oct 2014 16:35:32 -0400 From: David Malcolm To: gcc-patches@gcc.gnu.org Cc: David Malcolm Subject: [gimple-classes, committed 62/92] Concretize gimple_try_set_catch_is_cleanup Date: Mon, 27 Oct 2014 16:41:00 -0400 Message-Id: <1414442490-14841-63-git-send-email-dmalcolm@redhat.com> In-Reply-To: <1414442490-14841-1-git-send-email-dmalcolm@redhat.com> References: <1414442490-14841-1-git-send-email-dmalcolm@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 X-IsSubscribed: yes This corresponds to: [PATCH 64/89] Concretize gimple_try_set_catch_is_cleanup https://gcc.gnu.org/ml/gcc-patches/2014-04/msg01181.html from the original 89-patch kit That earlier patch was approved by Jeff: > OK after prerequisites have gone in. in https://gcc.gnu.org/ml/gcc-patches/2014-05/msg00818.html gcc/ * gimple.h (gimple_try_set_catch_is_cleanup): Require a gimple_try. * gimplify.c (gimplify_expr): Convert local "try_" from a gimple to a gimple_try. --- gcc/ChangeLog.gimple-classes | 9 +++++++++ gcc/gimple.h | 2 +- gcc/gimplify.c | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog.gimple-classes b/gcc/ChangeLog.gimple-classes index ba0f5c1..b874697 100644 --- a/gcc/ChangeLog.gimple-classes +++ b/gcc/ChangeLog.gimple-classes @@ -1,5 +1,14 @@ 2014-10-24 David Malcolm + Concretize gimple_try_set_catch_is_cleanup + + * gimple.h (gimple_try_set_catch_is_cleanup): Require a gimple_try. + + * gimplify.c (gimplify_expr): Convert local "try_" from a gimple + to a gimple_try. + +2014-10-24 David Malcolm + Concretize gimple_eh_filter_set_types and gimple_eh_filter_set_failure * gimple.h (gimple_eh_filter_set_types): Require a gimple_eh_filter. diff --git a/gcc/gimple.h b/gcc/gimple.h index 79ee8ba..990e90d 100644 --- a/gcc/gimple.h +++ b/gcc/gimple.h @@ -3775,7 +3775,7 @@ gimple_try_cleanup (gimple gs) /* Set the GIMPLE_TRY_CATCH_IS_CLEANUP flag. */ static inline void -gimple_try_set_catch_is_cleanup (gimple g, bool catch_is_cleanup) +gimple_try_set_catch_is_cleanup (gimple_try g, bool catch_is_cleanup) { gcc_gimple_checking_assert (gimple_try_kind (g) == GIMPLE_TRY_CATCH); if (catch_is_cleanup) diff --git a/gcc/gimplify.c b/gcc/gimplify.c index e3da6ae..b49aab7 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -7993,7 +7993,7 @@ gimplify_expr (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p, case TRY_CATCH_EXPR: { gimple_seq eval, cleanup; - gimple try_; + gimple_try try_; /* Calls to destructors are generated automatically in FINALLY/CATCH block. They should have location as UNKNOWN_LOCATION. However,