From patchwork Tue Oct 4 16:46:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 1695 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp216095wrs; Tue, 4 Oct 2022 09:49:03 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7WM6u5dG5DtEux+a4Hl3WZHfzTgHk8O+KBndperKl+BvDo9yLDi8BXXkrATPwBgJFtTUO7 X-Received: by 2002:a05:6402:2554:b0:450:28d2:2152 with SMTP id l20-20020a056402255400b0045028d22152mr24665085edb.303.1664902143847; Tue, 04 Oct 2022 09:49:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664902143; cv=none; d=google.com; s=arc-20160816; b=LLhrc2xIYcIbLmsjkt9QSGGDayHWAqtlaitiYkgWlBzbX0EgXbfogSQOsNlC8LxVi9 kBHR4NV1SLs9BFnbzlkXEPQRq4qGPTHr7AB+Vp0bVoFwLxZ09yBGY1ANDwZr1nR/BU6r WBJX9exhV9sruw6KoFuwgZCDiKObUdJcMdQlARzof8EAlM50sUqtpywYbPzzEZenE3Dp 6XJ04goZd+a9I4kHU6OZCgA9+yiEVYYjaA4fgcmCtKJ1rujw6/CKq0emIlPZczA/uQZU pHpu2kM03bX5GKcjApcmvtIQp7lbk5XW2VvdXpzf9/hDfTbCB5QUi/NXAecsdb86FOZe FHFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:to :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=gB2R2GvcX+0zBVQFUCI1UvCsY/vy7QPMSAFwnlev3us=; b=vflebTlmOFe2yPAP++WZ2X5EXtxGQUtalGl7fB8k7NaCVGI0gvd/4BFp6voR5OmOXN +cSuN3RuKpKCswR/C5xmgGyp8pJOs5JcLbgFu7RExd9qxIAqDwzCka2iCGigHbkxzuWl U6eXR5XnznBCcc3ZiqkCBum7sANpCztiCwS9fIoNjIt/fVgayHMwldUW8D/6R5L6pKrV dVfLdbGwzIiM3hxltpSCs2BNeMDkc2TAjokzN1ZJOuXkf5wy83kksw3Rq3OUIs3reN0v PB4pKjeJl0qS2lf9wZPwdtJMcjUDWX8Kc1R463qPhHAE8exK6Xqfc6Xsy8tyJaO/ApMo N71w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=PyibmXBW; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id he41-20020a1709073da900b00782d3ab55e5si12939227ejc.737.2022.10.04.09.49.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Oct 2022 09:49:03 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=PyibmXBW; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F0BEE385AC2F for ; Tue, 4 Oct 2022 16:47:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F0BEE385AC2F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1664902078; bh=gB2R2GvcX+0zBVQFUCI1UvCsY/vy7QPMSAFwnlev3us=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=PyibmXBWC36ty2HT10hqPDn/BNyEmoX0YBbXDS4I04iAVVYQmm3yFT+d1FxdqbeZ7 9PIL0YI0KvZoA9lIv8CU7/aOTvu3GF0v7fkOyNdAhcxqi3eAR6QeZY3SYez59Gb2EU qv3YLyFRhA5JGvVSIs+GacwgEc6Dtt0rW0hZ1Vaw= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 98A373858016 for ; Tue, 4 Oct 2022 16:46:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 98A373858016 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-605-b3R98sNWM_y-cjkX0cEs2w-1; Tue, 04 Oct 2022 12:46:39 -0400 X-MC-Unique: b3R98sNWM_y-cjkX0cEs2w-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CBCF6100F7F3; Tue, 4 Oct 2022 16:46:38 +0000 (UTC) Received: from localhost (unknown [10.33.36.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 92F051121314; Tue, 4 Oct 2022 16:46:38 +0000 (UTC) To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Fix test FAIL for old std::string ABI Date: Tue, 4 Oct 2022 17:46:37 +0100 Message-Id: <20221004164637.558771-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on 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: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jonathan Wakely via Gcc-patches From: Jonathan Wakely 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?1745776430165991722?= X-GMAIL-MSGID: =?utf-8?q?1745776430165991722?= Tested powerpc64le-linux. Pushed to trunk. -- >8 -- libstdc++-v3/ChangeLog: * testsuite/std/ranges/adaptors/join_with/1.cc: Remove unused #include -#include -#include +#include #include #include @@ -73,7 +72,10 @@ test03() return true; } -constexpr bool +#if _GLIBCXX_USE_CXX11_ABI +constexpr +#endif +bool test04() { std::string rs[] = {"a", "", "b", "", "c"}; @@ -93,5 +95,9 @@ main() static_assert(test01()); static_assert(test02()); static_assert(test03()); +#if _GLIBCXX_USE_CXX11_ABI static_assert(test04()); +#else + VERIFY(test04()); +#endif }