Started by user snail Running as SYSTEM [EnvInject] - Loading node environment variables. Building remotely on docker-jenkins-agent in workspace /home/jenkins/agent/workspace/gcc-patch [WS-CLEANUP] Deleting project workspace... [WS-CLEANUP] Deferred wipeout is used... [WS-CLEANUP] Done The recommended git tool is: NONE using credential 0adb5fc7-caa2-429d-97d2-c7fa2fa1d884 Cloning the remote Git repository Using shallow clone with depth 1 Avoid fetching tags Cloning repository git@github.com:wangliu-iscas/gcc-patch.git/ > git init /home/jenkins/agent/workspace/gcc-patch # timeout=10 Fetching upstream changes from git@github.com:wangliu-iscas/gcc-patch.git/ > git --version # timeout=10 > git --version # 'git version 2.37.2' using GIT_SSH to set credentials patchwork github wangliu-iscas git ssh key Verifying host key using known hosts file, will automatically accept unseen keys > git fetch --no-tags --force --progress --depth=1 -- git@github.com:wangliu-iscas/gcc-patch.git/ +refs/heads/*:refs/remotes/origin/* # timeout=10 > git config remote.origin.url git@github.com:wangliu-iscas/gcc-patch.git/ # timeout=10 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10 Avoid second fetch > git rev-parse refs/remotes/origin/master^{commit} # timeout=10 Checking out Revision baeec7cc83b19b46d1c73523f06efa7ea2b30390 (refs/remotes/origin/master) > git config core.sparsecheckout # timeout=10 > git checkout -f baeec7cc83b19b46d1c73523f06efa7ea2b30390 # timeout=10 Commit message: "Daily bump." > git rev-list --no-walk baeec7cc83b19b46d1c73523f06efa7ea2b30390 # timeout=10 [EnvInject] - Mask passwords that will be passed as build parameters. [EnvInject] - Executing scripts and injecting environment variables after the SCM step. [EnvInject] - Injecting as environment variables the properties content GITHUB_REPO=https://github.com/wangliu-iscas/ PATCHWORK_URL=https://patchwork.plctlab.org [EnvInject] - Variables injected successfully. [gcc-patch] $ /usr/bin/env bash /tmp/jenkins16354227346916867204.sh + git config pull.rebase false + git fetch origin master From github.com:wangliu-iscas/gcc-patch * branch master -> FETCH_HEAD + git checkout master Switched to a new branch 'master' branch 'master' set up to track 'origin/master'. + git pull origin master From github.com:wangliu-iscas/gcc-patch * branch master -> FETCH_HEAD Already up to date. + git fetch origin upstream-master From github.com:wangliu-iscas/gcc-patch * branch upstream-master -> FETCH_HEAD + git checkout upstream-master Switched to a new branch 'upstream-master' branch 'upstream-master' set up to track 'origin/upstream-master'. + git remote add upstream https://github.com/gcc-mirror/gcc.git + git pull upstream master From https://github.com/gcc-mirror/gcc * branch master -> FETCH_HEAD * [new branch] master -> upstream/master Updating baeec7cc8..030a08c85 Fast-forward libstdc++-v3/include/bits/charconv.h | 4 +- libstdc++-v3/include/bits/stl_map.h | 2 +- libstdc++-v3/include/bits/stl_pair.h | 3 - libstdc++-v3/include/bits/uses_allocator_args.h | 2 +- libstdc++-v3/include/std/charconv | 41 +++-- libstdc++-v3/include/std/version | 1 + libstdc++-v3/src/c++11/debug.cc | 16 +- .../testsuite/20_util/from_chars/constexpr.cc | 57 +++++++ .../testsuite/20_util/to_chars/constexpr.cc | 172 +++++++++++++++++++++ libstdc++-v3/testsuite/20_util/to_chars/version.cc | 16 ++ .../testsuite/20_util/uses_allocator/lwg3677.cc | 52 +++++++ 11 files changed, 337 insertions(+), 29 deletions(-) create mode 100644 libstdc++-v3/testsuite/20_util/from_chars/constexpr.cc create mode 100644 libstdc++-v3/testsuite/20_util/to_chars/constexpr.cc create mode 100644 libstdc++-v3/testsuite/20_util/to_chars/version.cc create mode 100644 libstdc++-v3/testsuite/20_util/uses_allocator/lwg3677.cc + git push -u origin upstream-master To github.com:wangliu-iscas/gcc-patch.git/ baeec7cc8..030a08c85 upstream-master -> upstream-master branch 'upstream-master' set up to track 'origin/upstream-master'. + git checkout master Switched to branch 'master' Your branch is up to date with 'origin/master'. + git merge upstream-master Updating baeec7cc8..030a08c85 Fast-forward libstdc++-v3/include/bits/charconv.h | 4 +- libstdc++-v3/include/bits/stl_map.h | 2 +- libstdc++-v3/include/bits/stl_pair.h | 3 - libstdc++-v3/include/bits/uses_allocator_args.h | 2 +- libstdc++-v3/include/std/charconv | 41 +++-- libstdc++-v3/include/std/version | 1 + libstdc++-v3/src/c++11/debug.cc | 16 +- .../testsuite/20_util/from_chars/constexpr.cc | 57 +++++++ .../testsuite/20_util/to_chars/constexpr.cc | 172 +++++++++++++++++++++ libstdc++-v3/testsuite/20_util/to_chars/version.cc | 16 ++ .../testsuite/20_util/uses_allocator/lwg3677.cc | 52 +++++++ 11 files changed, 337 insertions(+), 29 deletions(-) create mode 100644 libstdc++-v3/testsuite/20_util/from_chars/constexpr.cc create mode 100644 libstdc++-v3/testsuite/20_util/to_chars/constexpr.cc create mode 100644 libstdc++-v3/testsuite/20_util/to_chars/version.cc create mode 100644 libstdc++-v3/testsuite/20_util/uses_allocator/lwg3677.cc + git push -u origin master To github.com:wangliu-iscas/gcc-patch.git/ baeec7cc8..030a08c85 master -> master branch 'master' set up to track 'origin/master'. + branchname=series2064-patch2971 ++ git branch -a ++ grep 'series2064-patch2971$' + checkbranch= + checkbranchresult=null + '[' null = series2064-patch2971 ']' + git checkout -b series2064-patch2971 Switched to a new branch 'series2064-patch2971' ++ curl https://patchwork.plctlab.org/api/1.2/series/2064/ % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 1408 100 1408 0 0 41411 0 --:--:-- --:--:-- --:--:-- 41411 + series_response='{"id":2064,"url":"https://patchwork.plctlab.org/api/1.2/series/2064/","web_url":"https://patchwork.plctlab.org/project/gcc-patch/list/?series=2064","project":{"id":1,"url":"https://patchwork.plctlab.org/api/1.2/projects/1/","name":"gcc-patch","link_name":"gcc-patch","list_id":"gcc-patches.gcc.gnu.org","list_email":"gcc-patches@gcc.gnu.org","web_url":"https://gcc.gnu.org/mailman/listinfo/gcc-patches","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"name":"[committed] libstdc++: Fix uses_allocator_construction args for cv pair (LWG 3677)","date":"2022-10-15T20:22:10","submitter":{"id":67,"url":"https://patchwork.plctlab.org/api/1.2/people/67/","name":"Jonathan Wakely","email":"jwakely@redhat.com"},"version":1,"total":1,"received_total":1,"received_all":true,"mbox":"https://patchwork.plctlab.org/series/2064/mbox/","cover_letter":null,"patches":[{"id":2971,"url":"https://patchwork.plctlab.org/api/1.2/patches/2971/","web_url":"https://patchwork.plctlab.org/project/gcc-patch/patch/20221015202210.2687628-1-jwakely@redhat.com/","msgid":"<20221015202210.2687628-1-jwakely@redhat.com>","list_archive_url":null,"date":"2022-10-15T20:22:10","name":"[committed] libstdc++: Fix uses_allocator_construction args for cv pair (LWG 3677)","mbox":"https://patchwork.plctlab.org/project/gcc-patch/patch/20221015202210.2687628-1-jwakely@redhat.com/mbox/"}]}' ++ jq '.patches[] | (.id|tostring) + "," + .mbox' ++ echo '{"id":2064,"url":"https://patchwork.plctlab.org/api/1.2/series/2064/","web_url":"https://patchwork.plctlab.org/project/gcc-patch/list/?series=2064","project":{"id":1,"url":"https://patchwork.plctlab.org/api/1.2/projects/1/","name":"gcc-patch","link_name":"gcc-patch","list_id":"gcc-patches.gcc.gnu.org","list_email":"gcc-patches@gcc.gnu.org","web_url":"https://gcc.gnu.org/mailman/listinfo/gcc-patches","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"name":"[committed] libstdc++: Fix uses_allocator_construction args for cv pair (LWG 3677)","date":"2022-10-15T20:22:10","submitter":{"id":67,"url":"https://patchwork.plctlab.org/api/1.2/people/67/","name":"Jonathan Wakely","email":"jwakely@redhat.com"},"version":1,"total":1,"received_total":1,"received_all":true,"mbox":"https://patchwork.plctlab.org/series/2064/mbox/","cover_letter":null,"patches":[{"id":2971,"url":"https://patchwork.plctlab.org/api/1.2/patches/2971/","web_url":"https://patchwork.plctlab.org/project/gcc-patch/patch/20221015202210.2687628-1-jwakely@redhat.com/","msgid":"<20221015202210.2687628-1-jwakely@redhat.com>","list_archive_url":null,"date":"2022-10-15T20:22:10","name":"[committed] libstdc++: Fix uses_allocator_construction args for cv pair (LWG 3677)","mbox":"https://patchwork.plctlab.org/project/gcc-patch/patch/20221015202210.2687628-1-jwakely@redhat.com/mbox/"}]}' + patchid_patchurl='"2971,https://patchwork.plctlab.org/project/gcc-patch/patch/20221015202210.2687628-1-jwakely@redhat.com/mbox/"' + echo '"2971,https://patchwork.plctlab.org/project/gcc-patch/patch/20221015202210.2687628-1-jwakely@redhat.com/mbox/"' + IFS=, + read -r series_patch_id series_patch_url ++ echo '"2971' ++ sed 's/"//g' + series_patch_id=2971 ++ sed 's/"//g' ++ echo 'https://patchwork.plctlab.org/project/gcc-patch/patch/20221015202210.2687628-1-jwakely@redhat.com/mbox/"' + series_patch_url=https://patchwork.plctlab.org/project/gcc-patch/patch/20221015202210.2687628-1-jwakely@redhat.com/mbox/ ++ git rev-parse HEAD + commitid_before=030a08c857204909641b0fdc47ba3066f48de404 + eval '+++ declare -p bout bret declare -- bout="Applying: libstdc++: Fix uses_allocator_construction args for cv pair (LWG 3677) Using index info to reconstruct a base tree... M libstdc++-v3/include/bits/stl_map.h M libstdc++-v3/include/bits/stl_pair.h M libstdc++-v3/include/bits/uses_allocator_args.h Falling back to patching base and 3-way merge... No changes -- Patch already applied." declare -- bret="0" ++ berr='\''++++ git_am https://patchwork.plctlab.org/project/gcc-patch/patch/20221015202210.2687628-1-jwakely@redhat.com/mbox/ ++++ patch_url=https://patchwork.plctlab.org/project/gcc-patch/patch/20221015202210.2687628-1-jwakely@redhat.com/mbox/ ++++ curl https://patchwork.plctlab.org/project/gcc-patch/patch/20221015202210.2687628-1-jwakely@redhat.com/mbox/ ++++ git am -3 --empty=drop % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 11096 100 11096 0 0 318k 0 --:--:-- --:--:-- --:--:-- 318k +++ bout='\''\'\'''\''Applying: libstdc++: Fix uses_allocator_construction args for cv pair (LWG 3677) Using index info to reconstruct a base tree... M libstdc++-v3/include/bits/stl_map.h M libstdc++-v3/include/bits/stl_pair.h M libstdc++-v3/include/bits/uses_allocator_args.h Falling back to patching base and 3-way merge... No changes -- Patch already applied.'\''\'\'''\'' +++ bret=0'\'' ++ declare -p berr declare -- berr="++++ git_am https://patchwork.plctlab.org/project/gcc-patch/patch/20221015202210.2687628-1-jwakely@redhat.com/mbox/ ++++ patch_url=https://patchwork.plctlab.org/project/gcc-patch/patch/20221015202210.2687628-1-jwakely@redhat.com/mbox/ ++++ curl https://patchwork.plctlab.org/project/gcc-patch/patch/20221015202210.2687628-1-jwakely@redhat.com/mbox/ ++++ git am -3 --empty=drop % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 11096 100 11096 0 0 318k 0 --:--:-- --:--:-- --:--:-- 318k +++ bout='\''Applying: libstdc++: Fix uses_allocator_construction args for cv pair (LWG 3677) Using index info to reconstruct a base tree... M libstdc++-v3/include/bits/stl_map.h M libstdc++-v3/include/bits/stl_pair.h M libstdc++-v3/include/bits/uses_allocator_args.h Falling back to patching base and 3-way merge... No changes -- Patch already applied.'\'' +++ bret=0"' ++ +++ declare -p bout bret /tmp/jenkins16354227346916867204.sh: line 85: +++: command not found ++ declare -- 'bout=Applying: libstdc++: Fix uses_allocator_construction args for cv pair (LWG 3677) Using index info to reconstruct a base tree... M libstdc++-v3/include/bits/stl_map.h M libstdc++-v3/include/bits/stl_pair.h M libstdc++-v3/include/bits/uses_allocator_args.h Falling back to patching base and 3-way merge... No changes -- Patch already applied.' ++ declare -- bret=0 ++ ++ 'berr=++++ git_am https://patchwork.plctlab.org/project/gcc-patch/patch/20221015202210.2687628-1-jwakely@redhat.com/mbox/ ++++ patch_url=https://patchwork.plctlab.org/project/gcc-patch/patch/20221015202210.2687628-1-jwakely@redhat.com/mbox/ ++++ curl https://patchwork.plctlab.org/project/gcc-patch/patch/20221015202210.2687628-1-jwakely@redhat.com/mbox/ ++++ git am -3 --empty=drop % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 11096 100 11096 0 0 318k 0 --:--:-- --:--:-- --:--:-- 318k +++ bout='\''Applying: libstdc++: Fix uses_allocator_construction args for cv pair (LWG 3677) Using index info to reconstruct a base tree... M libstdc++-v3/include/bits/stl_map.h M libstdc++-v3/include/bits/stl_pair.h M libstdc++-v3/include/bits/uses_allocator_args.h Falling back to patching base and 3-way merge... No changes -- Patch already applied.'\'' +++ bret=0' /tmp/jenkins16354227346916867204.sh: line 108: ++: command not found ++ ++ declare -p berr /tmp/jenkins16354227346916867204.sh: line 109: ++: command not found ++ declare -- 'berr=++++ git_am https://patchwork.plctlab.org/project/gcc-patch/patch/20221015202210.2687628-1-jwakely@redhat.com/mbox/ ++++ patch_url=https://patchwork.plctlab.org/project/gcc-patch/patch/20221015202210.2687628-1-jwakely@redhat.com/mbox/ ++++ curl https://patchwork.plctlab.org/project/gcc-patch/patch/20221015202210.2687628-1-jwakely@redhat.com/mbox/ ++++ git am -3 --empty=drop % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 11096 100 11096 0 0 318k 0 --:--:-- --:--:-- --:--:-- 318k +++ bout='\''Applying: libstdc++: Fix uses_allocator_construction args for cv pair (LWG 3677) Using index info to reconstruct a base tree... M libstdc++-v3/include/bits/stl_map.h M libstdc++-v3/include/bits/stl_pair.h M libstdc++-v3/include/bits/uses_allocator_args.h Falling back to patching base and 3-way merge... No changes -- Patch already applied.'\'' +++ bret=0' ++ git rev-parse HEAD + commitid_after=030a08c857204909641b0fdc47ba3066f48de404 + '[' 0 = 0 ']' + '[' 030a08c857204909641b0fdc47ba3066f48de404 = 030a08c857204909641b0fdc47ba3066f48de404 ']' + submit_check warning 'Repeat Merge' https://patchwork.plctlab.org/jenkins/job/gcc-patch/1316/consoleText 'Git am fail log' + check_state=warning + patch_state='Repeat Merge' + repo_url=https://patchwork.plctlab.org/jenkins/job/gcc-patch/1316/consoleText + DESCRIPTION='Git am fail log' + curl -X POST -H 'Authorization: Token [*******]' -F state=warning -F target_url=https://patchwork.plctlab.org/jenkins/job/gcc-patch/1316/consoleText -F context=gcc-patch-check -F 'description=Git am fail log' https://patchwork.plctlab.org/api/patches/2971/checks/ % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 962 100 422 100 540 11405 14594 --:--:-- --:--:-- --:--:-- 26000 {"id":993,"url":"https://patchwork.plctlab.org/api/patches/2971/checks/993/","user":{"id":1,"url":"https://patchwork.plctlab.org/api/users/1/","username":"snail","first_name":"","last_name":"","email":"wangliu@iscas.ac.cn"},"date":"2022-10-16T00:15:59.930168","state":"warning","target_url":"https://patchwork.plctlab.org/jenkins/job/gcc-patch/1316/consoleText","context":"gcc-patch-check","description":"Git am fail log"}+ curl -X PATCH -H 'Authorization: Token [*******]' -F 'state=Repeat Merge' https://patchwork.plctlab.org/api/1.2/patches/2971/ % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0{"id":2971,"url":"https://patchwork.plctlab.org/api/1.2/patches/2971/","web_url":"https://patchwork.plctlab.org/project/gcc-patch/patch/20221015202210.2687628-1-jwakely@redhat.com/","project":{"id":1,"url":"https://patchwork.plctlab.org/api/1.2/projects/1/","name":"gcc-patch","link_name":"gcc-patch","list_id":"gcc-patches.gcc.gnu.org","list_email":"gcc-patches@gcc.gnu.org","web_url":"https://gcc.gnu.org/mailman/listinfo/gcc-patches","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20221015202210.2687628-1-jwakely@redhat.com>","list_archive_url":null,"date":"2022-10-15T20:22:10","name":"[committed] libstdc++: Fix uses_allocator_construction args for cv pair (LWG 3677)","commit_ref":null,"pull_url":null,"state":"repeat-merge","archived":false,"hash":"2a9e1d0850dda2fa4244ac06561a2c1a36245fbf","submitter":{"id":67,"url":"https://patchwork.plctlab.org/api/1.2/people/67/","name":"Jonathan Wakely","email":"jwakely@redhat.com"},"delegate":null,"mbox":"https://patchwork.plctlab.org/project/gcc-patch/patch/20221015202210.2687628-1-jwakely@redhat.com/mbox/","series":[{"id":2064,"url":"https://patchwork.plctlab.org/api/1.2/series/2064/","web_url":"https://patchwork.plctlab.org/project/gcc-patch/list/?series=2064","date":"2022-10-15T20:22:10","name":"[committed] libstdc++: Fix uses_allocator_construction args for cv pair (LWG 3677)","version":1,"mbox":"https://patchwork.plctlab.org/series/2064/mbox/"}],"comments":"https://patchwork.plctlab.org/api/patches/2971/comments/","check":"warning","checks":"https://patchwork.plctlab.org/api/patches/2971/checks/","tags":{},"headers":{"Return-Path":"","Delivered-To":["ouuuleilei@gmail.com","gcc-patches@gcc.gnu.org"],"Received":["by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp771141wrs;\n Sat, 15 Oct 2022 13:23:14 -0700 (PDT)","from sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97])\n by mx.google.com with ESMTPS id\n ga13-20020a1709070c0d00b0073daf6b44a5si5295995ejc.775.2022.10.15.13.23.14\n for \n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Sat, 15 Oct 2022 13:23:14 -0700 (PDT)","from server2.sourceware.org (localhost [IPv6:::1])\n\tby sourceware.org (Postfix) with ESMTP id 631513857811\n\tfor ; Sat, 15 Oct 2022 20:22:58 +0000 (GMT)","from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [170.10.129.124])\n by sourceware.org (Postfix) with ESMTPS id B357C3858D1E\n for ; Sat, 15 Oct 2022 20:22:14 +0000 (GMT)","from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com\n [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS\n (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n us-mta-189-TXAIRWcDOByKpFAwLa3E0g-1; Sat, 15 Oct 2022 16:22:12 -0400","from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com\n [10.11.54.5])\n (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n (No client certificate requested)\n by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CC770185A792;\n Sat, 15 Oct 2022 20:22:11 +0000 (UTC)","from localhost (unknown [10.33.36.7])\n by smtp.corp.redhat.com (Postfix) with ESMTP id 95BB2AE7B8;\n Sat, 15 Oct 2022 20:22:11 +0000 (UTC)"],"X-Google-Smtp-Source":"\n AMsMyM7NeMzDt78yGvkSOvlUvzjuFQOotLH9rldKGpDI6OkkcSMK5vNCwHLERHbpnqgVfXU7cqea","X-Received":"by 2002:a17:907:3ea4:b0:78e:25e2:c33b with SMTP id\n hs36-20020a1709073ea400b0078e25e2c33bmr2960444ejc.603.1665865394567;\n Sat, 15 Oct 2022 13:23:14 -0700 (PDT)","ARC-Seal":"i=1; a=rsa-sha256; t=1665865394; cv=none;\n d=google.com; s=arc-20160816;\n b=nMDIgxn4G7iPsq3c0kxKSV0hfINJFBa8Y+3kf6DiREH3mTt4vR6YOmL+6de89vUpde\n 6/qm56MEXm8/IOeNtlIvJfgAZDGP/aPOJJ4lFntzGpvQXt5o/TkinOW/zalZSKOrcm/n\n 5UILqOBdNvJIZyuPNicT+PUHcxVlXypMu9riz+ifq1qIwQOc/6V9zq5O6MtEqKmt4AH8\n SF5zgDwqdgk6khVLYMxH97WSeXzEQCjU4J+yp+tMjlFLxFDeI5JjNT8U0GqQP0AhTU9M\n otf0KI0y/oJcPKGUxC0iZJAsQhJv06nun4NV7ir961We5sHhdpLuP3TEa+cBbZxPK/ph\n RjyQ==","ARC-Message-Signature":"i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;\n s=arc-20160816;\n h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post\n :list-archive:list-unsubscribe:list-id:precedence\n :content-transfer-encoding:mime-version:message-id:date:subject:to\n :dmarc-filter:delivered-to:dkim-signature:dkim-filter;\n bh=FHi2gj5Kz3lFsmneidEn6SE/p3+5Z+NMav9qBk3nVt4=;\n b=kjSxCKR5dVlF04UCLGBURle0Dlt0W763hzqaQkI1wOsjS0X1KpYKMeEaZkLnsdULkq\n E33Ykt8NSX5EzESG2TKw2WrLBzqpvfAhPeKBRSxjF1xNY6PboZLyv1jUBU1fGxn51Ius\n b6crgft71VIOIsyAcg8LJMvE3RcE2tw/u4sXQucTT8EMCa4sKcbfcPr6J+usgosWbopb\n d+/sWtsqGXw/Nl2gGfx8wx5SwAHLGAM+9IgLoJ9bP9Rw2FC2X8NuBrOdvJ/x9mcDtalz\n i1XvX+8Z5yz4im8RUBslUKffDcNHERrlnoilVBX69oE/CJFsSCE3Q5H4X3GDUC/ioHXC\n a2qw==","ARC-Authentication-Results":"i=1; mx.google.com;\n dkim=pass header.i=@gcc.gnu.org header.s=default header.b=vs8ZFCMI;\n spf=pass (google.com: domain of\n gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as\n permitted sender)\n smtp.mailfrom=\"gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org\";\n dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org","Received-SPF":"pass (google.com: domain of\n gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as\n permitted sender) client-ip=8.43.85.97;","Authentication-Results":"mx.google.com;\n dkim=pass header.i=@gcc.gnu.org header.s=default header.b=vs8ZFCMI;\n spf=pass (google.com: domain of\n gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as\n permitted sender)\n smtp.mailfrom=\"gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org\";\n dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org","DKIM-Filter":"OpenDKIM Filter v2.11.0 sourceware.org 631513857811","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org;\n\ts=default; t=1665865378;\n\tbh=FHi2gj5Kz3lFsmneidEn6SE/p3+5Z+NMav9qBk3nVt4=;\n\th=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post:\n\t List-Help:List-Subscribe:From:Reply-To:From;\n\tb=vs8ZFCMIuzbOykDqYjQGUTSfsR7uaaLjI97/x2PdfRHkYXA6w+GeaHZG7pGnnbBGh\n\t TezssrirkRIVILHZ6dx/36msmJ0l5XBWvOejAK/MNmRx+lNVOI6AiRSOx98R+wx1i1\n\t QjyimDv6Nya7RWoNwcoroXOhtBVIL4/pwJFTmyqQ=","X-Original-To":"gcc-patches@gcc.gnu.org","DMARC-Filter":"OpenDMARC Filter v1.4.1 sourceware.org B357C3858D1E","X-MC-Unique":"TXAIRWcDOByKpFAwLa3E0g-1","To":"libstdc++@gcc.gnu.org,\n\tgcc-patches@gcc.gnu.org","Subject":"[committed] libstdc++: Fix uses_allocator_construction args for cv\n pair (LWG 3677)","Date":"Sat, 15 Oct 2022 21:22:10 +0100","Message-Id":"<20221015202210.2687628-1-jwakely@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.1 on 10.11.54.5","X-Mimecast-Spam-Score":"0","X-Mimecast-Originator":"redhat.com","Content-Type":"text/plain","Content-Transfer-Encoding":"8bit","X-Spam-Status":"No, score=-12.0 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH,\n DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0,\n RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_NONE,\n TXREP autolearn=ham autolearn_force=no version=3.4.6","X-Spam-Checker-Version":"SpamAssassin 3.4.6 (2021-04-09) on\n server2.sourceware.org","X-BeenThere":"gcc-patches@gcc.gnu.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"Gcc-patches mailing list ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","From":"Jonathan Wakely via Gcc-patches ","Reply-To":"Jonathan Wakely ","Errors-To":"gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org","Sender":"\"Gcc-patches\" ","X-getmail-retrieved-from-mailbox":"=?utf-8?q?INBOX?=","X-GMAIL-THRID":"=?utf-8?q?1746786471657064682?=","X-GMAIL-MSGID":"=?utf-8?q?1746786471657064682?="},"content":"This issue is Tentatively Ready, and the resolution seems obviously\ncorrect so we can do it now.\n\nTested powerpc64le-linux. Pushed to trunk.\n\n-- >8 --\n\nThe _Std_pair concept uses in handles const\nqualified pairs, but not volatile qualified. That's because it just uses\n__is_pair which is specialized for const pairs.\n\nThis removes the partial specialization __is_pair>, so\nthat __is_pair is now only true for cv-unqualified pairs. Then _Std_pair\nneeds to explicitly use remove_cv_t for the argument to __is_pair.\n\nThe other use of __is_pair is in map::insert(Pair&&) which doesn't want\nto handle volatile so should just use remove_const_t.\n\nlibstdc++-v3/ChangeLog:\n\n\t* include/bits/stl_map.h (map::insert(Pair&&)): Use\n\tremove_const_t on argument to __is_pair.\n\t* include/bits/stl_pair.h (__is_pair>): Remove\n\tpartial specialization.\n\t* include/bits/uses_allocator_args.h (_Std_pair): Use\n\tremove_cv_t as per LWG 3677.\n\t* testsuite/20_util/uses_allocator/lwg3677.cc: New test.\n---\n libstdc++-v3/include/bits/stl_map.h | 2 +-\n libstdc++-v3/include/bits/stl_pair.h | 3 --\n .../include/bits/uses_allocator_args.h | 2 +-\n .../20_util/uses_allocator/lwg3677.cc | 52 +++++++++++++++++++\n 4 files changed, 54 insertions(+), 5 deletions(-)\n create mode 100644 libstdc++-v3/testsuite/20_util/uses_allocator/lwg3677.cc","diff":"diff --git a/libstdc++-v3/include/bits/stl_map.h b/libstdc++-v3/include/bits/stl_map.h\nindex 9c2b0745673..83c579aaedc 100644\n--- a/libstdc++-v3/include/bits/stl_map.h\n+++ b/libstdc++-v3/include/bits/stl_map.h\n@@ -847,7 +847,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER\n \t{\n #if __cplusplus >= 201703L\n \t using _P2 = remove_reference_t<_Pair>;\n-\t if constexpr (__is_pair<_P2>)\n+\t if constexpr (__is_pair>)\n \t if constexpr (is_same_v>)\n \t if constexpr (__usable_key)\n \t\t{\ndiff --git a/libstdc++-v3/include/bits/stl_pair.h b/libstdc++-v3/include/bits/stl_pair.h\nindex d0f07b09d34..195167019b7 100644\n--- a/libstdc++-v3/include/bits/stl_pair.h\n+++ b/libstdc++-v3/include/bits/stl_pair.h\n@@ -889,9 +889,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION\n \n template\n inline constexpr bool __is_pair> = true;\n-\n- template\n- inline constexpr bool __is_pair> = true;\n #endif\n \n /// @cond undocumented\ndiff --git a/libstdc++-v3/include/bits/uses_allocator_args.h b/libstdc++-v3/include/bits/uses_allocator_args.h\nindex ef5c4fffb70..77e48602aac 100644\n--- a/libstdc++-v3/include/bits/uses_allocator_args.h\n+++ b/libstdc++-v3/include/bits/uses_allocator_args.h\n@@ -44,7 +44,7 @@ namespace std _GLIBCXX_VISIBILITY(default)\n _GLIBCXX_BEGIN_NAMESPACE_VERSION\n \n template\n- concept _Std_pair = __is_pair<_Tp>;\n+ concept _Std_pair = __is_pair>;\n \n /** @addtogroup allocators\n * @{\ndiff --git a/libstdc++-v3/testsuite/20_util/uses_allocator/lwg3677.cc b/libstdc++-v3/testsuite/20_util/uses_allocator/lwg3677.cc\nnew file mode 100644\nindex 00000000000..649b98d3922\n--- /dev/null\n+++ b/libstdc++-v3/testsuite/20_util/uses_allocator/lwg3677.cc\n@@ -0,0 +1,52 @@\n+// { dg-options \"-std=gnu++23\" }\n+// { dg-do run { target c++20 } }\n+\n+#include \n+#include \n+\n+struct UsesAlloc\n+{\n+ using allocator_type = std::allocator;\n+\n+ bool passed_alloc;\n+\n+ UsesAlloc(int) : passed_alloc(false) { }\n+\n+ UsesAlloc(int, std::allocator) : passed_alloc(true) { }\n+};\n+\n+using Pair = std::pair;\n+\n+void\n+test_const()\n+{\n+ std::allocator a;\n+ int i = 0 100 13035 100 12883 100 152 241k 2923 --:--:-- --:--:-- --:--:-- 244k ;\n+ auto p = std::make_obj_using_allocator(a, i, i);\n+ VERIFY( p.first.passed_alloc );\n+}\n+\n+void\n+test_volatile()\n+{\n+ std::allocator a;\n+ int i = 0;\n+ auto p = std::make_obj_using_allocator(a, i, i);\n+ VERIFY( p.first.passed_alloc );\n+}\n+\n+void\n+test_const_volatile()\n+{\n+ std::allocator a;\n+ int i = 0;\n+ auto p = std::make_obj_using_allocator(a, i, i);\n+ VERIFY( p.first.passed_alloc );\n+}\n+\n+int main()\n+{\n+ test_const();\n+ test_volatile();\n+ test_const_volatile();\n+}\n","prefixes":["committed"]}+ exit 1 Build step 'Execute shell' marked build as failure Finished: FAILURE