Author: Vlad Serebrennikov Date: 2024-06-21T13:49:04+04:00 New Revision: aed989157ddcdaaf3fea295c449f23dffe327ae5
URL: https://github.com/llvm/llvm-project/commit/aed989157ddcdaaf3fea295c449f23dffe327ae5 DIFF: https://github.com/llvm/llvm-project/commit/aed989157ddcdaaf3fea295c449f23dffe327ae5.diff LOG: [clang] Cover CWG issues about `export template` (#94876) This PR covers the following Core issues: [CWG204](https://cplusplus.github.io/CWG/issues/204.html) "Exported class templates" [CWG323](https://cplusplus.github.io/CWG/issues/323.html) "Where must `export` appear?" [CWG335](https://cplusplus.github.io/CWG/issues/335.html) "Allowing `export` on template members of nontemplate classes" [CWG820](https://cplusplus.github.io/CWG/issues/820.html) "Deprecation of `export`" I believe the list above is entirety of Core issues that are dedicated solely to `export template`. I believe we have two main points of view here, which command what this PR should do: 1. (easy) Removal of `export template` was done as a defect report in CWG820, and the rest are effectively superseded by it, because we apply defect reports retroactively. 2. (harder) Those Core issues are testable individually, so we should test them for the behavior Core wanted at the time. This PR implements the first option, making our C++ DR status page greener. I think I can be persuaded to go with the second option, if reviewers have strong preference for it. Added: Modified: clang/test/CXX/drs/cwg2xx.cpp clang/test/CXX/drs/cwg3xx.cpp clang/test/CXX/drs/cwg8xx.cpp clang/www/cxx_dr_status.html Removed: ################################################################################ diff --git a/clang/test/CXX/drs/cwg2xx.cpp b/clang/test/CXX/drs/cwg2xx.cpp index 99916dea9a912..926cb19596026 100644 --- a/clang/test/CXX/drs/cwg2xx.cpp +++ b/clang/test/CXX/drs/cwg2xx.cpp @@ -41,7 +41,7 @@ namespace cwg202 { // cwg202: 3.1 template struct X<f>; } -// FIXME (export) cwg204: no +// cwg204: sup 820 namespace cwg206 { // cwg206: yes struct S; // #cwg206-S diff --git a/clang/test/CXX/drs/cwg3xx.cpp b/clang/test/CXX/drs/cwg3xx.cpp index 94227dc031c6a..a10ed95941ba4 100644 --- a/clang/test/CXX/drs/cwg3xx.cpp +++ b/clang/test/CXX/drs/cwg3xx.cpp @@ -377,7 +377,7 @@ namespace cwg322 { // cwg322: 2.8 int &s = a; } -// cwg323: no +// cwg323: sup 820 namespace cwg324 { // cwg324: 3.6 struct S { int n : 1; } s; // #cwg324-n @@ -587,7 +587,7 @@ namespace cwg334 { // cwg334: yes template void f<S>(); } -// cwg335: no +// cwg335: sup 820 namespace cwg336 { // cwg336: yes namespace Pre { diff --git a/clang/test/CXX/drs/cwg8xx.cpp b/clang/test/CXX/drs/cwg8xx.cpp index eba601300584d..c8cbdfcee3f4d 100644 --- a/clang/test/CXX/drs/cwg8xx.cpp +++ b/clang/test/CXX/drs/cwg8xx.cpp @@ -1,14 +1,19 @@ -// RUN: %clang_cc1 -std=c++98 -triple x86_64-unknown-unknown %s -verify=expected -fexceptions -fcxx-exceptions -pedantic-errors -// RUN: %clang_cc1 -std=c++11 -triple x86_64-unknown-unknown %s -verify=expected,since-cxx11 -fexceptions -fcxx-exceptions -pedantic-errors -// RUN: %clang_cc1 -std=c++14 -triple x86_64-unknown-unknown %s -verify=expected,since-cxx11 -fexceptions -fcxx-exceptions -pedantic-errors -// RUN: %clang_cc1 -std=c++17 -triple x86_64-unknown-unknown %s -verify=expected,since-cxx11 -fexceptions -fcxx-exceptions -pedantic-errors -// RUN: %clang_cc1 -std=c++20 -triple x86_64-unknown-unknown %s -verify=expected,since-cxx11 -fexceptions -fcxx-exceptions -pedantic-errors -// RUN: %clang_cc1 -std=c++23 -triple x86_64-unknown-unknown %s -verify=expected,since-cxx11 -fexceptions -fcxx-exceptions -pedantic-errors -// RUN: %clang_cc1 -std=c++2c -triple x86_64-unknown-unknown %s -verify=expected,since-cxx11 -fexceptions -fcxx-exceptions -pedantic-errors +// RUN: %clang_cc1 -std=c++98 -triple x86_64-unknown-unknown %s -verify=expected,cxx98-17 -fexceptions -fcxx-exceptions -pedantic-errors +// RUN: %clang_cc1 -std=c++11 -triple x86_64-unknown-unknown %s -verify=expected,cxx98-17,since-cxx11 -fexceptions -fcxx-exceptions -pedantic-errors +// RUN: %clang_cc1 -std=c++14 -triple x86_64-unknown-unknown %s -verify=expected,cxx98-17,since-cxx11 -fexceptions -fcxx-exceptions -pedantic-errors +// RUN: %clang_cc1 -std=c++17 -triple x86_64-unknown-unknown %s -verify=expected,cxx98-17,since-cxx11 -fexceptions -fcxx-exceptions -pedantic-errors +// RUN: %clang_cc1 -std=c++20 -triple x86_64-unknown-unknown %s -verify=expected,since-cxx20,since-cxx11 -fexceptions -fcxx-exceptions -pedantic-errors +// RUN: %clang_cc1 -std=c++23 -triple x86_64-unknown-unknown %s -verify=expected,since-cxx20,since-cxx11 -fexceptions -fcxx-exceptions -pedantic-errors +// RUN: %clang_cc1 -std=c++2c -triple x86_64-unknown-unknown %s -verify=expected,since-cxx20,since-cxx11 -fexceptions -fcxx-exceptions -pedantic-errors -#if __cplusplus == 199711L -// expected-no-diagnostics -#endif +namespace cwg820 { // cwg820: 2.7 +export template <class T> struct B {}; +// cxx98-17-warning@-1 {{exported templates are unsupported}} +// since-cxx20-error@-2 {{export declaration can only be used within a module purview}} +export template<typename T> void f() {} +// cxx98-17-warning@-1 {{exported templates are unsupported}} +// since-cxx20-error@-2 {{export declaration can only be used within a module purview}} +} namespace cwg873 { // cwg873: 3.0 #if __cplusplus >= 201103L diff --git a/clang/www/cxx_dr_status.html b/clang/www/cxx_dr_status.html index 7b61f47d834da..1b523cf12854c 100755 --- a/clang/www/cxx_dr_status.html +++ b/clang/www/cxx_dr_status.html @@ -1269,7 +1269,7 @@ <h2 id="cxxdr">C++ defect report implementation status</h2> <td><a href="https://cplusplus.github.io/CWG/issues/204.html";>204</a></td> <td>CD1</td> <td>Exported class templates</td> - <td class="none" align="center">No</td> + <td class="full-superseded" align="center">Superseded by <a href="#820">820</a></td> </tr> <tr class="open" id="205"> <td><a href="https://cplusplus.github.io/CWG/issues/205.html";>205</a></td> @@ -1985,7 +1985,7 @@ <h2 id="cxxdr">C++ defect report implementation status</h2> <td><a href="https://cplusplus.github.io/CWG/issues/323.html";>323</a></td> <td>CD1</td> <td>Where must <TT>export</TT> appear?</td> - <td class="none" align="center">No</td> + <td class="full-superseded" align="center">Superseded by <a href="#820">820</a></td> </tr> <tr id="324"> <td><a href="https://cplusplus.github.io/CWG/issues/324.html";>324</a></td> @@ -2057,7 +2057,7 @@ <h2 id="cxxdr">C++ defect report implementation status</h2> <td><a href="https://cplusplus.github.io/CWG/issues/335.html";>335</a></td> <td>CD1</td> <td>Allowing <TT>export</TT> on template members of nontemplate classes</td> - <td class="none" align="center">No</td> + <td class="full-superseded" align="center">Superseded by <a href="#820">820</a></td> </tr> <tr id="336"> <td><a href="https://cplusplus.github.io/CWG/issues/336.html";>336</a></td> @@ -4921,7 +4921,7 @@ <h2 id="cxxdr">C++ defect report implementation status</h2> <td><a href="https://cplusplus.github.io/CWG/issues/820.html";>820</a></td> <td>CD2</td> <td>Deprecation of <TT>export</TT></td> - <td class="unknown" align="center">Unknown</td> + <td class="full" align="center">Clang 2.7</td> </tr> <tr id="822"> <td><a href="https://cplusplus.github.io/CWG/issues/822.html";>822</a></td> _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
