From patchwork Wed Jun 28 12:52:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?RnJhbmtsaW4g4oCcU25haXBl4oCdIE1hdGhpZXU=?= X-Patchwork-Id: 781668 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 3wyN3w2cMhz9ryQ for ; Wed, 28 Jun 2017 22:52:28 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="rNGfKtm1"; 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:from :to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; q=dns; s=default; b=fAZhgCgV9qY1aQ/S bGx3ZTIHMWBBe6eEMjXV5YwynWl6OI8+bGqXkko84X8zGli7sXVn+gqILsoe5U0w ypxXA/i9+c9tlQCSJLPlVAFjStuQLt+J4CR4Au4Dd3TMSVBQqpwTi0bYe+NXqWwO x5zbrlWDMPyJbmn9R7tgFLQxaCY= 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 :content-transfer-encoding; s=default; bh=xHqG46CFSwPcsCpj8YJQmG g9JXI=; b=rNGfKtm1Pdoi7O6u+0ex6RU+a6hky32Y335TK4vKxIT+1/uaVLLWSG s3gQf2AzQvIO22iYE52GzX1cMzWf/vGcwRpSY8TXVEiQ4RPvUrp9A9naLPh80jfT K5wBMLQ4wsBKaR/Ig56yjpCogTp/xY+ox5kBor08MJlMww/Gg6apQ= Received: (qmail 87344 invoked by alias); 28 Jun 2017 12:52:21 -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 87323 invoked by uid 89); 28 Jun 2017 12:52:20 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail-wm0-f54.google.com Received: from mail-wm0-f54.google.com (HELO mail-wm0-f54.google.com) (74.125.82.54) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 28 Jun 2017 12:52:19 +0000 Received: by mail-wm0-f54.google.com with SMTP id i127so57787112wma.0 for ; Wed, 28 Jun 2017 05:52:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=HI1G3uYCYhGc18l+B+yHvRuy0rubhGNNf6jM2vIZ6NM=; b=uGTofJtzsJBJR6QAeTn4QjwAsMsw37SE6Q/yxiMk1ShySb+0U4T+7xRepGFlT499uc h+I4boN8AQD11vNqfr8p850CiVqhh7HHnNTBUZSNRgAKS7vWuhbN5bgJaFtCkLo3HiHE tjs7Jd41bfKbdhLYETvcNMxIkdvNrIWAmbEyVVm3fbwBMESYvAsoPjXp0h4nfCplEht4 6TZpNah08WJwtIVWCKj+jFAvZb54V4kvLDiA4WH3YdvUV9x7g/UKw9bynuhI0oadaJKk gP4XldiTMwDYb80VNpv0s0FV0NlVQl6A/Y5fM33z1vs0gwAr3xqjCOuUZZtJoKdR1OWj irjQ== X-Gm-Message-State: AKS2vOyNGxQBPKBPsV0ick/EKbqF0iMIKHgZD0bx6mn+SeZoT9fljiCN vM97qbyBhzk8MFzyEadoGg== X-Received: by 10.80.163.150 with SMTP id s22mr7744914edb.18.1498654337252; Wed, 28 Jun 2017 05:52:17 -0700 (PDT) Received: from snaipe-arista.ire.aristanetworks.com ([217.173.96.166]) by smtp.gmail.com with ESMTPSA id c27sm1192648ede.32.2017.06.28.05.52.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Jun 2017 05:52:16 -0700 (PDT) From: Franklin Snaipe Mathieu To: snaipe@arista.com, gcc-patches@gcc.gnu.org Cc: "Franklin \"Snaipe\" Mathieu" Subject: [PATCH v1] cxx: Make __func__, __FUNCTION__, and __PRETTY_FUNCTION__ constexpr. Date: Wed, 28 Jun 2017 13:52:14 +0100 Message-Id: <20170628125214.23283-1-snaipe@arista.com> MIME-Version: 1.0 From: "Franklin \"Snaipe\" Mathieu" This patch makes the forementioned definitions `contexpr` when compiling C++11 and above with GNU extensions. gcc/cp/ChangeLog: 2017-06-27 Franklin “Snaipe” Mathieu PR c++/66639 * decl.c (cp_make_fname_decl): Make declaration constexpr. gcc/testsuite/ChangeLog: 2017-06-27 Franklin “Snaipe” Mathieu PR c++/66639 * g++.dg/pr66639.c: New test. --- gcc/cp/decl.c | 5 +++++ gcc/testsuite/g++.dg/pr66639.C | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 gcc/testsuite/g++.dg/pr66639.C diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 8e9a466..740ab71 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -4384,6 +4384,11 @@ cp_make_fname_decl (location_t loc, tree id, int type_dep) TREE_READONLY (decl) = 1; DECL_ARTIFICIAL (decl) = 1; + /* extension: declare __func__, __FUNCTION__, and __PRETTY_FUNCTION__ as + constexpr. */ + if (!flag_iso && cxx_dialect >= cxx11) + DECL_DECLARED_CONSTEXPR_P (decl) = 1; + TREE_USED (decl) = 1; if (current_function_decl) diff --git a/gcc/testsuite/g++.dg/pr66639.C b/gcc/testsuite/g++.dg/pr66639.C new file mode 100644 index 0000000..51a92f9 --- /dev/null +++ b/gcc/testsuite/g++.dg/pr66639.C @@ -0,0 +1,19 @@ +// PR c++/66639 +// { dg-do compile { target c++11 } } +// { dg-options "" } + +constexpr bool +streq(char const *lhs, char const *rhs) +{ + return *lhs && *rhs + ? *lhs == *rhs && streq(lhs + 1, rhs + 1) + : !*lhs && !*rhs; +} + +int +main() +{ + static_assert (streq(__func__, "main"), ""); + static_assert (streq(__FUNCTION__, "main"), ""); + static_assert (streq(__PRETTY_FUNCTION__, "int main()"), ""); +}