From patchwork Fri Jul 12 13:08:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathaniel Shead X-Patchwork-Id: 1959847 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=S/tRKMKG; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WLBkr1ZVKz1xqx for ; Fri, 12 Jul 2024 23:09:24 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id AE06C383433A for ; Fri, 12 Jul 2024 13:09:21 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [IPv6:2607:f8b0:4864:20::636]) by sourceware.org (Postfix) with ESMTPS id 6688F38323DB for ; Fri, 12 Jul 2024 13:08:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6688F38323DB 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 6688F38323DB Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::636 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1720789738; cv=none; b=GB2Mxd/qVXuQjoKoCHj5joaM3QRCXxBcURtbt7d9d73Lqi5qEcwdX/j3ePmCoMd+AndWX0IvhOt8/8zs3m+ea7H/ahUxBGBTAppkl6enNWf0YTbC06tdv1mtyF52hoFIAGtQtIbEZmIiRX8g01pTVOYX0wO57CIYdbu6JnpQMM4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1720789738; c=relaxed/simple; bh=RWgzkWX3NKlPx/bknsXsLZt8/qDY7+qtoNHqzcCyasw=; h=DKIM-Signature:Message-ID:Date:From:To:Subject:MIME-Version; b=AprODlrswWpRLZDJpGBdrRUr7qY0VFzPZw+mVJsZEUq3nzoyPTi1r0/8zxupvWxuuxr/7KspF9rKPpbIhEVusvfZIEar1TDFrYI7Gqrcr0CArU1xMQ9CKPLXUH8u8Kbxy/Pe5F47impHY5PVF1N16VRLwwtrrQ0CSi3St1AALhc= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-1fb0d88fd25so14963295ad.0 for ; Fri, 12 Jul 2024 06:08:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720789735; x=1721394535; darn=gcc.gnu.org; h=content-disposition:mime-version:subject:cc:to:from:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=8Sq/9V6u+yGMWWcgtLzwYtg3Bs1sIOGH4VxsJ28GqNc=; b=S/tRKMKGxKwLQd7SGr9KQD0pjahX8zV5gZ/TG6DR1CaBZ6lF4BltkjvLtaxaf0bfFl dZ/ymFRqHymhfCRQ8cXFac5dTJgNqH93RXd8p3mFvW1i4e1V4IV1De5SRsBWRk4t2Xmo bUmF7ZHuNo/9QcvI4XVXSlTWsIPb7Rt9cLmH4eEGId5MwnYkNIbYevhLxc5lPAryx22P Q10zAh535tdl/wA4PJjUPL3zbEJX93MFJL3GL30ob3cDbacUYvVTVvAQtFBdLZWn/GCC uqZbnl2gDy5rAu66Lz7RJcWi3diFDelW02hWd5xqERxlFshYCkC6rLUTtZSsC/An1Rox BGWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720789735; x=1721394535; h=content-disposition:mime-version:subject:cc:to:from:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=8Sq/9V6u+yGMWWcgtLzwYtg3Bs1sIOGH4VxsJ28GqNc=; b=RdsFlNLJtKdHkdJSXEIuvWuGB7lN3kOewknbOXLOIN+JI7cZL/YqyrmpLpE3iiolzL qRMr2ebsD30acbxW9+B2aXL7qjIAIIgfoM7xVFO27y0VHq/dyuI0fOQJSsyn+74Jusi7 WCnLT07b2mNUqAGCJRBcsJ53yjPbJT86de9KVGj4p6/B615khXgKGQgSDZ+6QXJ43WuX IE8P9pA6gS/HD0HVOUmx3blbveEPTwga7HXrpAxqamXG3F09+MqkGm3fgJaLllIvjEd5 G990lYPcp7WmNZCaw88OMRS2962NHpo58+qKJJgomcrrxWQKBWhbtvCOA1L5PV3BdKyD Wn4A== X-Gm-Message-State: AOJu0YxsVwaQeAVQBLH5HyUwCqsTSUdYlPBZuI+EKXs5Zd9OkD287pNK 1GHDom8TmnHBj66LnZrOFv1ODvXMzYCN5I6vp+kK3RmJnkk7kJxLTc/q2g== X-Google-Smtp-Source: AGHT+IEBrMSwJnnjzPW5gAVFAp3lH5RMDkUeETvv2s9oDwKL9UhmuIBhOwrz+Lkb1qGsIF5PpfNawg== X-Received: by 2002:a17:902:f547:b0:1fa:ce44:1cb3 with SMTP id d9443c01a7336-1fbf0803b4bmr45801535ad.0.1720789735128; Fri, 12 Jul 2024 06:08:55 -0700 (PDT) Received: from Thaum. (125-209-140-42.tpgi.com.au. [125.209.140.42]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1fbb6a12a24sm66701325ad.34.2024.07.12.06.08.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jul 2024 06:08:54 -0700 (PDT) Message-ID: <66912ae6.170a0220.65583.c92e@mx.google.com> X-Google-Original-Message-ID: Date: Fri, 12 Jul 2024 23:08:49 +1000 From: Nathaniel Shead To: gcc-patches@gcc.gnu.org Cc: Jason Merrill Subject: [committed] c++/modules: Add testcase for fixed issue with usings [PR115798] MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org Tested on x86_64-pc-linux-gnu, pushing to trunk. -- >8 -- This issue was fixed by r15-2003-gd6bf4b1c932211, but seems worth adding to the testsuite. PR c++/115798 gcc/testsuite/ChangeLog: * g++.dg/modules/using-26_a.C: New test. * g++.dg/modules/using-26_b.C: New test. * g++.dg/modules/using-26_c.C: New test. Signed-off-by: Nathaniel Shead --- gcc/testsuite/g++.dg/modules/using-26_a.C | 15 +++++++++++++++ gcc/testsuite/g++.dg/modules/using-26_b.C | 10 ++++++++++ gcc/testsuite/g++.dg/modules/using-26_c.C | 9 +++++++++ 3 files changed, 34 insertions(+) create mode 100644 gcc/testsuite/g++.dg/modules/using-26_a.C create mode 100644 gcc/testsuite/g++.dg/modules/using-26_b.C create mode 100644 gcc/testsuite/g++.dg/modules/using-26_c.C diff --git a/gcc/testsuite/g++.dg/modules/using-26_a.C b/gcc/testsuite/g++.dg/modules/using-26_a.C new file mode 100644 index 00000000000..adab83d4243 --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/using-26_a.C @@ -0,0 +1,15 @@ +// PR c++/115798 +// { dg-additional-options "-fmodules-ts" } +// { dg-module-cmi base } + +module; +#include +export module base; + +export { + using ::int8_t; +} + +export namespace std { + using std::int8_t; +} diff --git a/gcc/testsuite/g++.dg/modules/using-26_b.C b/gcc/testsuite/g++.dg/modules/using-26_b.C new file mode 100644 index 00000000000..06ed599df41 --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/using-26_b.C @@ -0,0 +1,10 @@ +// PR c++/115798 +// { dg-additional-options "-fmodules-ts" } +// { dg-module-cmi xstd } + +export module xstd; +import base; + +export namespace std { + using std::int8_t; +} diff --git a/gcc/testsuite/g++.dg/modules/using-26_c.C b/gcc/testsuite/g++.dg/modules/using-26_c.C new file mode 100644 index 00000000000..68f45cacb82 --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/using-26_c.C @@ -0,0 +1,9 @@ +// PR c++/115798 +// { dg-additional-options "-fmodules-ts" } + +import xstd; +import base; + +int main() { + static_assert(__is_same(int8_t, std::int8_t)); +}