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 36d20fa4a83d1a294462c2622ca76eac93465c2c # timeout=10 First time build. Skipping changelog. [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/jenkins2455612671429645535.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 Already up to date. + git push -u origin upstream-master Everything up-to-date 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 Already up to date. + git push -u origin master Everything up-to-date branch 'master' set up to track 'origin/master'. + branchname=series2027-patch2890 ++ git branch -a ++ grep 'series2027-patch2890$' + checkbranch= + checkbranchresult=null + '[' null = series2027-patch2890 ']' + git checkout -b series2027-patch2890 Switched to a new branch 'series2027-patch2890' ++ curl https://patchwork.plctlab.org/api/1.2/series/2027/ % 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 1407 100 1407 0 0 18038 0 --:--:-- --:--:-- --:--:-- 18038 + series_response='{"id":2027,"url":"https://patchwork.plctlab.org/api/1.2/series/2027/","web_url":"https://patchwork.plctlab.org/project/gcc-patch/list/?series=2027","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] preprocessor: C2x identifier rules","date":"2022-10-14T23:10:11","submitter":{"id":61,"url":"https://patchwork.plctlab.org/api/1.2/people/61/","name":"Joseph Myers","email":"joseph@codesourcery.com"},"version":1,"total":1,"received_total":1,"received_all":true,"mbox":"https://patchwork.plctlab.org/series/2027/mbox/","cover_letter":null,"patches":[{"id":2890,"url":"https://patchwork.plctlab.org/api/1.2/patches/2890/","web_url":"https://patchwork.plctlab.org/project/gcc-patch/patch/alpine.DEB.2.22.394.2210142309130.2164505@digraph.polyomino.org.uk/","msgid":"","list_archive_url":null,"date":"2022-10-14T23:10:11","name":"[committed] preprocessor: C2x identifier rules","mbox":"https://patchwork.plctlab.org/project/gcc-patch/patch/alpine.DEB.2.22.394.2210142309130.2164505@digraph.polyomino.org.uk/mbox/"}]}' ++ jq '.patches[] | (.id|tostring) + "," + .mbox' ++ echo '{"id":2027,"url":"https://patchwork.plctlab.org/api/1.2/series/2027/","web_url":"https://patchwork.plctlab.org/project/gcc-patch/list/?series=2027","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] preprocessor: C2x identifier rules","date":"2022-10-14T23:10:11","submitter":{"id":61,"url":"https://patchwork.plctlab.org/api/1.2/people/61/","name":"Joseph Myers","email":"joseph@codesourcery.com"},"version":1,"total":1,"received_total":1,"received_all":true,"mbox":"https://patchwork.plctlab.org/series/2027/mbox/","cover_letter":null,"patches":[{"id":2890,"url":"https://patchwork.plctlab.org/api/1.2/patches/2890/","web_url":"https://patchwork.plctlab.org/project/gcc-patch/patch/alpine.DEB.2.22.394.2210142309130.2164505@digraph.polyomino.org.uk/","msgid":"","list_archive_url":null,"date":"2022-10-14T23:10:11","name":"[committed] preprocessor: C2x identifier rules","mbox":"https://patchwork.plctlab.org/project/gcc-patch/patch/alpine.DEB.2.22.394.2210142309130.2164505@digraph.polyomino.org.uk/mbox/"}]}' + patchid_patchurl='"2890,https://patchwork.plctlab.org/project/gcc-patch/patch/alpine.DEB.2.22.394.2210142309130.2164505@digraph.polyomino.org.uk/mbox/"' + IFS=, + read -r series_patch_id series_patch_url + echo '"2890,https://patchwork.plctlab.org/project/gcc-patch/patch/alpine.DEB.2.22.394.2210142309130.2164505@digraph.polyomino.org.uk/mbox/"' ++ sed 's/"//g' ++ echo '"2890' + series_patch_id=2890 ++ sed 's/"//g' ++ echo 'https://patchwork.plctlab.org/project/gcc-patch/patch/alpine.DEB.2.22.394.2210142309130.2164505@digraph.polyomino.org.uk/mbox/"' + series_patch_url=https://patchwork.plctlab.org/project/gcc-patch/patch/alpine.DEB.2.22.394.2210142309130.2164505@digraph.polyomino.org.uk/mbox/ ++ git rev-parse HEAD + commitid_before=baeec7cc83b19b46d1c73523f06efa7ea2b30390 + eval '+++ declare -p bout bret declare -- bout="Applying: preprocessor: C2x identifier rules Using index info to reconstruct a base tree... M libcpp/charset.cc M libcpp/include/cpplib.h M libcpp/init.cc M libcpp/lex.cc 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/alpine.DEB.2.22.394.2210142309130.2164505@digraph.polyomino.org.uk/mbox/ ++++ patch_url=https://patchwork.plctlab.org/project/gcc-patch/patch/alpine.DEB.2.22.394.2210142309130.2164505@digraph.polyomino.org.uk/mbox/ ++++ git am -3 --empty=drop ++++ curl https://patchwork.plctlab.org/project/gcc-patch/patch/alpine.DEB.2.22.394.2210142309130.2164505@digraph.polyomino.org.uk/mbox/ % 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 20823 100 20823 0 0 376k 0 --:--:-- --:--:-- --:--:-- 376k +++ bout='\''\'\'''\''Applying: preprocessor: C2x identifier rules Using index info to reconstruct a base tree... M libcpp/charset.cc M libcpp/include/cpplib.h M libcpp/init.cc M libcpp/lex.cc 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/alpine.DEB.2.22.394.2210142309130.2164505@digraph.polyomino.org.uk/mbox/ ++++ patch_url=https://patchwork.plctlab.org/project/gcc-patch/patch/alpine.DEB.2.22.394.2210142309130.2164505@digraph.polyomino.org.uk/mbox/ ++++ git am -3 --empty=drop ++++ curl https://patchwork.plctlab.org/project/gcc-patch/patch/alpine.DEB.2.22.394.2210142309130.2164505@digraph.polyomino.org.uk/mbox/ % 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 20823 100 20823 0 0 376k 0 --:--:-- --:--:-- --:--:-- 376k +++ bout='\''Applying: preprocessor: C2x identifier rules Using index info to reconstruct a base tree... M libcpp/charset.cc M libcpp/include/cpplib.h M libcpp/init.cc M libcpp/lex.cc Falling back to patching base and 3-way merge... No changes -- Patch already applied.'\'' +++ bret=0"' ++ +++ declare -p bout bret /tmp/jenkins2455612671429645535.sh: line 85: +++: command not found ++ declare -- 'bout=Applying: preprocessor: C2x identifier rules Using index info to reconstruct a base tree... M libcpp/charset.cc M libcpp/include/cpplib.h M libcpp/init.cc M libcpp/lex.cc 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/alpine.DEB.2.22.394.2210142309130.2164505@digraph.polyomino.org.uk/mbox/ ++++ patch_url=https://patchwork.plctlab.org/project/gcc-patch/patch/alpine.DEB.2.22.394.2210142309130.2164505@digraph.polyomino.org.uk/mbox/ ++++ git am -3 --empty=drop ++++ curl https://patchwork.plctlab.org/project/gcc-patch/patch/alpine.DEB.2.22.394.2210142309130.2164505@digraph.polyomino.org.uk/mbox/ % 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 20823 100 20823 0 0 376k 0 --:--:-- --:--:-- --:--:-- 376k +++ bout='\''Applying: preprocessor: C2x identifier rules Using index info to reconstruct a base tree... M libcpp/charset.cc M libcpp/include/cpplib.h M libcpp/init.cc M libcpp/lex.cc Falling back to patching base and 3-way merge... No changes -- Patch already applied.'\'' +++ bret=0' /tmp/jenkins2455612671429645535.sh: line 110: ++: command not found ++ ++ declare -p berr /tmp/jenkins2455612671429645535.sh: line 111: ++: command not found ++ declare -- 'berr=++++ git_am https://patchwork.plctlab.org/project/gcc-patch/patch/alpine.DEB.2.22.394.2210142309130.2164505@digraph.polyomino.org.uk/mbox/ ++++ patch_url=https://patchwork.plctlab.org/project/gcc-patch/patch/alpine.DEB.2.22.394.2210142309130.2164505@digraph.polyomino.org.uk/mbox/ ++++ git am -3 --empty=drop ++++ curl https://patchwork.plctlab.org/project/gcc-patch/patch/alpine.DEB.2.22.394.2210142309130.2164505@digraph.polyomino.org.uk/mbox/ % 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 20823 100 20823 0 0 376k 0 --:--:-- --:--:-- --:--:-- 376k +++ bout='\''Applying: preprocessor: C2x identifier rules Using index info to reconstruct a base tree... M libcpp/charset.cc M libcpp/include/cpplib.h M libcpp/init.cc M libcpp/lex.cc Falling back to patching base and 3-way merge... No changes -- Patch already applied.'\'' +++ bret=0' ++ git rev-parse HEAD + commitid_after=baeec7cc83b19b46d1c73523f06efa7ea2b30390 + '[' 0 = 0 ']' + '[' baeec7cc83b19b46d1c73523f06efa7ea2b30390 = baeec7cc83b19b46d1c73523f06efa7ea2b30390 ']' + submit_check warning 'Repeat Merge' https://patchwork.plctlab.org/jenkins/job/gcc-patch/1313/consoleText 'Git am fail log' + check_state=warning + patch_state='Repeat Merge' + repo_url=https://patchwork.plctlab.org/jenkins/job/gcc-patch/1313/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/1313/consoleText -F context=gcc-patch-check -F 'description=Git am fail log' https://patchwork.plctlab.org/api/patches/2890/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 10820 13846 --:--:-- --:--:-- --:--:-- 24666 {"id":990,"url":"https://patchwork.plctlab.org/api/patches/2890/checks/990/","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-15T01:16:47.072336","state":"warning","target_url":"https://patchwork.plctlab.org/jenkins/job/gcc-patch/1313/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/2890/ % 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":2890,"url":"https://patchwork.plctlab.org/api/1.2/patches/2890/","web_url":"https://patchwork.plctlab.org/project/gcc-patch/patch/alpine.DEB.2.22.394.2210142309130.2164505@digraph.polyomino.org.uk/","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":"","list_archive_url":null,"date":"2022-10-14T23:10:11","name":"[committed] preprocessor: C2x identifier rules","commit_ref":null,"pull_url":null,"state":"repeat-merge","archived":false,"hash":"58bec7e70e1f0b6931986c0e1ee7daa79d91411b","submitter":{"id":61,"url":"https://patchwork.plctlab.org/api/1.2/people/61/","name":"Joseph Myers","email":"joseph@codesourcery.com"},"delegate":null,"mbox":"https://patchwork.plctlab.org/project/gcc-patch/patch/alpine.DEB.2.22.394.2210142309130.2164505@digraph.polyomino.org.uk/mbox/","series":[{"id":2027,"url":"https://patchwork.plctlab.org/api/1.2/series/2027/","web_url":"https://patchwork.plctlab.org/project/gcc-patch/list/?series=2027","date":"2022-10-14T23:10:11","name":"[committed] preprocessor: C2x identifier rules","version":1,"mbox":"https://patchwork.plctlab.org/series/2027/mbox/"}],"comments":"https://patchwork.plctlab.org/api/patches/2890/comments/","check":"warning","checks":"https://patchwork.plctlab.org/api/patches/2890/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 y7csp414101wrs;\n Fri, 14 Oct 2022 16:10:50 -0700 (PDT)","from sourceware.org (server2.sourceware.org.\n [2620:52:3:1:0:246e:9693:128c])\n by mx.google.com with ESMTPS id\n q17-20020a170906361100b00787d08d5ff4si3166468ejb.695.2022.10.14.16.10.49\n for \n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Fri, 14 Oct 2022 16:10:50 -0700 (PDT)","from server2.sourceware.org (localhost [IPv6:::1])\n\tby sourceware.org (Postfix) with ESMTP id 6A32E385740E\n\tfor ; Fri, 14 Oct 2022 23:10:44 +0000 (GMT)","from esa1.mentor.iphmx.com (esa1.mentor.iphmx.com [68.232.129.153])\n by sourceware.org (Postfix) with ESMTPS id 813993858C52\n for ; Fri, 14 Oct 2022 23:10:18 +0000 (GMT)","from orw-gwy-01-in.mentorg.com ([192.94.38.165])\n by esa1.mentor.iphmx.com with ESMTP; 14 Oct 2022 15:10:16 -0800"],"X-Google-Smtp-Source":"\n AMsMyM7DxqBdYH3MtmwEjaElnc7wc7On9Eg6ag3j+IFjVJmjUT8vAmwZ1nrQ/Uo+IQ1MjOkqreml","X-Received":"by 2002:aa7:cc8a:0:b0:45b:f851:2943 with SMTP id\n p10-20020aa7cc8a000000b0045bf8512943mr122173edt.103.1665789050028;\n Fri, 14 Oct 2022 16:10:50 -0700 (PDT)","ARC-Seal":"i=1; a=rsa-sha256; t=1665789050; cv=none;\n d=google.com; s=arc-20160816;\n b=OM2Wx2uZsXt/1RwEwXxLeBB0hioSxuMgxOZ3XSwyC5EPVw9rpqsYpCdZ5e6C07MdJb\n BMB5TZplwAEhoZSnRFeIcngsZJvSQ/dbvI3TRTiQvBSewOOvcBWNgQG23P8T/GD3ktez\n kYUyJj7zA6/Xm5HqPDGc59Ln840omhtpb3NZqc8A0xsA5o5i6gYMjWiDWNA+wqPGs9hB\n XU71WL6b0tJ8LuM+1hO+vBCkumw3DqNygQ9NOvB/2CFpTbFCp34Oxu0lgeDjuR/c5huf\n McUf9v/m5skbev9AbF/QgIHxRUrd8UaPnBvff5l4TCMAnjxRFwqH0/hFpiLuRn3deL72\n KpMg==","ARC-Message-Signature":"i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;\n s=arc-20160816;\n h=sender:errors-to:list-subscribe:list-help:list-post:list-archive\n :list-unsubscribe:list-id:precedence:content-transfer-encoding\n :mime-version:user-agent:message-id:subject:to:from:date\n :ironport-sdr:dmarc-filter:delivered-to;\n bh=LBaD6nmKx9Lm7r+d6bLJi3bRJELGSMcx90JlycQv6jM=;\n b=YwRMerNzP4Sip5RH7ECIXBDZ745qpELLZWk7W4fQSQ2wWTf83sHEiaR7BRsFIuXVim\n ECwiMWfA+h3dXqz7P3M9Tmqz+WCH7KjKWTSTk8oVjAHVv1ZwvtqVQiiVTZ3TYf4jLvto\n hwGrdYh4teRs8sE/IOnDakMtUwc1+itwd8soiG+gcHTk6q7/G9/TkNNlz43icg8krLLZ\n 8IPOfDjyojsoaLLVnTRQ8BycTePEOBZEl9LWeNAvrpQi17RaQoYkffs4OyLAwRH+91vX\n PlaCXKDacfGt0zzGLGNnTyqoZpsZuYPeGzdXCIcH9KengQ1gyB5zcadJMM8mooAjfolY\n h/tA==","ARC-Authentication-Results":"i=1; mx.google.com;\n spf=pass (google.com: domain of\n gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates\n 2620:52:3:1:0:246e:9693:128c as permitted sender)\n smtp.mailfrom=\"gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org\"","Received-SPF":"pass (google.com: domain of\n gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates\n 2620:52:3:1:0:246e:9693:128c as permitted sender)\n client-ip=2620:52:3:1:0:246e:9693:128c;","Authentication-Results":["mx.google.com;\n spf=pass (google.com: domain of\n gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates\n 2620:52:3:1:0:246e:9693:128c as permitted sender)\n smtp.mailfrom=\"gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org\"","sourceware.org; dmarc=none (p=none dis=none)\n header.from=codesourcery.com","sourceware.org; spf=pass smtp.mailfrom=mentor.com"],"X-Original-To":"gcc-patches@gcc.gnu.org","DMARC-Filter":"OpenDMARC Filter v1.4.1 sourceware.org 813993858C52","X-IronPort-AV":"E=Sophos;i=\"5.95,185,1661846400\"; d=\"scan'208\";a=\"87562257\"","IronPort-SDR":"\n eJZQ39y7K6QcP3Ip7QAlPyApF4fU24BlzGWSlzgVtoaldAB8ievco136nzoO2YZ/WI9gNhzxCu\n CBDY/ScHYq+S248bIvztL/+YTlTMjsvm/M9hjUCIvUrDgC6Aedr0G9qHFttTusljAUOBSwLuyP\n A+ag5d7NIBAQNKUuKUTZSaQDZv4g6K5piL4cdZ/o6cdAwaTlN4J6LWyjZJuKilUwx9ZWPWex9k\n tVl7L0GXxB637h1ONEhDXf/ZcBX1uNj9pa38ZMHG5FfoMDtYBrzvEu5o+SsUQV2zPfvby6KLgH\n b0c=","Date":"Fri, 14 Oct 2022 23:10:11 +0000","From":"Joseph Myers ","X-X-Sender":"jsm28@digraph.polyomino.org.uk","To":"","Subject":"[committed] preprocessor: C2x identifier rules","Message-ID":"\n ","User-Agent":"Alpine 2.22 (DEB 394 2020-01-19)","MIME-Version":"1.0","X-Originating-IP":"[137.202.0.90]","X-ClientProxiedBy":"svr-ies-mbx-09.mgc.mentorg.com (139.181.222.9) To\n svr-ies-mbx-10.mgc.mentorg.com (139.181.222.10)","X-Spam-Status":"No, score=-3114.7 required=5.0 tests=BAYES_00, GIT_PATCH_0,\n HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, SCC_10_SHORT_WORD_LINES,\n SCC_20_SHORT_WORD_LINES, SCC_35_SHORT_WORD_LINES, SCC_5_SHORT_WORD_LINES,\n SPF_HELO_PASS, SPF_PASS, 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","Content-Type":"text/plain; charset=\"UTF-8\"","Content-Transfer-Encoding":"8BIT","X-Content-Filtered-By":"Mailman/MimeDel 2.1.29","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 ","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?1746706419168755621?=","X-GMAIL-MSGID":"=?utf-8?q?1746706419168755621?="},"content":"C2x has, like C++, adopted rules for identifiers based directly on an\nunversioned normative reference to Unicode. Make libcpp follow those\nrules for c2x / gnu2x standards (this involves bringing back a flag\nseparate from the C++ one for whether to use these identifier rules,\nbut this time enabled for all C++ language versions since that was the\nconclusion adopted for C++ identifier handling).\n\nThere is one change here that affects C++. I believe the new\nnormative requirement for NFC only applies to identifiers, not to the\nuse of identifier-continue characters in pp-numbers, where there is no\nsuch requirement and so the diagnostic ought to be a warning not a\npedwarn in pp-numbers, and that this is the case for both C and C++.\n\nBootstrapped with no regressions for x86_64-pc-linux-gnu.\n\nlibcpp/\n\t* charset.cc (ucn_valid_in_identifier): Check xid_identifiers not\n\tcplusplus to determine whether to use CXX23 and NXX23 flags.\n\t* include/cpplib.h (struct cpp_options): Add xid_identifiers.\n\t* init.cc (struct lang_flags, lang_defaults): Add xid_identifiers.\n\t(cpp_set_lang): Set xid_identifiers.\n\t* lex.cc (warn_about_normalization): Add parameter identifier.\n\tOnly pedwarn about non-NFC for identifiers, not pp-numbers.\n\t(_cpp_lex_direct): Update calls to warn_about_normalization.\n\ngcc/testsuite/\n\t* gcc.dg/cpp/c2x-ucnid-1-utf8.c, gcc.dg/cpp/c2x-ucnid-1.c: New\n\ttests.\n\n---\n\nIt would incidentally now be appropriate to update the Unicode data in\nlibcpp from Unicode 14 to Unicode 15.","diff":"diff --git a/gcc/testsuite/gcc.dg/cpp/c2x-ucnid-1-utf8.c b/gcc/testsuite/gcc.dg/cpp/c2x-ucnid-1-utf8.c\nnew file mode 100644\nindex 00000000000..55d22819563\n--- /dev/null\n+++ b/gcc/testsuite/gcc.dg/cpp/c2x-ucnid-1-utf8.c\n@@ -0,0 +1,13 @@\n+/* Test C2x (= Unicode) rules for characters in identifiers. */\n+/* { dg-do preprocess } */\n+/* { dg-options \"-std=c2x -pedantic-errors\" } */\n+\n+??\n+\n+/* The requirement for NFC only applies in identifiers, not pp-numbers. */\n+\n+A?? /* { dg-error \"not in NFC\" } */\n+??A?? /* { dg-error \"not in NFC\" } */\n+\n+0A?? /* { dg-warning \"not in NFC\" } */\n+.1A?? /* { dg-warning \"not in NFC\" } */\ndiff --git a/gcc/testsuite/gcc.dg/cpp/c2x-ucnid-1.c b/gcc/testsuite/gcc.dg/cpp/c2x-ucnid-1.c\nnew file mode 100644\nindex 00000000000..f9fdbea6ece\n--- /dev/null\n+++ b/gcc/testsuite/gcc.dg/cpp/c2x-ucnid-1.c\n@@ -0,0 +1,13 @@\n+/* Test C2x (= Unicode) rules for characters in identifiers. */\n+/* { dg-do preprocess } */\n+/* { dg-options \"-std=c2x -pedantic-errors\" } */\n+\n+\\u00A8 /* { dg-error \"is not valid in an identifier\" } */\n+\n+/* The requirement for NFC only applies in identifiers, not pp-numbers. */\n+\n+A\\u0300 /* { dg-error \"not in NFC\" } */\n+\\u00ffA\\u0300 /* { dg-error \"not in NFC\" } */\n+\n+0A\\u0300 /* { dg-warning \"not in NFC\" } */\n+.1A\\u0300 /* { dg-warning \"not in NFC\" } */\ndiff --git a/libcpp/charset.cc b/libcpp/charset.cc\nindex 6834969a919..12a398e7527 100644\n--- a/libcpp/charset.cc\n+++ b/libcpp/charset.cc\n@@ -1291,7 +1291,7 @@ ucn_valid_in_identifier (cpp_reader *pfile, cppchar_t c,\n valid_flags = C99 | CXX | C11 | CXX23;\n if (CPP_PEDANTIC (pfile))\n {\n- if (CPP_OPTION (pfile, cplusplus))\n+ if (CPP_OPTION (pfile, xid_identifiers))\n \tvalid_flags = CXX23;\n else if (CPP_OPTION (pfile, c11_identifiers))\n \tvalid_flags = C11;\n@@ -1355,7 +1355,7 @@ ucn_valid_in_identifier (cpp_reader *pfile, cppchar_t c,\n return 2;\n }\n \n- if (CPP_OPTION (pfile, cplusplus))\n+ if (CPP_OPTION (pfile, xid_identifiers))\n invalid_start_flags = NXX23;\n else if (CPP_OPTION (pfile, c11_identifiers))\n invalid_start_flags = N11;\ndiff --git a/libcpp/include/cpplib.h b/libcpp/include/cpplib.h\nindex e97993e04bc..d5ef12a30ea 100644\n--- a/libcpp/include/cpplib.h\n+++ b/libcpp/include/cpplib.h\n@@ -496,6 +496,10 @@ struct cpp_options\n in C11. */\n unsigned char c11_identifiers;\n \n+ /* Nonzero means extended identifiers allow the characters specified\n+ by Unicode XID_Start and XID_Continue properties. */\n+ unsigned char xid_identifiers;\n+\n /* Nonzero for C++ 2014 Standard binary constants. */\n unsigned char binary_constants;\n \ndiff --git a/libcpp/init.cc b/libcpp/init.cc\nindex d3b4f00994b..5f34e3515d2 100644\n--- a/libcpp/init.cc\n+++ b/libcpp/init.cc\n@@ -82,6 +82,7 @@ struct lang_flags\n char extended_numbers;\n char extended_identifiers;\n char c11_identifiers;\n+ char xid_identifiers;\n char std;\n char digraphs;\n char uliterals;\n@@ -102,31 +103,31 @@ struct lang_flags\n };\n \n static const struct lang_flags lang_defaults[] =\n-{ /* c99 c++ xnum xid c11 std digr ulit rlit udlit bincst digsep trig u8chlit vaopt scope dfp szlit elifdef warndir delim trufal */\n- /* GNUC89 */ { 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0 },\n- /* GNUC99 */ { 1, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0 },\n- /* GNUC11 */ { 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0 },\n- /* GNUC17 */ { 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0 },\n- /* GNUC2X */ { 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 0, 1 },\n- /* STDC89 */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },\n- /* STDC94 */ { 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },\n- /* STDC99 */ { 1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },\n- /* STDC11 */ { 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },\n- /* STDC17 */ { 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },\n- /* STDC2X */ { 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0, 1 },\n- /* GNUCXX */ { 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1 },\n- /* CXX98 */ { 0, 1, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1 },\n- /* GNUCXX11 */ { 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1 },\n- /* CXX11 */ { 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1 },\n- /* GNUCXX14 */ { 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1 },\n- /* CXX14 */ { 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1 },\n- /* GNUCXX17 */ { 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1 },\n- /* CXX17 */ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1 },\n- /* GNUCXX20 */ { 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1 },\n- /* CXX20 */ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1 },\n- /* GNUCXX23 */ { 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1 },\n- /* CXX23 */ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1 },\n- /* ASM */ { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }\n+{ /* c99 c++ xnum xid c11 xidid std digr ulit rlit udlit bincst digsep trig u8chlit vaopt scope dfp szlit elifdef warndir delim trufal */\n+ /* GNUC89 */ { 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0 },\n+ /* GNUC99 */ { 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0 },\n+ /* GNUC11 */ { 1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0 },\n+ /* GNUC17 */ { 1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0 },\n+ /* GNUC2X */ { 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 0, 1 },\n+ /* STDC89 */ { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },\n+ /* STDC94 */ { 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },\n+ /* STDC99 */ { 1, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },\n+ /* STDC11 */ { 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },\n+ /* STDC17 */ { 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },\n+ /* STDC2X */ { 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0, 1 },\n+ /* GNUCXX */ { 0, 1, 1, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1 },\n+ /* CXX98 */ { 0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1 },\n+ /* GNUCXX11 */ { 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1 },\n+ /* CXX11 */ { 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1 },\n+ /* GNUCXX14 */ { 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1 },\n+ /* CXX14 */ { 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1 },\n+ /* GNUCXX17 */ { 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1 },\n+ /* CXX17 */ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1 },\n+ /* GNUCXX20 */ { 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1 },\n+ /* CXX20 */ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1 },\n+ /* GNUCXX23 */ { 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1 },\n+ /* CXX23 */ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1 },\n+ /* ASM */ { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }\n };\n \n /* Sets internal flags correctly for a given language. */\n@@ -142,6 +143,7 @@ cpp_set_lang (cpp_reader *pfile, enum c_lang lang)\n CPP_OPTION (pfile, extended_numbers)\t\t = l->extended_numbers;\n CPP_OPTION (pfile, extended_identifiers)\t = l->extended_identifiers;\n CPP_OPTION (pfile, c11_identifiers)\t\t = l->c11_identifiers;\n+ CPP_OPTION (pfile, xid_identifiers)\t\t = l->xid_identifiers;\n CPP_OPTION (pfile, std)\t\t\t = l->std;\n CPP_OPTION (pfile, digraphs)\t\t\t = l->digraphs;\n CPP_OPTION (pfile, uliterals)\t\t\t = l->uliterals;\ndiff --git a/libcpp/lex.cc b/libcpp/lex.cc\nindex a429a3d44ce..cc12a52d282 100644\n--- a/libcpp/lex.cc\n+++ b/libcpp/lex.cc\n@@ -2007,7 +2 100 23019 100 22867 100 152 465k 3166 --:--:-- --:--:-- --:--:-- 468k 007,8 @@ name_p (cpp_reader *pfile, const cpp_string *string)\n static void\n warn_about_normalization (cpp_reader *pfile, \n \t\t\t const cpp_token *token,\n-\t\t\t const struct normalize_state *s)\n+\t\t\t const struct normalize_state *s,\n+\t\t\t bool identifier)\n {\n if (CPP_OPTION (pfile, warn_normalize) < NORMALIZE_STATE_RESULT (s)\n && !pfile->state.skipping)\n@@ -2043,7 +2044,7 @@ warn_about_normalization (cpp_reader *pfile,\n if (NORMALIZE_STATE_RESULT (s) == normalized_C)\n \tcpp_warning_at (pfile, CPP_W_NORMALIZE, &rich_loc,\n \t\t\t\"`%.*s' is not in NFKC\", (int) sz, buf);\n- else if (CPP_OPTION (pfile, cplusplus))\n+ else if (identifier && CPP_OPTION (pfile, xid_identifiers))\n \tcpp_pedwarning_at (pfile, CPP_W_NORMALIZE, &rich_loc,\n \t\t\t\t \"`%.*s' is not in NFC\", (int) sz, buf);\n else\n@@ -3839,7 +3840,7 @@ _cpp_lex_direct (cpp_reader *pfile)\n \tstruct normalize_state nst = INITIAL_NORMALIZE_STATE;\n \tresult->type = CPP_NUMBER;\n \tlex_number (pfile, &result->val.str, &nst);\n-\twarn_about_normalization (pfile, result, &nst);\n+\twarn_about_normalization (pfile, result, &nst, false);\n \tbreak;\n }\n \n@@ -3888,7 +3889,7 @@ _cpp_lex_direct (cpp_reader *pfile)\n \tresult->val.node.node = lex_identifier (pfile, buffer->cur - 1, false,\n \t\t\t\t\t\t&nst,\n \t\t\t\t\t\t&result->val.node.spelling);\n-\twarn_about_normalization (pfile, result, &nst);\n+\twarn_about_normalization (pfile, result, &nst, true);\n }\n \n /* Convert named operators to their proper types. */\n@@ -4101,7 +4102,7 @@ _cpp_lex_direct (cpp_reader *pfile)\n \t struct normalize_state nst = INITIAL_NORMALIZE_STATE;\n \t result->type = CPP_NUMBER;\n \t lex_number (pfile, &result->val.str, &nst);\n-\t warn_about_normalization (pfile, result, &nst);\n+\t warn_about_normalization (pfile, result, &nst, false);\n \t}\n else if (*buffer->cur == '.' && buffer->cur[1] == '.')\n \tbuffer->cur += 2, result->type = CPP_ELLIPSIS;\n@@ -4192,7 +4193,7 @@ _cpp_lex_direct (cpp_reader *pfile)\n \t result->type = CPP_NAME;\n \t result->val.node.node = lex_identifier (pfile, base, true, &nst,\n \t\t\t\t\t\t &result->val.node.spelling);\n-\t warn_about_normalization (pfile, result, &nst);\n+\t warn_about_normalization (pfile, result, &nst, true);\n \t break;\n \t }\n \n","prefixes":["committed"]}+ exit 1 Build step 'Execute shell' marked build as failure Finished: FAILURE