Skip to content

Commit 6ab7662

Browse files
EndilllEndilll
authored
[clang][NFC] Refactor expected directives in C++ DRs 100-199 (#74061)
This patch continues the work started with ea5b1ef. See that commit and its corresponding PR for details.
1 parent 6e3b2cb commit 6ab7662

File tree

2 files changed

+458
-279
lines changed

2 files changed

+458
-279
lines changed

‎clang/test/CXX/drs/dr0xx.cpp‎

Lines changed: 24 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,11 @@ namespace dr7 { // dr7: 3.4
8989
class B : virtual private A {}; // #dr7-B
9090
class C : public B {} c; // #dr7-C
9191
// expected-error@#dr7-C {{inherited virtual base class 'A' has private destructor}}
92-
// expected-note@#dr7-C {{in implicit default constructor for 'dr7::C' first required here}}
93-
// expected-note@#dr7-B {{declared private here}}
94-
92+
// expected-note@#dr7-C {{in implicit default constructor for 'dr7::C' first required here}}
93+
// expected-note@#dr7-B {{declared private here}}
9594
// expected-error@#dr7-C {{inherited virtual base class 'A' has private destructor}}
96-
// expected-note@#dr7-C {{in implicit destructor for 'dr7::C' first required here}}
97-
// expected-note@#dr7-B {{declared private here}}
95+
// expected-note@#dr7-C {{in implicit destructor for 'dr7::C' first required here}}
96+
// expected-note@#dr7-B {{declared private here}}
9897
class VeryDerivedC : public B, virtual public A {} vdc;
9998

10099
class X { ~X(); }; // #dr7-X
@@ -237,11 +236,10 @@ namespace dr16 { // dr16: 2.8
237236
// expected-note@#dr16-A-f-decl {{member is declared here}}
238237
A::f(); // #dr16-A-f-call
239238
// expected-error@#dr16-A-f-call {{'A' is a private member of 'dr16::A'}}
240-
// expected-note@#dr16-B {{constrained by implicitly private inheritance here}}
241-
// expected-note@#dr16-A {{member is declared here}}
242-
239+
// expected-note@#dr16-B {{constrained by implicitly private inheritance here}}
240+
// expected-note@#dr16-A {{member is declared here}}
243241
// expected-error@#dr16-A-f-call {{cannot cast 'dr16::C' to its private base class 'dr16::A'}}
244-
// expected-note@#dr16-B {{implicitly declared private here}}
242+
// expected-note@#dr16-B {{implicitly declared private here}}
245243
}
246244
};
247245
}
@@ -361,9 +359,9 @@ namespace dr26 { // dr26: yes
361359
// FIXME: In C++98, we diagnose this twice.
362360
B(const B &, B = B());
363361
// cxx98-14-error@-1 {{recursive evaluation of default argument}}
364-
// cxx98-14-note@-2 {{default argument used here}}
362+
// cxx98-14-note@-2 {{default argument used here}}
365363
// cxx98-error@-3 {{recursive evaluation of default argument}}
366-
// cxx98-note@-4 {{default argument used here}}
364+
// cxx98-note@-4 {{default argument used here}}
367365
};
368366
struct C {
369367
static C &f();
@@ -788,23 +786,20 @@ namespace dr49 { // dr49: 2.8
788786
A<&k> a;
789787
A<p> b; // #dr49-b
790788
// cxx98-error@#dr49-b {{non-type template argument referring to object 'p' with internal linkage is a C++11 extension}}
791-
// cxx98-note@#dr49-p {{non-type template argument refers to object here}}
792-
789+
// cxx98-note@#dr49-p {{non-type template argument refers to object here}}
793790
// cxx98-14-error@#dr49-b {{non-type template argument for template parameter of pointer type 'int *' must have its address taken}}
794-
// cxx98-14-note@#dr49-A {{template parameter is declared here}}
791+
// cxx98-14-note@#dr49-A {{template parameter is declared here}}
795792
int *q = &k; // #dr49-q
796793
A<q> c; // #dr49-c
797794
// cxx98-error@#dr49-c {{non-type template argument for template parameter of pointer type 'int *' must have its address taken}}
798-
// cxx98-note@#dr49-A {{template parameter is declared here}}
799-
795+
// cxx98-note@#dr49-A {{template parameter is declared here}}
800796
// cxx11-14-error@#dr49-c {{non-type template argument of type 'int *' is not a constant expression}}
801-
// cxx11-14-note@#dr49-c {{read of non-constexpr variable 'q' is not allowed in a constant expression}}
802-
// cxx11-14-note@#dr49-q {{declared here}}
803-
// cxx11-14-note@#dr49-A {{template parameter is declared here}}
804-
797+
// cxx11-14-note@#dr49-c {{read of non-constexpr variable 'q' is not allowed in a constant expression}}
798+
// cxx11-14-note@#dr49-q {{declared here}}
799+
// cxx11-14-note@#dr49-A {{template parameter is declared here}}
805800
// since-cxx17-error@#dr49-c {{non-type template argument is not a constant expression}}
806-
// since-cxx17-note@#dr49-c {{read of non-constexpr variable 'q' is not allowed in a constant expression}}
807-
// since-cxx17-note@#dr49-q {{declared here}}
801+
// since-cxx17-note@#dr49-c {{read of non-constexpr variable 'q' is not allowed in a constant expression}}
802+
// since-cxx17-note@#dr49-q {{declared here}}
808803
}
809804

810805
namespace dr50 { // dr50: yes
@@ -835,11 +830,10 @@ namespace dr52 { // dr52: 2.8
835830
int k = b.A::n; // #dr52-k
836831
// FIXME: This first diagnostic is very strangely worded, and seems to be bogus.
837832
// expected-error@#dr52-k {{'A' is a private member of 'dr52::A'}}
838-
// expected-note@#dr52-B {{constrained by private inheritance here}}
839-
// expected-note@#dr52-A {{member is declared here}}
840-
833+
// expected-note@#dr52-B {{constrained by private inheritance here}}
834+
// expected-note@#dr52-A {{member is declared here}}
841835
// expected-error@#dr52-k {{cannot cast 'struct B' to its private base class 'dr52::A'}}
842-
// expected-note@#dr52-B {{declared private here}}
836+
// expected-note@#dr52-B {{declared private here}}
843837
}
844838

845839
namespace dr53 { // dr53: yes
@@ -1171,8 +1165,7 @@ namespace dr76 { // dr76: yes
11711165
const volatile int n = 1;
11721166
int arr[n]; // #dr76-vla
11731167
// expected-error@#dr76-vla {{variable length arrays in C++ are a Clang extension}}
1174-
// expected-note@#dr76-vla {{read of volatile-qualified type 'const volatile int' is not allowed in a constant expression}}
1175-
1168+
// expected-note@#dr76-vla {{read of volatile-qualified type 'const volatile int' is not allowed in a constant expression}}
11761169
// expected-error@#dr76-vla {{variable length array declaration not allowed at file scope}}
11771170
}
11781171

@@ -1346,8 +1339,7 @@ namespace dr92 { // dr92: 4 c++17
13461339
// since-cxx17-note@-2 {{use 'noexcept(false)' instead}}
13471340
void (*p)() throw(int) = &f; // #dr92-p
13481341
// since-cxx17-error@#dr92-p {{ISO C++17 does not allow dynamic exception specifications}}
1349-
// since-cxx17-note@#dr92-p {{use 'noexcept(false)' instead}}
1350-
1342+
// since-cxx17-note@#dr92-p {{use 'noexcept(false)' instead}}
13511343
// cxx98-14-error@#dr92-p {{target exception specification is not superset of source}}
13521344
// since-cxx17-warning@#dr92-p {{target exception specification is not superset of source}}
13531345
void (*q)() throw(int);
@@ -1363,11 +1355,11 @@ namespace dr92 { // dr92: 4 c++17
13631355
g(f);
13641356
// cxx98-14-error@-1 {{target exception specification is not superset of source}}
13651357
// since-cxx17-error@-2 {{no matching function for call to 'g'}}
1366-
// since-cxx17-note@#dr92-g {{candidate function not viable: no known conversion from 'void () throw(int, float)' to 'void (*)() throw()' for 1st argument}}
1358+
// since-cxx17-note@#dr92-g {{candidate function not viable: no known conversion from 'void () throw(int, float)' to 'void (*)() throw()' for 1st argument}}
13671359
g(q);
13681360
// cxx98-14-error@-1 {{target exception specification is not superset of source}}
13691361
// since-cxx17-error@-2 {{no matching function for call to 'g'}}
1370-
// since-cxx17-note@#dr92-g {{candidate function not viable: no known conversion from 'void (*)() throw(int)' to 'void (*)() throw()' for 1st argument}}
1362+
// since-cxx17-note@#dr92-g {{candidate function not viable: no known conversion from 'void (*)() throw(int)' to 'void (*)() throw()' for 1st argument}}
13711363
}
13721364

13731365
// Prior to C++17, this is OK because the exception specification is not

0 commit comments

Comments
 (0)