From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by sourceware.org (Postfix) with ESMTPS id 8F0393858D37; Sun, 17 Mar 2024 16:52:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8F0393858D37 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 8F0393858D37 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::531 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710694360; cv=none; b=DAnRVXwzSTXXY27VxLWFZFdY+JlJ7Y/fzkC6DNk1XEyrAo9/E8rMa3nLxwc7Flynl58nuAHGW0ayOkbP/GW/VdZlMOyl3wqUuYob9byWZOmjFux4xjaCUem1Ds7mQeSFstZiDDYV9wjhDpHVnMlEd1FIJmU17fHZW0Bjz2IGM70= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710694360; c=relaxed/simple; bh=f275GKrlhggJG//SGPumQWVgEA+LdeOQcVaxzHYFW6Y=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=N4CLNCKEO4ht2PwBGi7mLzJUoTAEakGS/KxcjajNa91xj5L9mgLogqaZPIGz7HaST8ADq5maTMD7HrWGMxU4VTyx3lCikqMC6+G74pfmP6wfJuQA/cSztLrcO/7YRpttJy/moQp1z7If/MAspRwMlwRh0SvenEK9tVZNKNwqkhw= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-ed1-x531.google.com with SMTP id 4fb4d7f45d1cf-56a0c0a7ebcso194651a12.1; Sun, 17 Mar 2024 09:52:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710694357; x=1711299157; 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=XYFxMxGZtFFfTuAMLglYCzoi9/zQpPzZ9mxHnTJ9h8A=; b=Mibw14k8yFD8GT/iS0q47MJikW4K7+WGem8LwwqXquWuewKkMdvWhN88Nyxs/zNppf 58Z9zAn79Omo0xvNjtp4n/M+vjxdjfv3Ww2ka6J03KbiSZGjgDPWlVz+61SorKUSEbTE Kqm3xolWaihVZy+REODEEG+AE8eoqnnBaJtl5oW9RZmGH5raeijfU+reA6OhqHssAq7f 9rBNR6aWOkymMIzufc+LaZNgnIZD66FJnbwZGKaUwY8yNP/SLknCN7K8w0ZAAXugtWJX NbHswjvXa/V9SBvRPgiO4O8kibzq5JnB+Ibg/pIY85efC5bPLv/M5cN7is/Ol7M8RGEV TkTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710694357; x=1711299157; 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=XYFxMxGZtFFfTuAMLglYCzoi9/zQpPzZ9mxHnTJ9h8A=; b=AGBAX1IauEM+0oJd14Z0/OTnafRGZgRqsh9bbkcXEMJfrWF9HECHEAkGvw3uIVcF9W +v9mqwC5QOrqjss2hMPVqA5UzxatGObEv2taVzCLCuDbpBCL1XTIDWxUDMS4qTP6jl6R GOrIMYCBHRNSMMSRzVVtX6h3937WlVV6o3zMWhdBvALDNhAXqb05o2QLfl9wlHA+MzoX Mg4awni1mJCrbg+4tkjw6y4+2feMCZmBhfiV+r3DNyirxTuMheQYmZa/EIpzchauxOFS MYhbXe9E0QvklMjs+YtpIdqUsQTMO0XbuGW2wBoraiCs/hOryEZwRelPBd39JXL5G9wJ r/xQ== X-Forwarded-Encrypted: i=1; AJvYcCWxwH/N9cidTEgw+y4lF9kJsxAMPFxec2V79z8xFy8XZfgE5ieTbCykxtPmzWeRIYUgcz3W4w6WYJgvNQrcZpf9q2RimZkpUgItJHphAB1JVzntNWZ9rV11FdBOd9g1 X-Gm-Message-State: AOJu0Yw28FAdlYtGWfZrzhodAl/9OoMXaakCOeJwHQItOvfqPqKX7yrU gXe5I6n/906YDgRvcovIitreEhRkEMsZvPGWICGrKIktaCduWKnhKjAxJlZFU0I= X-Google-Smtp-Source: AGHT+IEqoyNp1DcrTIBUaoINlVsGopQDQbIl+LXrHqrodMKshzRkkPiJGu3/CiH1O2wg169yeLiYsA== X-Received: by 2002:a17:907:a0cc:b0:a46:5de3:43c7 with SMTP id hw12-20020a170907a0cc00b00a465de343c7mr7125816ejc.12.1710694357008; Sun, 17 Mar 2024 09:52:37 -0700 (PDT) Received: from [10.47.1.13] ([89.207.171.78]) by smtp.gmail.com with ESMTPSA id d26-20020a1709067f1a00b00a46a643b6fbsm1811399ejr.15.2024.03.17.09.52.35 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 17 Mar 2024 09:52:35 -0700 (PDT) Content-Type: multipart/mixed; boundary="------------5yiBEyl0C90NW8POE2ZAX0Wc" Message-ID: Date: Sun, 17 Mar 2024 17:52:34 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: _LIBCXX_DEBUG value initialized singular iterators assert failures in std algorithms [PR104316] To: Jonathan Wakely Cc: Jonathan Wakely , libstdc++ , gcc-patches References: <73AC0523-2237-46FD-9885-7AE3F8663DF2@gmail.com> <28CE4FD1-FFB0-4300-81CA-C3CB07E436A6@gmail.com> <19f5939a-9341-4237-90d9-4f1279f03a88@gmail.com> <2f29d2f2-a21b-42bb-997f-3918935d0dba@gmail.com> Content-Language: en-US From: =?UTF-8?Q?Fran=C3=A7ois_Dumont?= In-Reply-To: X-Spam-Status: No, score=-5.7 required=5.0 tests=BAYES_00,BODY_8BITS,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,RCVD_IN_ABUSEAT,RCVD_IN_DNSWL_NONE,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE,URI_HEX 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. --------------5yiBEyl0C90NW8POE2ZAX0Wc Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit > > OK for trunk, thanks! > > I think this is OK to backport to 13 too. > > Maybe after this we can define the __cpp_lib_null_itetators macro for > debug mode? > After this fix of local_iterator I think we can indeed. In fact the added 11316.cc was already passing for unordered_set<>::local_iterator but simply because we were missing the singular check. Both issues solved with this patch. I found the version.def file to cleanup but no idea how to regenerate version.h from it so I'll let you do it, ok ?     libstdc++: Fix _Safe_local_iterator<>::_M_valid_range     Unordered container local_iterator range shall not contain any singular     iterator unless both iterators are value-initialized.     libstdc++-v3/ChangeLog:             * include/debug/safe_local_iterator.tcc             (_Safe_local_iterator::_M_valid_range): Add _M_value_initialized and             _M_singular checks.             * testsuite/23_containers/unordered_set/debug/114316.cc: New test case. Ok to commit ? François --------------5yiBEyl0C90NW8POE2ZAX0Wc Content-Type: text/plain; charset=UTF-8; name="safe_local_iterator.txt" Content-Disposition: attachment; filename="safe_local_iterator.txt" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL2xpYnN0ZGMrKy12My9pbmNsdWRlL2RlYnVnL3NhZmVfbG9jYWxfaXRl cmF0b3IudGNjIGIvbGlic3RkYysrLXYzL2luY2x1ZGUvZGVidWcvc2FmZV9sb2NhbF9pdGVy YXRvci50Y2MKaW5kZXggOTBlNjBlMzdjMzIuLjZkNTQ2ZWMwNDBjIDEwMDY0NAotLS0gYS9s aWJzdGRjKystdjMvaW5jbHVkZS9kZWJ1Zy9zYWZlX2xvY2FsX2l0ZXJhdG9yLnRjYworKysg Yi9saWJzdGRjKystdjMvaW5jbHVkZS9kZWJ1Zy9zYWZlX2xvY2FsX2l0ZXJhdG9yLnRjYwpA QCAtNzgsNyArNzgsMTMgQEAgbmFtZXNwYWNlIF9fZ251X2RlYnVnCiAgICAgX01fdmFsaWRf cmFuZ2UoY29uc3QgX1NhZmVfbG9jYWxfaXRlcmF0b3ImIF9fcmhzLAogCQlzdGQ6OnBhaXI8 ZGlmZmVyZW5jZV90eXBlLCBfRGlzdGFuY2VfcHJlY2lzaW9uPiYgX19kaXN0KSBjb25zdAog ICAgIHsKLSAgICAgIGlmICghX01fY2FuX2NvbXBhcmUoX19yaHMpKQorICAgICAgaWYgKF9N X3ZhbHVlX2luaXRpYWxpemVkKCkgJiYgX19yaHMuX01fdmFsdWVfaW5pdGlhbGl6ZWQoKSkK Kwl7CisJICBfX2Rpc3QgPSB7IDAsIF9fZHBfZXhhY3QgfTsKKwkgIHJldHVybiB0cnVlOwor CX0KKworICAgICAgaWYgKF9NX3Npbmd1bGFyKCkgfHwgX19yaHMuX01fc2luZ3VsYXIoKSB8 fCAhX01fY2FuX2NvbXBhcmUoX19yaHMpKQogCXJldHVybiBmYWxzZTsKIAogICAgICAgaWYg KGJ1Y2tldCgpICE9IF9fcmhzLmJ1Y2tldCgpKQpkaWZmIC0tZ2l0IGEvbGlic3RkYysrLXYz L3Rlc3RzdWl0ZS8yM19jb250YWluZXJzL3Vub3JkZXJlZF9zZXQvZGVidWcvMTE0MzE2LmNj IGIvbGlic3RkYysrLXYzL3Rlc3RzdWl0ZS8yM19jb250YWluZXJzL3Vub3JkZXJlZF9zZXQv ZGVidWcvMTE0MzE2LmNjCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw Li40MWI2NDlhOWNiZAotLS0gL2Rldi9udWxsCisrKyBiL2xpYnN0ZGMrKy12My90ZXN0c3Vp dGUvMjNfY29udGFpbmVycy91bm9yZGVyZWRfc2V0L2RlYnVnLzExNDMxNi5jYwpAQCAtMCww ICsxLDI4IEBACisvLyB7IGRnLWRvIHJ1biB7IHRhcmdldCBjKysxMSB9IH0KKy8vIHsgZGct cmVxdWlyZS1kZWJ1Zy1tb2RlICIiIH0KKworLy8gUFIgbGlic3RkYysrLzExNDMxNgorCisj aW5jbHVkZSA8dW5vcmRlcmVkX3NldD4KKyNpbmNsdWRlIDxhbGdvcml0aG0+CisKKyNpbmNs dWRlIDx0ZXN0c3VpdGVfaG9va3MuaD4KKwordm9pZCB0ZXN0MDEoKQoreworICBzdGQ6OnVu b3JkZXJlZF9zZXQ8aW50Pjo6aXRlcmF0b3IgaXR7fTsKKyAgVkVSSUZZKCBzdGQ6OmZpbmQo aXQsIGl0LCAwKSA9PSBpdCApOworfQorCit2b2lkIHRlc3QwMigpCit7CisgIHN0ZDo6dW5v cmRlcmVkX3NldDxpbnQ+Ojpsb2NhbF9pdGVyYXRvciBpdHt9OworICBWRVJJRlkoIHN0ZDo6 ZmluZChpdCwgaXQsIDApID09IGl0ICk7Cit9CisKK2ludCBtYWluKCkKK3sKKyAgdGVzdDAx KCk7CisgIHRlc3QwMigpOworICByZXR1cm4gMDsKK30K --------------5yiBEyl0C90NW8POE2ZAX0Wc--