From patchwork Thu Mar 10 15:08:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Polacek X-Patchwork-Id: 595815 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 751F71401CD for ; Fri, 11 Mar 2016 02:08:23 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=Mcz6Hrt8; 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:date :from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; q=dns; s=default; b=NKE4s8i9jM8621XLh aiVwZKAiBe4LP7nA2FufWUtw66nIMT3iODbVbaQ73mAJqnjFui1Q52YYiYSDpjm2 107fb36mA+aM3QymYZzpLWLTj5Uxc6b/BbbLuen2pOcg/ouKbiSxXGeyz7zoG/3D +BDoZ6+C6OykXGo+2tEp813qD4= 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:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=default; bh=oCOr5QZfcUQtKCxHmPmpcaU 11aM=; b=Mcz6Hrt8JfVmH2UHvRMbg6SduL0DIwJFi8MrwWbq1xKDDDS5CL2j4e1 2qEtTXYKNNUyqXWmSX73dWTPBUfABFKA1SABAsrN44mCmfBctRxzCCL2KXPyoAaB RVW9Bw4nZh+LrgAdZUyUELSfb4uXdKqZNVz/xudVWrcNhfasCL0E= Received: (qmail 85288 invoked by alias); 10 Mar 2016 15:08:13 -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 85278 invoked by uid 89); 10 Mar 2016 15:08:13 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=Final, cp_fold_rvalue 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 (AES256-GCM-SHA384 encrypted) ESMTPS; Thu, 10 Mar 2016 15:08:10 +0000 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 (Postfix) with ESMTPS id B194DD4786 for ; Thu, 10 Mar 2016 15:08:09 +0000 (UTC) Received: from redhat.com (ovpn-204-101.brq.redhat.com [10.40.204.101]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u2AF86gj013346 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 10 Mar 2016 10:08:08 -0500 Date: Thu, 10 Mar 2016 16:08:05 +0100 From: Marek Polacek To: Jason Merrill Cc: Jakub Jelinek , GCC Patches Subject: Re: C++ PATCH for c++/70153 (unhandled UNARY_PLUS_EXPR causes stack overflow) Message-ID: <20160310150805.GZ10006@redhat.com> References: <20160310124645.GW10006@redhat.com> <20160310125641.GU3017@tucnak.redhat.com> <20160310130702.GX10006@redhat.com> <56E185E9.6040609@redhat.com> <20160310145333.GY10006@redhat.com> <56E18BBB.6030202@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <56E18BBB.6030202@redhat.com> User-Agent: Mutt/1.5.24 (2015-08-30) On Thu, Mar 10, 2016 at 09:59:07AM -0500, Jason Merrill wrote: > On 03/10/2016 09:53 AM, Marek Polacek wrote: > >+ case UNARY_PLUS_EXPR: > >+ op0 = cp_fold_maybe_rvalue (TREE_OPERAND (x, 0), rval_ops); > > You can just use cp_fold_rvalue here. OK with that change. Thanks. Final patch I'm about to install: 2016-03-10 Marek Polacek PR c++/70153 * cp-gimplify.c (cp_fold): Handle UNARY_PLUS_EXPR. * g++.dg/delayedfold/unary-plus1.C: New test. Marek diff --git gcc/cp/cp-gimplify.c gcc/cp/cp-gimplify.c index 6af3760..6a767fa 100644 --- gcc/cp/cp-gimplify.c +++ gcc/cp/cp-gimplify.c @@ -1996,7 +1996,6 @@ cp_fold (tree x) case BIT_NOT_EXPR: case TRUTH_NOT_EXPR: case FIXED_CONVERT_EXPR: - case UNARY_PLUS_EXPR: case INDIRECT_REF: loc = EXPR_LOCATION (x); @@ -2016,6 +2015,14 @@ cp_fold (tree x) || !VOID_TYPE_P (TREE_TYPE (TREE_OPERAND (x, 0)))); break; + case UNARY_PLUS_EXPR: + op0 = cp_fold_rvalue (TREE_OPERAND (x, 0)); + if (op0 == error_mark_node) + x = error_mark_node; + else + x = fold_convert (TREE_TYPE (x), op0); + break; + case POSTDECREMENT_EXPR: case POSTINCREMENT_EXPR: case INIT_EXPR: diff --git gcc/testsuite/g++.dg/delayedfold/unary-plus1.C gcc/testsuite/g++.dg/delayedfold/unary-plus1.C index e69de29..ebf3493 100644 --- gcc/testsuite/g++.dg/delayedfold/unary-plus1.C +++ gcc/testsuite/g++.dg/delayedfold/unary-plus1.C @@ -0,0 +1,22 @@ +// PR c++/70153 +// { dg-do run } + +unsigned long long int +fn1 (unsigned long long int i) +{ + return 2ULL * ((1 + (unsigned long int) +1) * i); +} + +unsigned long long int +fn2 (unsigned long long int i) +{ + return 2ULL * ((1 + (unsigned long int) +(1 + 0)) * i); +} + +int +main (void) +{ + if (fn1 (3ULL) != 12ULL + || fn2 (3ULL) != 12ULL) + __builtin_abort (); +}