From patchwork Fri Mar 23 15:27:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Oliva X-Patchwork-Id: 890028 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-475371-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="OVLqxG8V"; 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 4077493Qyyz9s0R for ; Sat, 24 Mar 2018 02:38:38 +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:mime-version:content-type; q=dns; s=default; b=DRTYaRLbn9K+O6EP9I217kp/oVQiKwgcJUV+JWx7KG/hwV+kfI mNZ1K+ibTLrHmsWAAHk9oxAZ+b0YOmK24VLZHK5e9GtrvNtGsYcG7oq+cf+Ynbb8 BpdrGeM9HUsZ12z0RasVXMW04zSiioMhVb+IxSHnAD4htpf5H3tZ2qcls= 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:mime-version:content-type; s= default; bh=x7/NVvYUYEn52vOazfMtUrr1QWM=; b=OVLqxG8V1qdD0Im3//VO TejIx31cV/+MWS51APB8NPe2yODDza8JKCZ/wRLZJaRLUhdUKuplg63bbGtPmr/n 8QbXSNmwp9ePqQt2oWSisglUIw/qxPuMDi+aavqkwD8LtmGcuOk71bzabbJEEz2V vEIm7TC/dHXo5hdExdkQNgE= Received: (qmail 113000 invoked by alias); 23 Mar 2018 15:38:31 -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 112956 invoked by uid 89); 23 Mar 2018 15:38:31 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=specifications X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 23 Mar 2018 15:38:30 +0000 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 09A5826AC56; Fri, 23 Mar 2018 15:38:29 +0000 (UTC) Received: from free.home (ovpn04.gateway.prod.ext.phx2.redhat.com [10.5.9.4]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 618A817B9F; Fri, 23 Mar 2018 15:38:11 +0000 (UTC) Received: from livre (livre.home [172.31.160.2]) by free.home (8.15.2/8.15.2) with ESMTP id w2NFRC7b384312; Fri, 23 Mar 2018 12:27:12 -0300 From: Alexandre Oliva To: gcc-patches@gcc.gnu.org Cc: jason@redhat.com, nathan@acm.org Subject: [PATCH] [PR c++/84968] reject stmt-exprs in noexcept constexprs Date: Fri, 23 Mar 2018 12:27:10 -0300 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 We reject extended statement-expressions in template parameters, so we might as well reject them in constant expressions used in noexcept specifications. Regstrapped on i686- and x86_64-linux-gnu. Ok to install? for gcc/cp/ChangeLog PR c++/84968 * tree.c (strip_typedefs_expr): Reject STATEMENT_LISTs. for gcc/testsuite/ChangeLog PR c++/84968 * g++.dg/eh/pr84968.C: New. --- gcc/cp/tree.c | 4 ++++ gcc/testsuite/g++.dg/eh/pr84968.C | 15 +++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 gcc/testsuite/g++.dg/eh/pr84968.C diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index f1a90bdec0fc..070bd11a0591 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -1785,6 +1785,10 @@ strip_typedefs_expr (tree t, bool *remove_attributes) error ("lambda-expression in a constant expression"); return error_mark_node; + case STATEMENT_LIST: + error ("statement-expression in a constant expression"); + return error_mark_node; + default: break; } diff --git a/gcc/testsuite/g++.dg/eh/pr84968.C b/gcc/testsuite/g++.dg/eh/pr84968.C new file mode 100644 index 000000000000..23c49f477a88 --- /dev/null +++ b/gcc/testsuite/g++.dg/eh/pr84968.C @@ -0,0 +1,15 @@ +// { dg-do compile { target c++11 } } + +// { dg-options "" } + +union b; + +struct S { + template + void a() + try { + } catch (int () + noexcept (({ union b a; true; }))) // { dg-error "constant" } + { + } +};