From nobody Wed Dec 22 10:05:38 2021 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 7BE0E1904F74; Wed, 22 Dec 2021 10:05:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JJpqT43k3z4YNQ; Wed, 22 Dec 2021 10:05:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CA7691B072; Wed, 22 Dec 2021 10:05:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BMA5cKQ091628; Wed, 22 Dec 2021 10:05:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BMA5cqJ091627; Wed, 22 Dec 2021 10:05:38 GMT (envelope-from git) Date: Wed, 22 Dec 2021 10:05:38 GMT Message-Id: <202112221005.1BMA5cqJ091627@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 77396775753d - stable/12 - Reapply r344852: List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 77396775753d244fd3dee6b1920faf942d42536b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640167542; 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; bh=ehk5fLaahX7zTLyvJw5hqUSu/hzfLJqwpTpKzr0KqfQ=; b=V1xYvHtaD+PphhuIqxrWvbTFoVEOJmCPn14x6LhTZqeBPWFBBu2bnZMyWdM42xLY1cZq5a uSErMahahQWRy1QQREScbi0GCDzwDaLluAEb+Ju4/QihwG/rNdqDA8ei7DV153ZRTEXEPB iIsJ4MbXwENUsMM9WefAGHhPhDQztlnqAVnBrUhSUKM2FS+AT9LGf1vxr4B2JpvzwFVIBd GTi/WgCBq6M1g43UfbQIFTipk7/jSdxL6CRQ5HMNn7aeVvko6HWw9e4J5eAE6E8BekuQ/g 4svUXuJ4XNVvyZEaV0Ipge0fVDinON7X+sbUxgXNjUbRtbCbyQnkANUqvdLGoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640167542; a=rsa-sha256; cv=none; b=RXND0gZyzfKyUJRv6iz/Siwm+y4lZKC2ksclO9BxFX+1bRJQn4zDwrwVALWDqMRS2mB6Dz xVoM18qecPFlxTL+RgI2TtgZevQtEG8D/sv5wZ8uBosIahWJzEuxrKuNaAbXXRV3oQeLW0 hoT/sc5ABgOPlnLDDDQ9sSQ/2gfwWQ8gWSLG8PPQ9YinlKUM10+8XS85iXf1/4rj+N/w/W Z+z7t0Ouuuq4WiTNpWJMjQ2hIUc5Wah5cGTPZ2vh1Ci0+mFr5QwQSGANBLEC88YG/n0UOW LvnnNMEE7dp3RE7qQgdO3naNCrIGTsraoJJ1rZracQpiD81HfpuJVdwDsM/Z7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=77396775753d244fd3dee6b1920faf942d42536b commit 77396775753d244fd3dee6b1920faf942d42536b Author: Dimitry Andric AuthorDate: 2020-08-06 16:27:24 +0000 Commit: Dimitry Andric CommitDate: 2021-12-22 09:58:18 +0000 Reapply r344852: Put in a temporary workaround for what is likely a gcc 6 bug (it does not occur with gcc 7 or later). This should prevent the following error from breaking the head-amd64-gcc CI builds: In file included from /workspace/src/contrib/llvm/tools/lldb/source/API/SBMemoryRegionInfo.cpp:14:0: /workspace/src/contrib/llvm/tools/lldb/include/lldb/Target/MemoryRegionInfo.h:128:54: error: 'template lldb_private::MemoryRegionInfos::MemoryRegionInfos(_InputIterator, _InputIterator, const allocator_type&)' inherited from 'std::__1::vector' using std::vector::vector; ^~~~~~ /workspace/src/contrib/llvm/tools/lldb/include/lldb/Target/MemoryRegionInfo.h:128:54: error: conflicts with version inherited from 'std::__1::vector' Reported by: CI (cherry picked from commit 4beee107921198ecca69a26d70533b36e96bb21c) --- contrib/llvm-project/lldb/include/lldb/Target/MemoryRegionInfo.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/llvm-project/lldb/include/lldb/Target/MemoryRegionInfo.h b/contrib/llvm-project/lldb/include/lldb/Target/MemoryRegionInfo.h index a22da8d72b83..9f089b4b0083 100644 --- a/contrib/llvm-project/lldb/include/lldb/Target/MemoryRegionInfo.h +++ b/contrib/llvm-project/lldb/include/lldb/Target/MemoryRegionInfo.h @@ -126,7 +126,7 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, // Forward-declarable wrapper. class MemoryRegionInfos : public std::vector { public: - using std::vector::vector; + //using std::vector::vector; }; }