From patchwork Fri May 24 14:16:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 246163 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 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "localhost", Issuer "www.qmailtoaster.com" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 23CD92C0040 for ; Sat, 25 May 2013 00:16:12 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:subject:content-type; q= dns; s=default; b=VBJpHXUnx1leXo0A1QptqkRPYQmmiOwCKF9v/Ce0g/c2kE 3jgWKWur+zI+9gkweTRYL1fAWxjiSrkJ06LOolVXlFjEsJprWrRT70q9I5UJxBEq 3DOXGIQCy6gVSxvezVd9goDfpinSFVpnFSVi5BnXZr3joS7jdEHAsmQImv85Y= 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 :message-id:date:from:mime-version:to:subject:content-type; s= default; bh=BkfTkQ0fbrxnM/ZPj19+1WyxcAE=; b=Ad6aaupweZ2U4SY2wJOW fdg3S8NSRgtb7tklP+tHvHey1r7ONScBsmrpoZcFscQDFIAcEU+6n2HtQk0P1peG uarS3hgeJWmfgUbrZrNmOPX8eg30kSTzxmvO839J2CJJqGjJf4YAqZsESyICAhcG kROucFdhSjXfq5ggvYOwbO0= Received: (qmail 9606 invoked by alias); 24 May 2013 14:16:05 -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 9587 invoked by uid 89); 24 May 2013 14:16:05 -0000 X-Spam-SWARE-Status: No, score=-6.9 required=5.0 tests=AWL, BAYES_00, RCVD_IN_HOSTKARMA_W, RCVD_IN_HOSTKARMA_WL, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.1 Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Fri, 24 May 2013 14:16:04 +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 (8.14.4/8.14.4) with ESMTP id r4OEG35n005872 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 24 May 2013 10:16:03 -0400 Received: from [10.3.113.91] (ovpn-113-91.phx2.redhat.com [10.3.113.91]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r4OEG2vb001383; Fri, 24 May 2013 10:16:03 -0400 Message-ID: <519F7622.1050509@redhat.com> Date: Fri, 24 May 2013 10:16:02 -0400 From: Jason Merrill User-Agent: Mozilla/5.0 (X11; Linux i686; rv:23.0) Gecko/20100101 Thunderbird/23.0a2 MIME-Version: 1.0 To: David Edelsohn , gcc-patches List Subject: C++ PATCH for c++/57391 (bootstrap fail on AIX) X-Virus-Found: No When FMA_EXPR was added to potential_constant_expression_1, it wasn't added to cxx_eval_constant_expression at the same time... Regression tested x86_64-pc-linux-gnu, applying to trunk. David, can you verify that this fixes bootstrap on AIX? commit a78fee4d0a9c2a353637f239c6ac189227248491 Author: Jason Merrill Date: Fri May 24 09:52:10 2013 -0400 PR c++/57391 * semantics.c (cxx_eval_constant_expression): Handle FMA_EXPR. (cxx_eval_trinary_expression): Rename from cxx_eval_vec_perm_expr. diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index c115d23..c1385c1 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -7776,37 +7776,32 @@ non_const_var_error (tree r) } } -/* Evaluate VEC_PERM_EXPR (v1, v2, mask). */ +/* Subroutine of cxx_eval_constant_expression. + Like cxx_eval_unary_expression, except for trinary expressions. */ + static tree -cxx_eval_vec_perm_expr (const constexpr_call *call, tree t, - bool allow_non_constant, bool addr, - bool *non_constant_p, bool *overflow_p) +cxx_eval_trinary_expression (const constexpr_call *call, tree t, + bool allow_non_constant, bool addr, + bool *non_constant_p, bool *overflow_p) { int i; tree args[3]; tree val; - tree elttype = TREE_TYPE (t); for (i = 0; i < 3; i++) { args[i] = cxx_eval_constant_expression (call, TREE_OPERAND (t, i), allow_non_constant, addr, non_constant_p, overflow_p); - if (*non_constant_p) - goto fail; + VERIFY_CONSTANT (args[i]); } - gcc_assert (TREE_CODE (TREE_TYPE (args[0])) == VECTOR_TYPE); - gcc_assert (TREE_CODE (TREE_TYPE (args[1])) == VECTOR_TYPE); - gcc_assert (TREE_CODE (TREE_TYPE (args[2])) == VECTOR_TYPE); - - val = fold_ternary_loc (EXPR_LOCATION (t), VEC_PERM_EXPR, elttype, + val = fold_ternary_loc (EXPR_LOCATION (t), TREE_CODE (t), TREE_TYPE (t), args[0], args[1], args[2]); - if (val != NULL_TREE) - return val; - - fail: - return t; + if (val == NULL_TREE) + return t; + VERIFY_CONSTANT (val); + return val; } /* Attempt to reduce the expression T to a constant value. @@ -8106,9 +8101,10 @@ cxx_eval_constant_expression (const constexpr_call *call, tree t, non_constant_p, overflow_p); break; + case FMA_EXPR: case VEC_PERM_EXPR: - r = cxx_eval_vec_perm_expr (call, t, allow_non_constant, addr, - non_constant_p, overflow_p); + r = cxx_eval_trinary_expression (call, t, allow_non_constant, addr, + non_constant_p, overflow_p); break; case CONVERT_EXPR: