From patchwork Mon Nov 21 20:27:32 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Torvald Riegel X-Patchwork-Id: 126923 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]) by ozlabs.org (Postfix) with SMTP id CE553B7204 for ; Tue, 22 Nov 2011 07:27:52 +1100 (EST) Received: (qmail 28303 invoked by alias); 21 Nov 2011 20:27:49 -0000 Received: (qmail 28295 invoked by uid 22791); 21 Nov 2011 20:27:48 -0000 X-SWARE-Spam-Status: No, hits=-7.1 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, SPF_HELO_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 21 Nov 2011 20:27:36 +0000 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id pALKRZiq013174 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 21 Nov 2011 15:27:35 -0500 Received: from [10.36.6.232] (vpn1-6-232.ams2.redhat.com [10.36.6.232]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id pALKRXTC028350; Mon, 21 Nov 2011 15:27:34 -0500 Subject: [patch] Handle MUST_NOT_THROW_EXPR in voidify_wrapper_expr. From: Torvald Riegel To: GCC Patches Cc: Richard Henderson , Aldy Hernandez Date: Mon, 21 Nov 2011 21:27:32 +0100 Message-ID: <1321907252.12248.128.camel@triegel.csb> Mime-Version: 1.0 X-IsSubscribed: yes 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 voidify_wrapper_expr didn't handle MUST_NOT_THROW_EXPR before, but was used by the C++ side gimplify function for MUST_NOT_THROW_EXPR. Handle it like other wrappers which have the inner part in operand 0. OK for trunk? commit 9cb965d2a5cf9ca6708ee85929784982253ded7a Author: Torvald Riegel Date: Mon Nov 21 00:25:08 2011 +0100 Handle MUST_NOT_THROW_EXPR in voidify_wrapper_expr. gcc/ * gimplify.c (voidify_wrapper_expr): Handle MUST_NOT_THROW_EXPR. diff --git a/gcc/gimplify.c b/gcc/gimplify.c index cfe6696..2cd48de 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -1050,6 +1050,7 @@ voidify_wrapper_expr (tree wrapper, tree temp) case CLEANUP_POINT_EXPR: case TRY_FINALLY_EXPR: case TRY_CATCH_EXPR: + case MUST_NOT_THROW_EXPR: TREE_SIDE_EFFECTS (*p) = 1; TREE_TYPE (*p) = void_type_node; p = &TREE_OPERAND (*p, 0);