From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 8FE343882047 for ; Thu, 13 Jun 2024 03:28:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8FE343882047 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 8FE343882047 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1718249299; cv=none; b=K5DiHPAcP92xI96udtzstGzZDaPYyOi1TEg/3ceivafQ2v64wFIVn8StjgD1c+P86BTultfw3ICwdNquVFz8iwkFn2HeuAw6ghs7foIOGow9P0rU9/+Kn/TX4+YFJHNeo4TUFG2Zl3wdJ16DKvVaQsJC8VeUKkR0jTxHQIAaw1E= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1718249299; c=relaxed/simple; bh=AlQTZQ1yX2FvM8an7PgIHInaQpzKInEPb7r0bZLhoXw=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=SSiIBv6GI2R++5PXGQWKBPQ+RKE/O1f5ry6veHddX7PRDg/EGMYhrIKuyOPgst0Ab++Gpd6od0lnDczmHbznje94caQWkq7Mkx83Xx5cJZe0jYwm1376mxn+XRgoFddEn55BMQk6Sk3R8vDTqZhyqpWDZ7h/rhDlFJQY7Djw/sc= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718249297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vI4qY5YlXLAE6GCo5vdHi9qo6ol6r9WKN4rBUwoKihQ=; b=cnIyCJi05zKzn7leWE3OL02aoEDzSpSnQdq++3e0RVBgs220CfPvdTRjgDc2h3TLh3Fz7E HRYQ59g2Wfs2jlZtKH/7ZJx7cZZlKsGdevr266LLxk+rJizrIs7lR16SpvziCw7LU7v970 neWDhGr1WX8r24mNEMdrwS63X0x/DRE= Received: from mail-ua1-f71.google.com (mail-ua1-f71.google.com [209.85.222.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-553-XNd0_DHgMVq8wPR3xckzJw-1; Wed, 12 Jun 2024 23:28:13 -0400 X-MC-Unique: XNd0_DHgMVq8wPR3xckzJw-1 Received: by mail-ua1-f71.google.com with SMTP id a1e0cc1a2514c-80b95845487so153009241.3 for ; Wed, 12 Jun 2024 20:28:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718249292; x=1718854092; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=vI4qY5YlXLAE6GCo5vdHi9qo6ol6r9WKN4rBUwoKihQ=; b=G8cnnhwm5xrF36lyCYLR9GQanRmUUh0tcItHmR6RNrvh5hvc6wi2unSSU7sj5lWda7 fJt/FwiRjy7H2e0SRDlq8Y00IVVX1rcnN9M/OzhvCIPaOgDZezMWx4w41m391WYWLMHk GUP8/r/elGd8YPlWhY80yiXcEtUi92R+sB/nDj+K/WNTevAytdpqPYSumAglOKcyn3a0 WZQTojdw4QBTNVXV6aTgNs9pemN/CXd9QpIrnWt5mKNSShJsBWNQL6OfrX8oKW+5xaY6 YkSurUzxUcfBHPNHqmjLASzelvnLOtJ/8+7qPLS1MovycqCYqLQaia8/ajq5REt2xF0R Eqow== X-Forwarded-Encrypted: i=1; AJvYcCWnexP9nd6Kr42qOjlNwAcLt2zUBHwJeygg9X1YlquUXKaKd5l8xRe2GSYKvZYlx2b8VZuKtKIFHC8zugL9hbJ6H0Xbki0Jrw== X-Gm-Message-State: AOJu0YzutuVFbr4qiQGlfd6zh3U2SYiQWxrw/gCBE03+XwusB6NO+LiE 8S7kTQs2BnPEZ2Ke8xIint5bGudgGYA/cySkgtUX4ZPMr6pqLIbWuB8yP2BR3TMTjmhLpQSNqzZ jqRKWCng1mOgVk40wpOzTptLkm1xtG+zhyfXEP5A0dx9HXU+N36wV/2uvl3Kvl9c= X-Received: by 2002:a67:f90a:0:b0:48c:3746:33e2 with SMTP id ada2fe7eead31-48d91dee5fdmr4272636137.14.1718249292547; Wed, 12 Jun 2024 20:28:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHmF0PmbukPlKmMlykgACHAxEcK8wnm0Clc/sqCRI9XlsJuWV0PqFevZLf4TpwnaoeIstivvw== X-Received: by 2002:a67:f90a:0:b0:48c:3746:33e2 with SMTP id ada2fe7eead31-48d91dee5fdmr4272622137.14.1718249292092; Wed, 12 Jun 2024 20:28:12 -0700 (PDT) Received: from [192.168.1.130] (130-44-146-16.s12558.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.146.16]) by smtp.gmail.com with ESMTPSA id af79cd13be357-798aacae71esm17788585a.17.2024.06.12.20.28.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 12 Jun 2024 20:28:11 -0700 (PDT) Message-ID: <8bbff3dd-ed81-4019-abef-404385f5c455@redhat.com> Date: Wed, 12 Jun 2024 23:28:11 -0400 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 1/3] Remove const char * support for asm constexpr To: Andi Kleen , gcc-patches@gcc.gnu.org References: <20240612172031.3827584-1-ak@linux.intel.com> From: Jason Merrill In-Reply-To: <20240612172031.3827584-1-ak@linux.intel.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 6/12/24 13:20, Andi Kleen wrote: > asm constexpr now only accepts the same string types as C++26 assert, > e.g. string_view and string. Adjust test suite and documentation. This patchset is all OK, thanks. > gcc/cp/ChangeLog: > > * parser.cc (cp_parser_asm_string_expression): Remove support > for const char * for asm constexpr. > > gcc/ChangeLog: > > * doc/extend.texi: Use std::string_view in asm constexpr > example. > > gcc/testsuite/ChangeLog: > > * g++.dg/cpp1z/constexpr-asm-1.C: Use std::std_string_view. > * g++.dg/cpp1z/constexpr-asm-3.C: Dito. > --- > gcc/cp/parser.cc | 7 ------- > gcc/doc/extend.texi | 3 ++- > gcc/testsuite/g++.dg/cpp1z/constexpr-asm-1.C | 12 +++++++----- > gcc/testsuite/g++.dg/cpp1z/constexpr-asm-3.C | 12 +++++++----- > 4 files changed, 16 insertions(+), 18 deletions(-) > > diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc > index de5f0483c120..98e8ca10ac40 100644 > --- a/gcc/cp/parser.cc > +++ b/gcc/cp/parser.cc > @@ -22852,13 +22852,6 @@ cp_parser_asm_string_expression (cp_parser *parser) > tree string = cp_parser_constant_expression (parser); > if (string != error_mark_node) > string = cxx_constant_value (string, tf_error); > - if (TREE_CODE (string) == NOP_EXPR) > - string = TREE_OPERAND (string, 0); > - if (TREE_CODE (string) == ADDR_EXPR > - && TREE_CODE (TREE_OPERAND (string, 0)) == STRING_CST) > - string = TREE_OPERAND (string, 0); > - if (TREE_CODE (string) == VIEW_CONVERT_EXPR) > - string = TREE_OPERAND (string, 0); > cexpr_str cstr (string); > if (!cstr.type_check (tok->location)) > return error_mark_node; > diff --git a/gcc/doc/extend.texi b/gcc/doc/extend.texi > index 17e26c5004c1..ee3644a52645 100644 > --- a/gcc/doc/extend.texi > +++ b/gcc/doc/extend.texi > @@ -10716,7 +10716,8 @@ message. Any string is converted to the character set of the source code. > When this feature is available the @code{__GXX_CONSTEXPR_ASM__} cpp symbol is defined. > > @example > -constexpr const char *genfoo() @{ return "foo"; @} > +#include > +constexpr std::string_view genfoo() @{ return "foo"; @} > > void function() > @{ > diff --git a/gcc/testsuite/g++.dg/cpp1z/constexpr-asm-1.C b/gcc/testsuite/g++.dg/cpp1z/constexpr-asm-1.C > index 7cc6b37d6208..311209acb43b 100644 > --- a/gcc/testsuite/g++.dg/cpp1z/constexpr-asm-1.C > +++ b/gcc/testsuite/g++.dg/cpp1z/constexpr-asm-1.C > @@ -1,22 +1,24 @@ > /* { dg-do compile } */ > -/* { dg-options "-std=gnu++11" } */ > +/* { dg-options "-std=gnu++17" } */ > > -constexpr const char *genfoo () > +#include > + > +constexpr std::string_view genfoo () > { > return "foo %1,%0"; > } > > -constexpr const char *genoutput () > +constexpr std::string_view genoutput () > { > return "=r"; > } > > -constexpr const char *geninput () > +constexpr std::string_view geninput () > { > return "r"; > } > > -constexpr const char *genclobber () > +constexpr std::string_view genclobber () > { > return "memory"; > } > diff --git a/gcc/testsuite/g++.dg/cpp1z/constexpr-asm-3.C b/gcc/testsuite/g++.dg/cpp1z/constexpr-asm-3.C > index d33631876bdc..ef8a35a0b3ba 100644 > --- a/gcc/testsuite/g++.dg/cpp1z/constexpr-asm-3.C > +++ b/gcc/testsuite/g++.dg/cpp1z/constexpr-asm-3.C > @@ -1,22 +1,24 @@ > /* { dg-do compile } */ > -/* { dg-options "-std=gnu++11" } */ > +/* { dg-options "-std=gnu++17" } */ > > -constexpr const char *genfoo () > +#include > + > +constexpr std::string_view genfoo () > { > return "foo %1,%0"; > } > > -constexpr const char *genoutput () > +constexpr std::string_view genoutput () > { > return "=r"; > } > > -constexpr const char *geninput () > +constexpr std::string_view geninput () > { > return "r"; > } > > -constexpr const char *genclobber () > +constexpr std::string_view genclobber () > { > return "memory"; > }