From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by sourceware.org (Postfix) with ESMTPS id 2F3A63858D32; Mon, 9 Oct 2023 05:07:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2F3A63858D32 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ed1-x52b.google.com with SMTP id 4fb4d7f45d1cf-533df112914so6826850a12.0; Sun, 08 Oct 2023 22:07:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696828023; x=1697432823; darn=gcc.gnu.org; h=in-reply-to:from:content-language:references:cc:to:subject :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=Y1dseJTiAQRmR427t5xX/NNUlvyfeBQeedJZ26vfEdY=; b=KpBt5yLDLHQ0ODPNCWJzjOPEB7TZnIAB8jX2gIwPplpE5eQEk2Ubg5I4elSZdsZmyR hfR1mKnUeN8qhz+9BgY3AQDXpLziTGX6OXTjwBczJqB+mbJoEe6tcVaxRnKPcUJekk/8 m++H0avVthzKOmqTqelrxqnbMgT6ManzIce8humETBQGDN92iqNx284s+3jXN5nzpyzd rdmdvql2racqdyCSp2g9a+KVruOgmps5fS+FhUW37CdoqlmuBXkzt99I+HiNQ4TnuYsW uXTkiiNi/yX1ZJFOGTs78lpVkmzlYiLnDuwZw7nfVMDstJJN5OfcztRK76ash5qT1BZ7 VdLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696828023; x=1697432823; h=in-reply-to:from:content-language:references:cc:to:subject :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=Y1dseJTiAQRmR427t5xX/NNUlvyfeBQeedJZ26vfEdY=; b=jO6TVT1r4nAJH9u5jrqis8JNYsltg7FQvvTzYQqnBcYw28n44epbdh8n7zSXWlyYRe xa5kyeuKnIGYSyzo/H57RvZmCX40K5XswhVdzRXqbxrQlHaX2zlePcnkHR8ELSKkMuCq REnWLsHkI6MsZECqtYQMyX2vcOVcFGpRzL9eKvfQ3BeCgQgdm1iwBKlc7SiNU6sDfmLc 5U38RcSQK8MApxuqLACi+Gaj01vQWVBS6/g+prmoh5fuyW/rJSrbO85+wmV11+Xwuhx5 4mdUgjjiSJx7EEJyU7Be+VwQsI6BIf8DL4Z3ZMvlOxBRmrE2GXHFxjdTvhSv/emoFC+Q SIzQ== X-Gm-Message-State: AOJu0Yxo73xEijV01rIBLABJ4jIQoQIFV1z2IMGjZivHYElhT+gS8+pH Ts/aI+SGIsOJnSPs92SIme8= X-Google-Smtp-Source: AGHT+IGMdusQrZn/W5bN0g83npgy392NZGEAIPDLZ6qJMrjoy6k8E4coFAgfUlIpwnZcT+Q5xhfv7Q== X-Received: by 2002:a17:907:720b:b0:9a1:f4e8:87b9 with SMTP id dr11-20020a170907720b00b009a1f4e887b9mr15469448ejc.45.1696828022614; Sun, 08 Oct 2023 22:07:02 -0700 (PDT) Received: from [10.16.0.78] ([89.207.171.98]) by smtp.gmail.com with ESMTPSA id b16-20020adfe650000000b003266ece0fe2sm8293887wrn.98.2023.10.08.22.07.01 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 08 Oct 2023 22:07:01 -0700 (PDT) Content-Type: multipart/mixed; boundary="------------WZYd8WOjJtaxMFGSsQj6iiZV" Message-ID: Date: Mon, 9 Oct 2023 07:06:59 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH][_GLIBCXX_INLINE_VERSION] Fix To: Iain Sandoe Cc: Jonathan Wakely , libstdc++ , GCC Patches References: <55f0212a-f8d3-aa9e-8788-f5165484ac6c@gmail.com> <520bd324-39e8-45e0-a367-3d1195c1807f@gmail.com> <9C6DC8AF-8F62-41F7-B3A5-A2D1B2E201FC@googlemail.com> Content-Language: en-US From: =?UTF-8?Q?Fran=C3=A7ois_Dumont?= In-Reply-To: <9C6DC8AF-8F62-41F7-B3A5-A2D1B2E201FC@googlemail.com> X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP 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: This is a multi-part message in MIME format. --------------WZYd8WOjJtaxMFGSsQj6iiZV Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit I think we can do the same without the symbol alias feature. It's even simpler cause do not require any maintenance when version symbol bump. Here is what I'm testing, at least exported symbol is fine. François On 08/10/2023 16:06, Iain Sandoe wrote: > Hi François, > >> On 21 Sep 2023, at 05:41, François Dumont wrote: >> >> Tests were successful, ok to commit ? >> >> On 20/09/2023 19:51, François Dumont wrote: >>> libstdc++: [_GLIBCXX_INLINE_VERSION] Add handle_contract_violation symbol alias >>> >>> libstdc++-v3/ChangeLog: >>> >>> * src/experimental/contract.cc >>> [_GLIBCXX_INLINE_VERSION](handle_contract_violation): Provide symbol alias >>> without version namespace decoration for gcc. > This does not work in the source on targets without support for symbol aliases (Darwin is one) > “../experimental/contract.cc:79:8: warning: alias definitions not supported in Mach-O; ignored” > > - there might be a way to do it at link-time (for one symbol not too bad); I will have to poke at > it a bit. > Iain > >>> Here is what I'm testing eventually, ok to commit if successful ? >>> >>> François >>> >>> On 20/09/2023 11:32, Jonathan Wakely wrote: >>>> On Wed, 20 Sept 2023 at 05:51, François Dumont via Libstdc++ >>>> wrote: >>>>> libstdc++: Remove std::constract_violation from versioned namespace >>>> Spelling mistake in contract_violation, and it's not >>>> std::contract_violation, it's std::experimental::contract_violation >>>> >>>>> GCC expects this type to be in std namespace directly. >>>> Again, it's in std::experimental not in std directly. >>>> >>>> Will this change cause problems when including another experimental >>>> header, which does put experimental below std::__8? >>>> >>>> I think std::__8::experimental and std::experimental will become ambiguous. >>>> >>>> Maybe we do want to remove the inline __8 namespace from all >>>> experimental headers. That needs a bit more thought though. >>>> >>>>> libstdc++-v3/ChangeLog: >>>>> >>>>> * include/experimental/contract: >>>>> Remove _GLIBCXX_BEGIN_NAMESPACE_VERSION/_GLIBCXX_END_NAMESPACE_VERSION. >>>> This line is too long for the changelog. >>>> >>>>> It does fix 29 g++.dg/contracts in gcc testsuite. >>>>> >>>>> Ok to commit ? >>>>> >>>>> François --------------WZYd8WOjJtaxMFGSsQj6iiZV Content-Type: text/x-patch; charset=UTF-8; name="contract.patch" Content-Disposition: attachment; filename="contract.patch" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL2xpYnN0ZGMrKy12My9zcmMvZXhwZXJpbWVudGFsL2NvbnRyYWN0LmNj IGIvbGlic3RkYysrLXYzL3NyYy9leHBlcmltZW50YWwvY29udHJhY3QuY2MKaW5kZXggNTA0 YTZjMDQxZjEuLjc5MThlNWFlNTNhIDEwMDY0NAotLS0gYS9saWJzdGRjKystdjMvc3JjL2V4 cGVyaW1lbnRhbC9jb250cmFjdC5jYworKysgYi9saWJzdGRjKystdjMvc3JjL2V4cGVyaW1l bnRhbC9jb250cmFjdC5jYwpAQCAtNjcsMyArNjcsMTIgQEAgaGFuZGxlX2NvbnRyYWN0X3Zp b2xhdGlvbiAoY29uc3Qgc3RkOjpleHBlcmltZW50YWw6OmNvbnRyYWN0X3Zpb2xhdGlvbiAm dmlvbGF0aW8KICAgc3RkOjpjZXJyIDw8IHN0ZDo6ZW5kbDsKICNlbmRpZgogfQorCisjaWYg X0dMSUJDWFhfSU5MSU5FX1ZFUlNJT04KKy8vIFByb3ZpZGUgc3ltYm9sIHdpdGhvdXQgdmVy c2lvbiBuYW1lc3BhY2UgZGVjb3JhdGlvbiBmb3IgZ2NjLgorZXh0ZXJuICJDIgorX19hdHRy aWJ1dGVfXyAoKHdlYWspKSB2b2lkCitfWjI1aGFuZGxlX2NvbnRyYWN0X3Zpb2xhdGlvblJL TlN0MTJleHBlcmltZW50YWwxOGNvbnRyYWN0X3Zpb2xhdGlvbkUKKyhjb25zdCBzdGQ6OmV4 cGVyaW1lbnRhbDo6Y29udHJhY3RfdmlvbGF0aW9uICZ2aW9sYXRpb24pCit7IGhhbmRsZV9j b250cmFjdF92aW9sYXRpb24odmlvbGF0aW9uKTsgfQorI2VuZGlmCg== --------------WZYd8WOjJtaxMFGSsQj6iiZV--