From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qt1-x834.google.com (mail-qt1-x834.google.com [IPv6:2607:f8b0:4864:20::834]) by sourceware.org (Postfix) with ESMTPS id D45EB3858D33 for ; Mon, 16 Oct 2023 03:55:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D45EB3858D33 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=berkeley.edu Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=berkeley.edu ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D45EB3858D33 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::834 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1697428549; cv=none; b=ChF6MRsa0Q947A8QKUNzgsj5COrMCWweJuAJZthOOAQxAoMZ/NuQpgN1Oj03oVFSyzi5s8pmIu5xBlZv5jmCGYdHjD9Ltz5UZVkS8IDbv4C9OH1aPW5yG4/UHajuSWi0/zLiGfNUmTYV2D5a5vNosODpdt7UPvwK1AlTxWptVDw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1697428549; c=relaxed/simple; bh=PX5tDCgFfQxGi44FNBwpSqyjbNFeD0ctQa1BvMm9pOE=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=piONWiEt1oU70YSjdC+i2UUi9agH5A8JtOIqWp2fwH6iiRkVxEnHocvGgVWaP8cPkUJwAw1lx9vzhb3RdWzEv7hbaciRCPLJhoMRS7EqjyFryN5iOwFOX1NVcuqu1c0vHoxFamtsc7JFQs8cLYlqCRqyABhOH285Z+fHfGP9NpE= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-qt1-x834.google.com with SMTP id d75a77b69052e-41b2bf4e9edso44276021cf.1 for ; Sun, 15 Oct 2023 20:55:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=berkeley.edu; s=google; t=1697428547; x=1698033347; darn=gcc.gnu.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=Sr1Lo1md0UDA6ZNDflnLOn/1H8RpL0pGB9C/O6NCVho=; b=kw6YXWwI2wh/77ugAOjblOZnUdVKN0GMXnbhxeHc71gUSTn8+ee0R1JTo4978wAcBu LEHOna9Z2+RuJR7Wbho+CxmGH59JxYyL4UVqToru9OwQSSkFguVtJdLp2zH6hzl7993e Q2ukoHSFp9m5GSVRWWKfvCgPEYIpEG7wUqkvbsGpLSXPtQDei3/DFQKgDQHYutdz0onG PqivHg1R39goF7T/++HlmpN58FjQ04y49DJlOdfnPGmiZWPmi12AJVO+G0xK2KiibZuD 6g5LBiIZKDlNIf0pqr2CRRHXUpAcO3UV0SOPgHK4QMvVIcfEG5nWCrgNZ8/PhqJysIFI kKlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697428547; x=1698033347; h=content-transfer-encoding:cc:to:subject:message-id:date:from :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Sr1Lo1md0UDA6ZNDflnLOn/1H8RpL0pGB9C/O6NCVho=; b=XF/Yn6wbPijko1rxrS0Z0vVgSqGC6KEleYSzGgFIA9DHhky0dzltIc0+LUAA0wa0ZB uW0rOV27sTJWvF2jTI0JRjVw2W9/W34K/njDiLQvbZetCtNUOEdHGW8/BRs3qPwiByNH xPfopvFOi32oXwiiju/2JZfwhBrauVMz/24LN8nHMGtOAgohBQ4dMe3y+5rC07JFnh+Q 8bjSv3vKGFmdjADTjJJQndTzYmSoNvihH6Nb8MyPt+YQd0mwrtND0hdnC6Z1qqycektk /OyFHpE/nk1rHpAj9WmNQXLyZcbLTRZYIAjJzUEAvKAsUDF6X0bh6EEkYbLUbNORW57W 701A== X-Gm-Message-State: AOJu0YwhBdPbpVgW5MlbNjYp8mdeNaW4bzJ2Tt0BEX3MlvbIX1FrY5y9 DN2TOSmREumXdVrgL2rQBG8VYFMw4vnfne9O1aWiot3T427DDaG3HQ== X-Google-Smtp-Source: AGHT+IH3zog99zZHhsM7viQDARvIKFh6h7K5jSbRgbHIL7z/Y0AB8rU/9zPb9keUPn4gTtldJY8fijXBX4S7pY3h9Dg= X-Received: by 2002:ac8:7f02:0:b0:40f:d56b:6f8e with SMTP id f2-20020ac87f02000000b0040fd56b6f8emr7571769qtk.28.1697428546970; Sun, 15 Oct 2023 20:55:46 -0700 (PDT) MIME-Version: 1.0 From: Benjamin Acker Brock Date: Sun, 15 Oct 2023 20:55:36 -0700 Message-ID: Subject: [PATCH v2] libstdc++: Workaround for LLVM-61763 in ranges To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, jwakely.gcc@gmail.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-13.0 required=5.0 tests=BAYES_00,DKIMWL_WL_MED,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,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: > I don't think this patch counts as legally significant, but if you contri= bute again in future you should be aware of https://gcc.gnu.org/contribute.= html#legal and either complete the copyright assignment paperwork, or add a= DCO sign-off to the commit message. Thanks for the reminder. I just added a sign-off. > This should be a complete sentence, so capital letter and full stop. Fixed! --- Signed-off-by: Benjamin Brock libstdc++-v3/ChangeLog: * include/std/ranges: Implement workaround for LLVM-61763 in zip_view and adjacency_view. --- diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ran= ges index 1d529a886be..7893e3a84c9 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -4632,6 +4632,9 @@ namespace views::__adaptor class zip_view<_Vs...>::_Iterator : public __detail::__zip_view_iter_cat<_Const, _Vs...> { +#ifdef __clang__ // LLVM-61763 workaround + public: +#endif __detail::__tuple_or_pair_t>...> _M_current; constexpr explicit @@ -4652,11 +4655,13 @@ namespace views::__adaptor return input_iterator_tag{}; } +#ifndef __clang__ // LLVM-61763 workaround template requires (view<_Ws> && ...) && (sizeof...(_Ws) > 0) && is_object_v<_= Fp> && regular_invocable<_Fp&, range_reference_t<_Ws>...> && std::__detail::__can_reference...>> friend class zip_transform_view; +#endif public: // iterator_category defined in __zip_view_iter_cat @@ -5327,6 +5332,9 @@ namespace views::__adaptor template class adjacent_view<_Vp, _Nm>::_Iterator { +#ifdef __clang__ // LLVM-61763 workaround + public: +#endif using _Base =3D __detail::__maybe_const_t<_Const, _Vp>; array, _Nm> _M_current =3D array, = _Nm>(); @@ -5367,12 +5375,14 @@ namespace views::__adaptor friend class adjacent_view; +#ifndef __clang__ // LLVM-61763 workaround template requires view<_Wp> && (_Mm > 0) && is_object_v<_Fp> && regular_invocable<__detail::__unarize<_Fp&, _Mm>, range_reference_t<_Wp>> && std::__detail::__can_reference, range_reference_t<_Wp>>> friend class adjacent_transform_view; +#endif public: using iterator_category =3D input_iterator_tag;