From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2062.outbound.protection.outlook.com [40.107.21.62]) by sourceware.org (Postfix) with ESMTPS id 177F73858C5E for ; Mon, 2 Oct 2023 12:39:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 177F73858C5E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=arm.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BgFWQKRePCQ+I188qpMn8BiwDS69CL2jjUO4TrrnEgA=; b=IhQzIKZQvgeUllfgzaaA9/fSDfNkfkvpZBRWSyk02wQoPtT8R3iTkktS2C8Az+N7Iz7pE5QjoJVXV/TVcc/SjCumuzEDKHm78bwLEmeHY7ZvLmLnvuVj1P9CZHti/yuw1UJkjWy6s3ttNu36IZRxybhXqmv0GWu89Cr35qzxmu8= Received: from DB3PR08CA0016.eurprd08.prod.outlook.com (2603:10a6:8::29) by VI1PR08MB5438.eurprd08.prod.outlook.com (2603:10a6:803:12e::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.28; Mon, 2 Oct 2023 12:39:13 +0000 Received: from DBAEUR03FT003.eop-EUR03.prod.protection.outlook.com (2603:10a6:8:0:cafe::ec) by DB3PR08CA0016.outlook.office365.com (2603:10a6:8::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.30 via Frontend Transport; Mon, 2 Oct 2023 12:39:13 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; pr=C Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DBAEUR03FT003.mail.protection.outlook.com (100.127.142.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.20 via Frontend Transport; Mon, 2 Oct 2023 12:39:13 +0000 Received: ("Tessian outbound ab4fc72d2cd4:v211"); Mon, 02 Oct 2023 12:39:13 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 70fadc6bf77bd0ce X-CR-MTA-TID: 64aa7808 Received: from e7f1634b9ae3.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 62956598-5C61-4AA5-911A-779721EE47EA.1; Mon, 02 Oct 2023 12:39:06 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id e7f1634b9ae3.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 02 Oct 2023 12:39:06 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GSr4tnZEwQfm7HqIGrAtOguH2vWOOtUbFDbHmdv7AP47+Z6vaBbJvsnNbbsnSV4wKg+ZWs8oOGRXS7q0V1Fm9AV13PTJ6PxvyL5hXz6Se3sYG6TFoXrSVF6C60Bp5SYUW8g9HW5A4MTfNE8odopcFEMoBJNRqfekGdrBK7pke9E+m87Ca2CopMvHt5a1//ArmQA0ejKM6hxcU9cCHx1y2uzUrCg5DpADuz/z1FdIYRaDojiA6U7OLjo0C5QBkAbdWUP88iaABORS87PEq195P3unFozZHZKhK7pmA20js9NCsG0sorxJb/f/KOhMyZEAerfM/Le+B07MrhgpQxIsgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=BgFWQKRePCQ+I188qpMn8BiwDS69CL2jjUO4TrrnEgA=; b=UeF1byG9Gf9Up4Mo0p8w8PZUPcYHQNrGyrX+3VmNZXIvNNuyqLClJTMQVP83m8WAq8M8gHpccVBWrvhVN8NV5xER5mDSswGUgWkMS7XfUZc706mBih+kylM3ej0ilbYOl4FWY4CtBdIHR5rjFs5P2JdhYO3P6aXTzxkQbC/DF99jYxZuXZ+7c36E1vaCfkafnxiuuIFVtvb2B5p83XfJb4NHFifZSXx4NWKDJv/yFgjw8No7htuhbOlVsLzkCvYChCQAvhSCqPESh3fEgTF9evv/iWfXDW0IcYLS8dX3xFP2oqCQmL3SW1uxWzctWlkKU2F20of2rZAVa5YXIfSYFw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BgFWQKRePCQ+I188qpMn8BiwDS69CL2jjUO4TrrnEgA=; b=IhQzIKZQvgeUllfgzaaA9/fSDfNkfkvpZBRWSyk02wQoPtT8R3iTkktS2C8Az+N7Iz7pE5QjoJVXV/TVcc/SjCumuzEDKHm78bwLEmeHY7ZvLmLnvuVj1P9CZHti/yuw1UJkjWy6s3ttNu36IZRxybhXqmv0GWu89Cr35qzxmu8= Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; Received: from VI1PR08MB5325.eurprd08.prod.outlook.com (2603:10a6:803:13e::17) by DU0PR08MB9557.eurprd08.prod.outlook.com (2603:10a6:10:44e::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.26; Mon, 2 Oct 2023 12:39:02 +0000 Received: from VI1PR08MB5325.eurprd08.prod.outlook.com ([fe80::662f:8e26:1bf8:aaa1]) by VI1PR08MB5325.eurprd08.prod.outlook.com ([fe80::662f:8e26:1bf8:aaa1%7]) with mapi id 15.20.6813.027; Mon, 2 Oct 2023 12:39:02 +0000 Date: Mon, 2 Oct 2023 13:38:53 +0100 From: Tamar Christina To: gcc-patches@gcc.gnu.org Cc: nd@arm.com, jakub@redhat.com, jwakely@redhat.com Subject: [PATCH]middle-end: Recursively check is_trivially_copyable_or_pair in vec.h Message-ID: Content-Type: multipart/mixed; boundary="wFfVnpQN7fv+C+Pl" Content-Disposition: inline X-ClientProxiedBy: SA1P222CA0128.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:3c2::10) To VI1PR08MB5325.eurprd08.prod.outlook.com (2603:10a6:803:13e::17) MIME-Version: 1.0 X-MS-TrafficTypeDiagnostic: VI1PR08MB5325:EE_|DU0PR08MB9557:EE_|DBAEUR03FT003:EE_|VI1PR08MB5438:EE_ X-MS-Office365-Filtering-Correlation-Id: b465df75-aeff-4c3f-5288-08dbc3449545 x-checkrecipientrouted: true NoDisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: Oid5/0BNoIQhcEoTYT9tOo3SAX0ooCHalitDHxnZZ4OPBRlvzWFoRDS4NvzX1qSjxcJSwGYx2JURjuuySAI3G2u14D3VASTw70KoInTbttf7qEwwritF63q1M/iSTHJImzgd3Gig8RPAIlRJSl5jnw8B5jF3ohJMa1VadL+/2aJUoL6+2XxtQOceKVh5fYOMIJdzG+bSUZXEy66rL7xJOJTBhqclguXXKiCf6QOy/1p3PRUX3gKfSqB70J+w4RaF2FjrEuiTedKWuc9jjK9Kp8Zuy31QiTiznuJSSf/JnDecvUiLdQKt7cqfVPO7bd4B3MgCChimKoroRHGxl0A6TV3NlZq8Ys9pt9k9ar0HQoIt26qrmA3GWBROgD6+ER/TPDeFT8I0Xq3dmcnTWulLMn9Mw3tNyV6x/HyDv7J81Yq3lbrx7C+2vu2AWsSCYBxh1Q35Ae9y7w9/jucsOfkNREreeEVLzagyDMRrwApF1Y/DBFcpiuurBxH2vKnr2nJIoTQNqTAr3YJnWFF9cZoaLi3jPjc371sM3MNb2ZgNuIeskQWr84BQzEl8/nk0v8LTB5vWTIKWoHt3AyYpPvQiTl5Q/5mhPF8iVZVoHl3VU20n7cbig+4jOLgmjS6igUgg1hKPEABD7zkZnhCywXeb1g== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR08MB5325.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376002)(346002)(366004)(396003)(39860400002)(136003)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(44144004)(33964004)(6506007)(6512007)(2616005)(83380400001)(478600001)(44832011)(8676002)(2906002)(6666004)(66946007)(6916009)(66556008)(5660300002)(41300700001)(26005)(235185007)(8936002)(66476007)(316002)(38100700002)(86362001)(4326008)(36756003)(6486002)(4216001)(2700100001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR08MB9557 Original-Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DBAEUR03FT003.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: f535e168-77f8-454c-3ff4-08dbc3448e5f X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4Z/EG8MhUOg4XQykM+fz0ZRtWAY/4Zm6ujNZVSs4LkCD+IugLvgwRL1lbf3JU1oJBuHLAZbvzI7fW0fM0jJmoSa5GQprmQ0mtjkCdEOfQ7MQBeqinI5i1OqQ/KS6nn+I7NLnazQdh8h5rta07PfVIbye9baK7R3sTJiL5lLXfTRcxC1qLxqHcfa+DK/nivBX4qTQ5+eGHgwRaAw6VQ2cbNGs4LzY8L/ehnb52AMG2Xxhtz429l6o4W4jQe9ei3w21VMgMw/bmPFg7cPbFL1/Dcho2xAvW2SAFZThJw6mKJZT3S53k8qk5yG6p2pLkTjsbHArSmekj0/SnWlp/YPHEFr6iPc/da5iYkHPKqVZo6GbYfyGWrYf0N0/5xuY08einmTCDnhZdY2/NzTYSmqZqDv5SIqG3Gm+RG04YzQ/vyOz3u/Ru7Em6uRcj+YXlP1N/6jhuCzE2cPKj6NAkmrvRfKaU9BULByEAsyTas1uYJyf9hVp1VU/FDJeDlFNJd0b5gBQ/0xUcB1AGPnkJt1mtiLmQCzfbMTr1EPY67IXpOhQcyzoiJucCLbH80MgrvzkcYpO6ZjLb9t9sqi5TX4/ghRKLljQR2Ma/tFbzKuyxJ08WDxaDLQecwx57rzmoIEvS6LF26lekvvy0QxW/mbLtfNIBgn3peo72o08fB32GdflZHvUc1dooYaWs6yorAWbsnhzJ+0yAe5I88ax6bmWDCHGtid1uX0dUwFu7wCWfemyglGnVNbB+PYJ22SW9cm1aNC6lcAE5m3gZCQAvHSR8Q== X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(13230031)(4636009)(396003)(376002)(136003)(39850400004)(346002)(230922051799003)(186009)(451199024)(64100799003)(82310400011)(1800799009)(36840700001)(46966006)(6916009)(107886003)(2616005)(33964004)(336012)(44144004)(6486002)(82740400003)(6506007)(26005)(6666004)(6512007)(81166007)(86362001)(47076005)(478600001)(356005)(36860700001)(70586007)(44832011)(83380400001)(235185007)(316002)(2906002)(8676002)(4326008)(70206006)(8936002)(41300700001)(36756003)(5660300002)(40480700001)(4216001)(2700100001);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Oct 2023 12:39:13.2285 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b465df75-aeff-4c3f-5288-08dbc3449545 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: DBAEUR03FT003.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB5438 X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,FORGED_SPF_HELO,GIT_PATCH_0,KAM_DMARC_NONE,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE,TXREP,UNPARSEABLE_RELAY 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: --wFfVnpQN7fv+C+Pl Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Hi All, I recently committed a patch that uses a nested std::pair in the second argument. It temporarily adds a second ranking variable for sorting and then later drops it. This hits the newly added assert in vec.h. This assert made some relaxation for std::pair but doesn't allow this case through. The patch allows a recursive std::pair in the second argument which fixes bootstrap. It should also still maintain the invariant that was being tested here since the nested arguments should still be trivially copyable. Bootstrapped on aarch64-none-linux-gnu, x86_64-linux-gnu, and no issues. Ok for master? Thanks, Tamar gcc/ChangeLog: vec.h (struct is_trivially_copyable_or_pair): Check recursively in second arg. --- inline copy of patch -- diff --git a/gcc/vec.h b/gcc/vec.h index d509639292b..dcc18c99bfb 100644 --- a/gcc/vec.h +++ b/gcc/vec.h @@ -1199,7 +1199,7 @@ namespace vec_detail template struct is_trivially_copyable_or_pair > : std::integral_constant::value - && std::is_trivially_copyable::value> { }; + && is_trivially_copyable_or_pair::value> { }; } #endif -- --wFfVnpQN7fv+C+Pl Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="rb17792.patch" diff --git a/gcc/vec.h b/gcc/vec.h index d509639292b..dcc18c99bfb 100644 --- a/gcc/vec.h +++ b/gcc/vec.h @@ -1199,7 +1199,7 @@ namespace vec_detail template struct is_trivially_copyable_or_pair > : std::integral_constant::value - && std::is_trivially_copyable::value> { }; + && is_trivially_copyable_or_pair::value> { }; } #endif --wFfVnpQN7fv+C+Pl--