diff --git a/clang/test/CXX/drs/dr0xx.cpp b/clang/test/CXX/drs/dr0xx.cpp
--- a/clang/test/CXX/drs/dr0xx.cpp
+++ b/clang/test/CXX/drs/dr0xx.cpp
@@ -5,7 +5,8 @@
 // RUN: %clang_cc1 -std=c++20 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors -triple %itanium_abi_triple
 // RUN: %clang_cc1 -std=c++23 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors -triple %itanium_abi_triple
 
-namespace dr1 { // dr1: no
+//--- dr1: no
+namespace dr1 {
   namespace X { extern "C" void dr1_f(int a = 1); }
   namespace Y { extern "C" void dr1_f(int a = 1); }
   using X::dr1_f; using Y::dr1_f;
@@ -48,14 +49,16 @@
   }
 }
 
-namespace dr3 { // dr3: yes
+//--- dr3: yes
+namespace dr3 {
   template<typename T> struct A {};
   template<typename T> void f(T) { A<T> a; } // expected-note {{implicit instantiation}}
   template void f(int);
   template<> struct A<int> {}; // expected-error {{explicit specialization of 'dr3::A<int>' after instantiation}}
 }
 
-namespace dr4 { // dr4: yes
+//--- dr4: yes
+namespace dr4 {
   extern "C" {
     static void dr4_f(int) {}
     static void dr4_f(float) {}
@@ -64,7 +67,8 @@
   }
 }
 
-namespace dr5 { // dr5: yes
+//--- dr5: yes
+namespace dr5 {
   struct A {} a;
   struct B {
     B(const A&);
@@ -78,7 +82,8 @@
   const C c = e;
 }
 
-namespace dr7 { // dr7: yes
+//--- dr7: yes
+namespace dr7 {
   class A { public: ~A(); };
   class B : virtual private A {}; // expected-note 2 {{declared private here}}
   class C : public B {} c; // expected-error 2 {{inherited virtual base class 'A' has private destructor}} \
@@ -102,7 +107,8 @@
   }
 }
 
-namespace dr8 { // dr8: dup 45
+//--- dr8: dup 45
+namespace dr8 {
   class A {
     struct U;
     static const int k = 5;
@@ -114,7 +120,8 @@
   A::T<A::U, A::k, &A::f> *A::g() { return 0; }
 }
 
-namespace dr9 { // dr9: yes
+//--- dr9: yes
+namespace dr9 {
   struct B {
   protected:
     int m; // expected-note {{here}}
@@ -127,7 +134,8 @@
   int R2() { return n.m; }
 }
 
-namespace dr10 { // dr10: dup 45
+//--- dr10: dup 45
+namespace dr10 {
   class A {
     struct B {
       A::B *p;
@@ -135,7 +143,8 @@
   };
 }
 
-namespace dr11 { // dr11: yes
+//--- dr11: yes
+namespace dr11 {
   template<typename T> struct A : T {
     using typename T::U;
     U u;
@@ -148,7 +157,8 @@
   A<X> ax;
 }
 
-namespace dr12 { // dr12: sup 239
+//--- dr12: sup 239
+namespace dr12 {
   enum E { e };
   E &f(E, E = e);
   void g() {
@@ -160,7 +170,8 @@
   }
 }
 
-namespace dr13 { // dr13: no
+//--- dr13: no
+namespace dr13 {
   extern "C" void f(int);
   void g(char);
 
@@ -175,7 +186,8 @@
   int a4 = h(g);
 }
 
-namespace dr14 { // dr14: yes
+//--- dr14: yes
+namespace dr14 {
   namespace X { extern "C" int dr14_f(); }
   namespace Y { extern "C" int dr14_f(); }
   using namespace X;
@@ -196,12 +208,14 @@
   U u; // expected-error {{ambiguous}}
 }
 
-namespace dr15 { // dr15: yes
+//--- dr15: yes
+namespace dr15 {
   template<typename T> void f(int); // expected-note {{previous}}
   template<typename T> void f(int = 0); // expected-error {{default arguments cannot be added}}
 }
 
-namespace dr16 { // dr16: yes
+//--- dr16: yes
+namespace dr16 {
   class A { // expected-note {{here}}
     void f(); // expected-note {{here}}
     friend class C;
@@ -215,7 +229,8 @@
   };
 }
 
-namespace dr17 { // dr17: yes
+//--- dr17: yes
+namespace dr17 {
   class A {
     int n;
     int f();
@@ -230,7 +245,8 @@
 
 // dr18: sup 577
 
-namespace dr19 { // dr19: yes
+//--- dr19: yes
+namespace dr19 {
   struct A {
     int n; // expected-note {{here}}
   };
@@ -243,7 +259,8 @@
   };
 }
 
-namespace dr20 { // dr20: yes
+//--- dr20: yes
+namespace dr20 {
   class X {
   public:
     X();
@@ -254,7 +271,8 @@
   X x = f(); // expected-error {{private}}
 }
 
-namespace dr21 { // dr21: yes
+//--- dr21: yes
+namespace dr21 {
   template<typename T> struct A;
   struct X {
     template<typename T = int> friend struct A; // expected-error {{default template argument not permitted on a friend template}}
@@ -262,13 +280,15 @@
   };
 }
 
-namespace dr22 { // dr22: sup 481
+//--- dr22: sup 481
+namespace dr22 {
   template<typename dr22_T = dr22_T> struct X; // expected-error {{unknown type name 'dr22_T'}}
   typedef int T;
   template<typename T = T> struct Y;
 }
 
-namespace dr23 { // dr23: yes
+//--- dr23: yes
+namespace dr23 {
   template<typename T> void f(T, T); // expected-note {{candidate}}
   template<typename T> void f(T, int); // expected-note {{candidate}}
   void g() { f(0, 0); } // expected-error {{ambiguous}}
@@ -276,7 +296,8 @@
 
 // dr24: na
 
-namespace dr25 { // dr25: yes
+//--- dr25: yes
+namespace dr25 {
   struct A {
     void f() throw(int); // expected-error 0-1{{ISO C++17 does not allow}} expected-note 0-1{{use 'noexcept}}
   };
@@ -315,7 +336,8 @@
   }
 }
 
-namespace dr26 { // dr26: yes
+//--- dr26: yes
+namespace dr26 {
   struct A { A(A, const A & = A()); }; // expected-error {{must pass its first argument by reference}}
   struct B {
     B();
@@ -331,14 +353,16 @@
   };
 }
 
-namespace dr27 { // dr27: yes
+//--- dr27: yes
+namespace dr27 {
   enum E { e } n;
   E &m = true ? n : n;
 }
 
 // dr28: na lib
 
-namespace dr29 { // dr29: 3.4
+//--- dr29: 3.4
+namespace dr29 {
   void dr29_f0(); // expected-note {{here}}
   void g0() { void dr29_f0(); }
   extern "C++" void g0_cxx() { void dr29_f0(); }
@@ -383,7 +407,8 @@
   }
 }
 
-namespace dr30 { // dr30: sup 468 c++11
+//--- dr30: sup 468 c++11
+namespace dr30 {
   struct A {
     template<int> static int f();
   } a, *p = &a;
@@ -398,7 +423,8 @@
 #endif
 }
 
-namespace dr31 { // dr31: yes
+//--- dr31: yes
+namespace dr31 {
   class X {
   private:
     void operator delete(void*); // expected-note {{here}}
@@ -410,7 +436,8 @@
 
 // dr32: na
 
-namespace dr33 { // dr33: yes
+//--- dr33: yes
+namespace dr33 {
   namespace X { struct S; void f(void (*)(S)); } // expected-note {{candidate}}
   namespace Y { struct T; void f(void (*)(T)); } // expected-note {{candidate}}
   void g(X::S);
@@ -451,7 +478,8 @@
 // dr34: na
 // dr35: dup 178
 
-namespace dr36 { // dr36: yes
+//--- dr36: yes
+namespace dr36 {
 namespace example1 {
   namespace A {
     int i;
@@ -540,13 +568,15 @@
 
 // dr37: sup 475
 
-namespace dr38 { // dr38: yes
+//--- dr38: yes
+namespace dr38 {
   template<typename T> struct X {};
   template<typename T> X<T> operator+(X<T> a, X<T> b) { return a; }
   template X<int> operator+<int>(X<int>, X<int>);
 }
 
-namespace dr39 { // dr39: no
+//--- dr39: no
+namespace dr39 {
   namespace example1 {
     struct A { int &f(int); };
     struct B : A {
@@ -609,25 +639,29 @@
 
 // dr40: na
 
-namespace dr41 { // dr41: yes
+//--- dr41: yes
+namespace dr41 {
   struct S f(S);
 }
 
-namespace dr42 { // dr42: yes
+//--- dr42: yes
+namespace dr42 {
   struct A { static const int k = 0; };
   struct B : A { static const int k = A::k; };
 }
 
 // dr43: na
 
-namespace dr44 { // dr44: sup 727
+//--- dr44: sup 727
+namespace dr44 {
   struct A {
     template<int> void f();
     template<> void f<0>();
   };
 }
 
-namespace dr45 { // dr45: yes
+//--- dr45: yes
+namespace dr45 {
   class A {
     class B {};
     class C : B {};
@@ -635,12 +669,14 @@
   };
 }
 
-namespace dr46 { // dr46: yes
+//--- dr46: yes
+namespace dr46 {
   template<typename> struct A { template<typename> struct B {}; };
   template template struct A<int>::B<int>; // expected-error {{expected unqualified-id}}
 }
 
-namespace dr47 { // dr47: sup 329
+//--- dr47: sup 329
+namespace dr47 {
   template<typename T> struct A {
     friend void f() { T t; } // expected-error {{redefinition}} expected-note {{previous}}
   };
@@ -651,7 +687,8 @@
   void g() { f(); }
 }
 
-namespace dr48 { // dr48: yes
+//--- dr48: yes
+namespace dr48 {
   namespace {
     struct S {
       static const int m = 0;
@@ -667,7 +704,8 @@
   const int &c = S::o;
 }
 
-namespace dr49 { // dr49: yes
+//--- dr49: yes
+namespace dr49 {
   template<int*> struct A {}; // expected-note 0-2{{here}}
   int k;
 #if __has_feature(cxx_constexpr)
@@ -693,7 +731,8 @@
 #endif
 }
 
-namespace dr50 { // dr50: yes
+//--- dr50: yes
+namespace dr50 {
   struct X; // expected-note {{forward}}
   extern X *p;
   X *q = (X*)p;
@@ -703,7 +742,8 @@
   X *u = dynamic_cast<X*>(p); // expected-error {{incomplete}}
 }
 
-namespace dr51 { // dr51: yes
+//--- dr51: yes
+namespace dr51 {
   struct A {};
   struct B : A {};
   struct S {
@@ -713,7 +753,8 @@
   A &a = s;
 }
 
-namespace dr52 { // dr52: yes
+//--- dr52: yes
+namespace dr52 {
   struct A { int n; }; // expected-note {{here}}
   struct B : private A {} b; // expected-note 2{{private}}
   // FIXME: This first diagnostic is very strangely worded, and seems to be bogus.
@@ -721,12 +762,14 @@
   // expected-error@-1 {{cannot cast 'struct B' to its private base}}
 }
 
-namespace dr53 { // dr53: yes
+//--- dr53: yes
+namespace dr53 {
   int n = 0;
   enum E { e } x = static_cast<E>(n);
 }
 
-namespace dr54 { // dr54: yes
+//--- dr54: yes
+namespace dr54 {
   struct A { int a; } a;
   struct V { int v; } v;
   struct B : private A, virtual V { int b; } b; // expected-note 6{{private here}}
@@ -760,12 +803,14 @@
   int B::*cmbv = (int B::*)(&V::v); // expected-error {{virtual base}}
 }
 
-namespace dr55 { // dr55: yes
+//--- dr55: yes
+namespace dr55 {
   enum E { e = 5 };
   int test[(e + 1 == 6) ? 1 : -1];
 }
 
-namespace dr56 { // dr56: yes
+//--- dr56: yes
+namespace dr56 {
   struct A {
     typedef int T; // expected-note {{previous}}
     typedef int T; // expected-error {{redefinition}}
@@ -777,7 +822,8 @@
   };
 }
 
-namespace dr58 { // dr58: yes
+//--- dr58: yes
+namespace dr58 {
   // FIXME: Ideally, we should have a CodeGen test for this.
 #if __cplusplus >= 201103L
   enum E1 { E1_0 = 0, E1_1 = 1 };
@@ -788,7 +834,8 @@
 #endif
 }
 
-namespace dr59 { // dr59: yes
+//--- dr59: yes
+namespace dr59 {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-volatile"
   template<typename T> struct convert_to { operator T() const; };
@@ -827,14 +874,16 @@
 #pragma clang diagnostic pop
 }
 
-namespace dr60 { // dr60: yes
+//--- dr60: yes
+namespace dr60 {
   void f(int &);
   int &f(...);
   const int k = 0;
   int &n = f(k);
 }
 
-namespace dr61 { // dr61: yes
+//--- dr61: yes
+namespace dr61 {
   struct X {
     static void f();
   } x;
@@ -849,7 +898,8 @@
   void (*r)() = y.f; // expected-error {{cannot create a non-constant pointer to member function}}
 }
 
-namespace dr62 { // dr62: yes
+//--- dr62: yes
+namespace dr62 {
   struct A {
     struct { int n; } b;
   };
@@ -904,13 +954,15 @@
   }
 }
 
-namespace dr63 { // dr63: yes
+//--- dr63: yes
+namespace dr63 {
   template<typename T> struct S { typename T::error e; };
   extern S<int> *p;
   void *q = p;
 }
 
-namespace dr64 { // dr64: yes
+//--- dr64: yes
+namespace dr64 {
   template<class T> void f(T);
   template<class T> void f(T*);
   template<> void f(int*);
@@ -920,7 +972,8 @@
 
 // dr65: na
 
-namespace dr66 { // dr66: no
+//--- dr66: no
+namespace dr66 {
   namespace X {
     int f(int n); // expected-note 2{{candidate}}
   }
@@ -937,7 +990,8 @@
 
 // dr67: na
 
-namespace dr68 { // dr68: yes
+//--- dr68: yes
+namespace dr68 {
   template<typename T> struct X {};
   struct ::dr68::X<int> x1;
   struct ::dr68::template X<int> x2;
@@ -962,7 +1016,8 @@
   };
 }
 
-namespace dr69 { // dr69: yes
+//--- dr69: yes
+namespace dr69 {
   template<typename T> static void f() {} // #dr69-f
   // FIXME: Should we warn here?
   inline void g() { f<int>(); }
@@ -977,7 +1032,8 @@
 #endif
 }
 
-namespace dr70 { // dr70: yes
+//--- dr70: yes
+namespace dr70 {
   template<int> struct A {};
   template<int I, int J> int f(int (&)[I + J], A<I>, A<J>);
   int arr[7];
@@ -988,37 +1044,43 @@
 // dr72: dup 69
 
 #if __cplusplus >= 201103L
-namespace dr73 { // dr73: sup 1652
+//--- dr73: sup 1652
+namespace dr73 {
   int a, b;
   static_assert(&a + 1 != &b, ""); // expected-error {{not an integral constant expression}}
   // expected-note@-1 {{comparison against pointer '&a + 1' that points past the end of a complete object}}
 }
 #endif
 
-namespace dr74 { // dr74: yes
+//--- dr74: yes
+namespace dr74 {
   enum E { k = 5 };
   int (*p)[k] = new int[k][k];
 }
 
-namespace dr75 { // dr75: yes
+//--- dr75: yes
+namespace dr75 {
   struct S {
     static int n = 0; // expected-error {{non-const}}
   };
 }
 
-namespace dr76 { // dr76: yes
+//--- dr76: yes
+namespace dr76 {
   const volatile int n = 1;
   int arr[n]; // expected-error +{{variable length array}} expected-note {{read of volatile}}
 }
 
-namespace dr77 { // dr77: yes
+//--- dr77: yes
+namespace dr77 {
   struct A {
     struct B {};
     friend struct B;
   };
 }
 
-namespace dr78 { // dr78: sup ????
+//--- dr78: sup ????
+namespace dr78 {
   // Under DR78, this is valid, because 'k' has static storage duration, so is
   // zero-initialized.
   const int k; // expected-error {{default initialization of an object of const}}
@@ -1026,7 +1088,8 @@
 
 // dr79: na
 
-namespace dr80 { // dr80: yes
+//--- dr80: yes
+namespace dr80 {
   struct A {
     int A;
   };
@@ -1046,13 +1109,15 @@
 // dr81: na
 // dr82: dup 48
 
-namespace dr83 { // dr83: yes
+//--- dr83: yes
+namespace dr83 {
   int &f(const char*);
   char &f(char *);
   int &k = f("foo");
 }
 
-namespace dr84 { // dr84: yes
+//--- dr84: yes
+namespace dr84 {
   struct B;
   struct A { operator B() const; };
   struct C {};
@@ -1070,7 +1135,8 @@
 #endif
 }
 
-namespace dr85 { // dr85: yes
+//--- dr85: yes
+namespace dr85 {
   struct A {
     struct B;
     struct B {}; // expected-note{{previous declaration is here}}
@@ -1100,7 +1166,8 @@
 
 // dr86: dup 446
 
-namespace dr87 { // dr87: no
+//--- dr87: no
+namespace dr87 {
   // FIXME: Superseded by dr1975
   template<typename T> struct X {};
   // FIXME: This is invalid.
@@ -1109,7 +1176,8 @@
   X<void(void() throw())> y;
 }
 
-namespace dr88 { // dr88: yes
+//--- dr88: yes
+namespace dr88 {
   template<typename T> struct S {
     static const int a = 1; // expected-note {{previous}}
     static const int b;
@@ -1120,7 +1188,8 @@
 
 // dr89: na
 
-namespace dr90 { // dr90: yes
+//--- dr90: yes
+namespace dr90 {
   struct A {
     template<typename T> friend void dr90_f(T);
   };
@@ -1149,12 +1218,14 @@
   }
 }
 
-namespace dr91 { // dr91: yes
+//--- dr91: yes
+namespace dr91 {
   union U { friend int f(U); };
   int k = f(U());
 }
 
-namespace dr92 { // dr92: 4 c++17
+//--- dr92: 4 c++17
+namespace dr92 {
   void f() throw(int, float); // expected-error 0-1{{ISO C++17 does not allow}} expected-note 0-1{{use 'noexcept}}
   void (*p)() throw(int) = &f; // expected-error 0-1{{ISO C++17 does not allow}} expected-note 0-1{{use 'noexcept}}
 #if __cplusplus <= 201402L
@@ -1192,12 +1263,14 @@
 
 // dr93: na
 
-namespace dr94 { // dr94: yes
+//--- dr94: yes
+namespace dr94 {
   struct A { static const int n = 5; };
   int arr[A::n];
 }
 
-namespace dr95 { // dr95: yes
+//--- dr95: yes
+namespace dr95 {
   struct A;
   struct B;
   namespace N {
@@ -1212,7 +1285,8 @@
   struct B { void f() { N::C::f(); } }; // expected-error {{private}}
 }
 
-namespace dr96 { // dr96: no
+//--- dr96: no
+namespace dr96 {
   struct A {
     void f(int);
     template<typename T> int f(T);
@@ -1232,14 +1306,16 @@
   }
 }
 
-namespace dr97 { // dr97: yes
+//--- dr97: yes
+namespace dr97 {
   struct A {
     static const int a = false;
     static const int b = !a;
   };
 }
 
-namespace dr98 { // dr98: yes
+//--- dr98: yes
+namespace dr98 {
   void test(int n) {
     switch (n) {
       try { // expected-note 2{{bypasses}}
@@ -1259,7 +1335,8 @@
   }
 }
 
-namespace dr99 { // dr99: sup 214
+//--- dr99: sup 214
+namespace dr99 {
   template<typename T> void f(T&);
   template<typename T> int &f(const T&);
   const int n = 0;
diff --git a/clang/test/CXX/drs/dr10xx.cpp b/clang/test/CXX/drs/dr10xx.cpp
--- a/clang/test/CXX/drs/dr10xx.cpp
+++ b/clang/test/CXX/drs/dr10xx.cpp
@@ -14,7 +14,8 @@
   };
 }
 
-namespace dr1004 { // dr1004: 5
+//--- dr1004: 5
+namespace dr1004 {
   template<typename> struct A {};
   template<typename> struct B1 {};
   template<template<typename> class> struct B2 {};
@@ -37,7 +38,8 @@
   Third<A<int> > t; // expected-note {{in instantiation of default argument}}
 }
 
-namespace dr1042 { // dr1042: 3.5
+//--- dr1042: 3.5
+namespace dr1042 {
 #if __cplusplus >= 201402L
   // C++14 added an attribute that we can test the semantics of.
   using foo [[deprecated]] = int; // expected-note {{'foo' has been explicitly marked deprecated here}}
@@ -50,7 +52,8 @@
 #endif
 }
 
-namespace dr1048 { // dr1048: 3.6
+//--- dr1048: 3.6
+namespace dr1048 {
   struct A {};
   const A f();
   A g();
@@ -68,7 +71,8 @@
 #endif
 }
 
-namespace dr1054 { // dr1054: no
+//--- dr1054: no
+namespace dr1054 {
   // FIXME: Test is incomplete.
   struct A {} volatile a;
   void f() {
@@ -80,7 +84,8 @@
   }
 }
 
-namespace dr1070 { // dr1070: 3.5
+//--- dr1070: 3.5
+namespace dr1070 {
 #if __cplusplus >= 201103L
   struct A {
     A(std::initializer_list<int>);
diff --git a/clang/test/CXX/drs/dr11xx.cpp b/clang/test/CXX/drs/dr11xx.cpp
--- a/clang/test/CXX/drs/dr11xx.cpp
+++ b/clang/test/CXX/drs/dr11xx.cpp
@@ -4,7 +4,8 @@
 // RUN: %clang_cc1 -std=c++17 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors
 // RUN: %clang_cc1 -std=c++2a %s -verify -fexceptions -fcxx-exceptions -pedantic-errors
 
-namespace dr1111 { // dr1111: yes
+//--- dr1111: yes
+namespace dr1111 {
 namespace example1 {
 template <typename> struct set;
 
@@ -44,7 +45,8 @@
 } // namespace example2
 } // namespace dr1111
 
-namespace dr1113 { // dr1113: partial
+//--- dr1113: partial
+namespace dr1113 {
   namespace named {
     extern int a; // expected-note {{previous}}
     static int a; // expected-error {{static declaration of 'a' follows non-static}}
diff --git a/clang/test/CXX/drs/dr12xx.cpp b/clang/test/CXX/drs/dr12xx.cpp
--- a/clang/test/CXX/drs/dr12xx.cpp
+++ b/clang/test/CXX/drs/dr12xx.cpp
@@ -7,7 +7,8 @@
 
 // dr1200: na
 
-namespace dr1213 { // dr1213: 7
+//--- dr1213: 7
+namespace dr1213 {
 #if __cplusplus >= 201103L
   using T = int[3];
   int &&r = T{}[1];
@@ -32,7 +33,8 @@
 }
 
 #if __cplusplus >= 201103L
-namespace dr1223 { // dr1227: yes open
+//--- dr1227: yes open
+namespace dr1223 {
 struct M;
 template <typename T>
 struct V;
@@ -81,7 +83,8 @@
 #endif
 
 #if __cplusplus >= 201103L
-namespace dr1227 { // dr1227: yes
+//--- dr1227: yes
+namespace dr1227 {
 template <class T> struct A { using X = typename T::X; }; // expected-error {{type 'int' cannot be used prior to '::' because it has no members}}
 template <class T> typename T::X f(typename A<T>::X);
 template <class T> void f(...) { }
@@ -95,7 +98,8 @@
 }
 #endif
 
-namespace dr1250 { // dr1250: 3.9
+//--- dr1250: 3.9
+namespace dr1250 {
 struct Incomplete;
 
 struct Base {
@@ -107,7 +111,8 @@
 };
 }
 
-namespace dr1265 { // dr1265: 5
+//--- dr1265: 5
+namespace dr1265 {
 #if __cplusplus >= 201103L
   auto a = 0, b() -> int; // expected-error {{declaration with trailing return type must be the only declaration in its group}}
   auto b() -> int, d = 0; // expected-error {{declaration with trailing return type must be the only declaration in its group}}
@@ -123,7 +128,8 @@
 
 // dr1291: na
 
-namespace dr1295 { // dr1295: 4
+//--- dr1295: 4
+namespace dr1295 {
   struct X {
     unsigned bitfield : 4;
   };
diff --git a/clang/test/CXX/drs/dr13xx.cpp b/clang/test/CXX/drs/dr13xx.cpp
--- a/clang/test/CXX/drs/dr13xx.cpp
+++ b/clang/test/CXX/drs/dr13xx.cpp
@@ -14,7 +14,8 @@
 }
 
 #if __cplusplus >= 201103L
-namespace dr1305 { // dr1305: yes
+//--- dr1305: yes
+namespace dr1305 {
 struct Incomplete; // expected-note {{forward declaration of 'dr1305::Incomplete'}}
 struct Complete {};
 
@@ -23,7 +24,8 @@
 }
 #endif
 
-namespace dr1307 { // dr1307: 14
+//--- dr1307: 14
+namespace dr1307 {
 #if __cplusplus >= 201103L
 void f(int const (&)[2]);
 void f(int const (&)[3]);
@@ -35,7 +37,8 @@
 #endif // __cplusplus >= 201103L
 } // namespace dr1307
 
-namespace dr1310 { // dr1310: 5
+//--- dr1310: 5
+namespace dr1310 {
   struct S {} * sp = new S::S; // expected-error {{qualified reference to 'S' is a constructor name}}
   void f() {
     S::S(a); // expected-error {{qualified reference to 'S' is a constructor name}}
@@ -115,7 +118,8 @@
   template void wt_test_good<W<int> >();
 }
 
-namespace dr1315 { // dr1315: partial
+//--- dr1315: partial
+namespace dr1315 {
   template <int I, int J> struct A {};
   template <int I> // expected-note {{non-deducible template parameter 'I'}}
     struct A<I + 5, I * 2> {}; // expected-error {{contains a template parameter that cannot be deduced}}
@@ -143,7 +147,8 @@
   // expected-error@-1 {{type of specialized non-type template argument depends on a template parameter of the partial specialization}}
 }
 
-namespace dr1330 { // dr1330: 4 c++11
+//--- dr1330: 4 c++11
+namespace dr1330 {
   // exception-specifications are parsed in a context where the class is complete.
   struct A {
     void f() throw(T) {} // expected-error 0-1{{C++17}} expected-note 0-1{{noexcept}}
@@ -254,7 +259,8 @@
 #endif
 }
 
-namespace dr1346 { // dr1346: 3.5
+//--- dr1346: 3.5
+namespace dr1346 {
   auto a(1); // expected-error 0-1{{extension}}
   auto b(1, 2); // expected-error {{multiple expressions}} expected-error 0-1{{extension}}
 #if __cplusplus >= 201103L
@@ -280,7 +286,8 @@
 #endif
 }
 
-namespace dr1347 { // dr1347: yes
+//--- dr1347: yes
+namespace dr1347 {
   auto x = 5, *y = &x; // expected-error 0-1{{extension}}
   auto z = y, *q = y; // expected-error {{'auto' deduced as 'int *' in declaration of 'z' and deduced as 'int' in declaration of 'q'}} expected-error 0-1{{extension}}
 #if __cplusplus >= 201103L
@@ -289,7 +296,8 @@
 #endif
 }
 
-namespace dr1358 { // dr1358: yes
+//--- dr1358: yes
+namespace dr1358 {
 #if __cplusplus >= 201103L
   struct Lit { constexpr operator int() const { return 0; } };
   struct NonLit { NonLit(); operator int(); }; // expected-note 2{{no constexpr constructors}}
@@ -325,7 +333,8 @@
 #endif
 }
 
-namespace dr1359 { // dr1359: 3.5
+//--- dr1359: 3.5
+namespace dr1359 {
 #if __cplusplus >= 201103L
   union A { constexpr A() = default; };
   union B { constexpr B() = default; int a; }; // expected-error {{not constexpr}} expected-note 2{{candidate}}
@@ -341,7 +350,8 @@
 #endif
 }
 
-namespace dr1388 { // dr1388: 4
+//--- dr1388: 4
+namespace dr1388 {
   template<typename A, typename ...T> void f(T..., A); // expected-note 1+{{candidate}} expected-error 0-1{{C++11}}
   template<typename ...T> void g(T..., int); // expected-note 1+{{candidate}} expected-error 0-1{{C++11}}
   template<typename ...T, typename A> void h(T..., A); // expected-note 1+{{candidate}} expected-error 0-1{{C++11}}
@@ -384,7 +394,8 @@
   }
 }
 
-namespace dr1391 { // dr1391: partial
+//--- dr1391: partial
+namespace dr1391 {
   struct A {}; struct B : A {};
   template<typename T> struct C { C(int); typename T::error error; }; // expected-error 2{{'::'}}
   template<typename T> struct D {};
@@ -462,14 +473,16 @@
   }
 }
 
-namespace dr1394 { // dr1394: 15
+//--- dr1394: 15
+namespace dr1394 {
 #if __cplusplus >= 201103L
 struct Incomplete;
 Incomplete f(Incomplete) = delete; // well-formed
 #endif
 }
 
-namespace dr1395 { // dr1395: 16
+//--- dr1395: 16
+namespace dr1395 {
 #if __cplusplus >= 201103L
   template <typename T, typename... U> void f(T, U...);
   template <typename T> void f(T);
@@ -480,7 +493,8 @@
 #endif
 }
 
-namespace dr1399 { // dr1399: dup 1388
+//--- dr1399: dup 1388
+namespace dr1399 {
   template<typename ...T> void f(T..., int, T...) {} // expected-note {{candidate}} expected-error 0-1{{C++11}}
   void g() {
     f(0);
diff --git a/clang/test/CXX/drs/dr14xx.cpp b/clang/test/CXX/drs/dr14xx.cpp
--- a/clang/test/CXX/drs/dr14xx.cpp
+++ b/clang/test/CXX/drs/dr14xx.cpp
@@ -4,7 +4,8 @@
 // RUN: %clang_cc1 -std=c++17 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors
 // RUN: %clang_cc1 -std=c++2a %s -verify -fexceptions -fcxx-exceptions -pedantic-errors
 
-namespace dr1413 { // dr1413: 12
+//--- dr1413: 12
+namespace dr1413 {
   template<int> struct Check {
     typedef int type;
   };
@@ -27,7 +28,8 @@
   };
 }
 
-namespace dr1423 { // dr1423: 11
+//--- dr1423: 11
+namespace dr1423 {
 #if __cplusplus >= 201103L
   bool b1 = nullptr; // expected-error {{cannot initialize}}
   bool b2(nullptr); // expected-warning {{implicit conversion of nullptr constant to 'bool'}}
@@ -38,7 +40,8 @@
 
 // dr1425: na abi
 
-namespace dr1432 { // dr1432: 16
+//--- dr1432: 16
+namespace dr1432 {
 #if __cplusplus >= 201103L
   template<typename T> T declval();
 
@@ -59,14 +62,16 @@
 #endif
 }
 
-namespace dr1443 { // dr1443: yes
+//--- dr1443: yes
+namespace dr1443 {
 struct A {
   int i;
   A() { void foo(int=i); } // expected-error {{default argument references 'this'}}
 };
 }
 
-namespace dr1460 { // dr1460: 3.5
+//--- dr1460: 3.5
+namespace dr1460 {
 #if __cplusplus >= 201103L
   namespace DRExample {
     union A {
@@ -484,12 +489,14 @@
 #endif
 } // dr1467
 
-namespace dr1479 { // dr1479: yes
+//--- dr1479: yes
+namespace dr1479 {
   int operator"" _a(const char*, std::size_t = 0); // expected-error {{literal operator cannot have a default argument}}
 }
 
-namespace dr1482 { // dr1482: yes
-                   // NB: sup 2516, test reused there
+//--- dr1482: yes
+// NB: sup 2516, test reused there
+namespace dr1482 {
 #if __cplusplus >= 201103L
 template <typename T> struct S {
   typedef char I;
@@ -506,7 +513,8 @@
   std::initializer_list<char>{"abc"}; // expected-error {{expected unqualified-id}}}
 } // dr1490
 
-namespace dr1495 { // dr1495: 4
+//--- dr1495: 4
+namespace dr1495 {
   // Deduction succeeds in both directions.
   template<typename T, typename U> struct A {}; // expected-note {{template is declared here}}
   template<typename T, typename U> struct A<U, T> {}; // expected-error {{class template partial specialization is not more specialized}}
@@ -534,7 +542,8 @@
 #endif
 }
 
-namespace dr1496 { // dr1496: no
+//--- dr1496: no
+namespace dr1496 {
 #if __cplusplus >= 201103L
 struct A {
     A() = delete;
diff --git a/clang/test/CXX/drs/dr15xx.cpp b/clang/test/CXX/drs/dr15xx.cpp
--- a/clang/test/CXX/drs/dr15xx.cpp
+++ b/clang/test/CXX/drs/dr15xx.cpp
@@ -3,7 +3,8 @@
 // RUN: %clang_cc1 -std=c++14 -triple x86_64-unknown-unknown %s -verify=expected,cxx14_17 -fexceptions -fcxx-exceptions -pedantic-errors
 // RUN: %clang_cc1 -std=c++17 -triple x86_64-unknown-unknown %s -verify=expected,cxx17 -fexceptions -fcxx-exceptions -pedantic-errors
 
-namespace dr1512 { // dr1512: 4
+//--- dr1512: 4
+namespace dr1512 {
   void f(char *p) {
     if (p > 0) {} // expected-error {{ordered comparison between pointer and zero}}
 #if __cplusplus >= 201103L
@@ -135,7 +136,8 @@
 #endif
 }
 
-namespace dr1514 { // dr1514: 11
+//--- dr1514: 11
+namespace dr1514 {
 #if __cplusplus >= 201103L
   struct S {
     enum E : int {}; // expected-note {{previous}}
@@ -147,7 +149,8 @@
 #endif
 }
 
-namespace dr1518 { // dr1518: 4
+//--- dr1518: 4
+namespace dr1518 {
 #if __cplusplus >= 201103L
 struct Z0 { // expected-note 0+ {{candidate}}
   explicit Z0() = default; // expected-note 0+ {{here}}
@@ -233,13 +236,15 @@
 #endif                      // __cplusplus >= 201103L
 }
 
-namespace dr1550 { // dr1550: yes
+//--- dr1550: yes
+namespace dr1550 {
   int f(bool b, int n) {
     return (b ? (throw 0) : n) + (b ? n : (throw 0));
   }
 }
 
-namespace dr1558 { // dr1558: 12
+//--- dr1558: 12
+namespace dr1558 {
 #if __cplusplus >= 201103L
   template<class T, class...> using first_of = T;
   template<class T> first_of<void, typename T::type> f(int); // expected-note {{'int' cannot be used prior to '::'}}
@@ -253,7 +258,8 @@
 #endif
 }
 
-namespace dr1560 { // dr1560: 3.5
+//--- dr1560: 3.5
+namespace dr1560 {
   void f(bool b, int n) {
     (b ? throw 0 : n) = (b ? n : throw 0) = 0;
   }
@@ -262,7 +268,8 @@
   const X &x = true ? get() : throw 0;
 }
 
-namespace dr1563 { // dr1563: yes
+//--- dr1563: yes
+namespace dr1563 {
 #if __cplusplus >= 201103L
   double bar(double) { return 0.0; }
   float bar(float) { return 0.0f; }
@@ -272,7 +279,8 @@
 #endif
 }
 
-namespace dr1573 { // dr1573: 3.9
+//--- dr1573: 3.9
+namespace dr1573 {
 #if __cplusplus >= 201103L
   // ellipsis is inherited (p0136r1 supersedes this part).
   struct A { A(); A(int, char, ...); };
@@ -337,7 +345,8 @@
 
 } // std
 
-namespace dr1579 { // dr1579: 3.9
+//--- dr1579: 3.9
+namespace dr1579 {
 template<class T>
 struct GenericMoveOnly {
   GenericMoveOnly();
diff --git a/clang/test/CXX/drs/dr16xx.cpp b/clang/test/CXX/drs/dr16xx.cpp
--- a/clang/test/CXX/drs/dr16xx.cpp
+++ b/clang/test/CXX/drs/dr16xx.cpp
@@ -23,7 +23,8 @@
 } // std
 #endif
 
-namespace dr1601 { // dr1601: 10
+//--- dr1601: 10
+namespace dr1601 {
 enum E : char { e };
 #if __cplusplus < 201103L
     // expected-error@-2 {{enumeration types with a fixed underlying type are a C++11 extension}}
@@ -35,7 +36,8 @@
 }
 } // namespace dr1601
 
-namespace dr1611 { // dr1611: dup 1658
+//--- dr1611: dup 1658
+namespace dr1611 {
   struct A { A(int); };
   struct B : virtual A { virtual void f() = 0; };
   struct C : B { C() : A(0) {} void f(); };
@@ -68,7 +70,8 @@
 #endif
 }
 
-namespace dr1638 { // dr1638: yes
+//--- dr1638: yes
+namespace dr1638 {
 #if __cplusplus >= 201103L
   template<typename T> struct A {
     enum class E; // expected-note {{previous}}
@@ -97,7 +100,8 @@
 #endif
 }
 
-namespace dr1645 { // dr1645: 3.9
+//--- dr1645: 3.9
+namespace dr1645 {
 #if __cplusplus >= 201103L
   struct A {
     constexpr A(int, float = 0); // expected-note {{candidate}}
@@ -114,13 +118,15 @@
 #endif
 }
 
-namespace dr1652 { // dr1652: 3.6
+//--- dr1652: 3.6
+namespace dr1652 {
   int a, b;
   int arr[&a + 1 == &b ? 1 : 2]; // expected-error 2{{variable length array}}
                                  // expected-note@-1 {{points past the end}}
 }
 
-namespace dr1653 { // dr1653: 4 c++17
+//--- dr1653: 4 c++17
+namespace dr1653 {
   void f(bool b) {
     ++b;
     b++;
@@ -136,7 +142,8 @@
   }
 }
 
-namespace dr1658 { // dr1658: 5
+//--- dr1658: 5
+namespace dr1658 {
   namespace DefCtor {
     class A { A(); }; // expected-note 0-2{{here}}
     class B { ~B(); }; // expected-note 0-2{{here}}
@@ -247,7 +254,8 @@
   // assignment case is superseded by dr2180
 }
 
-namespace dr1672 { // dr1672: 7
+//--- dr1672: 7
+namespace dr1672 {
   struct Empty {};
   struct A : Empty {};
   struct B { Empty e; };
@@ -272,7 +280,8 @@
   static_assert(!__is_standard_layout(Y<X>), "");
 }
 
-namespace dr1684 { // dr1684: 3.6
+//--- dr1684: 3.6
+namespace dr1684 {
 #if __cplusplus >= 201103L
   struct NonLiteral { // expected-note {{because}}
     NonLiteral();
@@ -283,7 +292,8 @@
 #endif
 }
 
-namespace dr1687 { // dr1687: 7
+//--- dr1687: 7
+namespace dr1687 {
   template<typename T> struct To {
     operator T(); // expected-note 2{{first operand was implicitly converted to type 'int *'}}
     // expected-note@-1 {{second operand was implicitly converted to type 'double'}}
@@ -302,7 +312,8 @@
 #endif
 }
 
-namespace dr1690 { // dr1690: 9
+//--- dr1690: 9
+namespace dr1690 {
   // See also the various tests in "CXX/basic/basic.lookup/basic.lookup.argdep".
 #if __cplusplus >= 201103L
   namespace N {
@@ -317,7 +328,8 @@
 #endif
 }
 
-namespace dr1691 { // dr1691: 9
+//--- dr1691: 9
+namespace dr1691 {
 #if __cplusplus >= 201103L
   namespace N {
     namespace M {
@@ -335,7 +347,8 @@
 #endif
 }
 
-namespace dr1692 { // dr1692: 9
+//--- dr1692: 9
+namespace dr1692 {
   namespace N {
     struct A {
       struct B {
@@ -350,7 +363,8 @@
   }
 }
 
-namespace dr1696 { // dr1696: 7
+//--- dr1696: 7
+namespace dr1696 {
   namespace std_examples {
 #if __cplusplus >= 201402L
     extern struct A a;
diff --git a/clang/test/CXX/drs/dr177x.cpp b/clang/test/CXX/drs/dr177x.cpp
--- a/clang/test/CXX/drs/dr177x.cpp
+++ b/clang/test/CXX/drs/dr177x.cpp
@@ -4,7 +4,8 @@
 // RUN: %clang_cc1 -std=c++1z %s -fexceptions -fcxx-exceptions -pedantic-errors -ast-dump | FileCheck %s --check-prefixes=CHECK,CXX11,CXX14
 // RUN: %clang_cc1 -std=c++1z %s -fexceptions -fcxx-exceptions -pedantic-errors -triple i386-windows-pc -ast-dump | FileCheck %s --check-prefixes=CHECK,CXX11,CXX14
 
-namespace dr1772 { // dr1772: 14
+//--- dr1772: 14
+namespace dr1772 {
   // __func__ in a lambda should name operator(), not the containing function.
   // CHECK: NamespaceDecl{{.+}}dr1772
 #if __cplusplus >= 201103L
@@ -30,7 +31,8 @@
 #endif // __cplusplus >= 201103L
 }
 
-namespace dr1779 { // dr1779: 14
+//--- dr1779: 14
+namespace dr1779 {
   // __func__ in a function template, member function template, or generic
   //  lambda should have a dependent type.
   // CHECK: NamespaceDecl{{.+}}dr1779
diff --git a/clang/test/CXX/drs/dr17xx.cpp b/clang/test/CXX/drs/dr17xx.cpp
--- a/clang/test/CXX/drs/dr17xx.cpp
+++ b/clang/test/CXX/drs/dr17xx.cpp
@@ -3,7 +3,8 @@
 // RUN: %clang_cc1 -std=c++14 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors
 // RUN: %clang_cc1 -std=c++1z %s -verify -fexceptions -fcxx-exceptions -pedantic-errors
 
-namespace dr1715 { // dr1715: 3.9
+//--- dr1715: 3.9
+namespace dr1715 {
 #if __cplusplus >= 201103L
   struct B {
     template<class T> B(T, typename T::Q);
@@ -27,7 +28,8 @@
 #endif
 }
 
-namespace dr1722 { // dr1722: 9
+//--- dr1722: 9
+namespace dr1722 {
 #if __cplusplus >= 201103L
 void f() {
   const auto lambda = [](int x) { return x + 1; };
@@ -39,7 +41,8 @@
 #endif
 } // namespace dr1722
 
-namespace dr1734 { // dr1734: no
+//--- dr1734: no
+namespace dr1734 {
 #if __cplusplus >= 201103L
 struct A {
     A(const A&) = delete;
@@ -51,7 +54,8 @@
 #endif
 }
 
-namespace dr1736 { // dr1736: 3.9
+//--- dr1736: 3.9
+namespace dr1736 {
 #if __cplusplus >= 201103L
 struct S {
   template <class T> S(T t) {
@@ -67,7 +71,8 @@
 #endif
 }
 
-namespace dr1753 { // dr1753: 11
+//--- dr1753: 11
+namespace dr1753 {
   typedef int T;
   struct A { typedef int T; };
   namespace B { typedef int T; }
@@ -93,7 +98,8 @@
   }
 }
 
-namespace dr1756 { // dr1756: 3.7
+//--- dr1756: 3.7
+namespace dr1756 {
 #if __cplusplus >= 201103L
   // Direct-list-initialization of a non-class object
   
@@ -104,7 +110,8 @@
 #endif
 }
 
-namespace dr1758 { // dr1758: 3.7
+//--- dr1758: 3.7
+namespace dr1758 {
 #if __cplusplus >= 201103L
   // Explicit conversion in copy/move list initialization
 
@@ -123,7 +130,8 @@
 #endif
 }
 
-namespace dr1762 { // dr1762: 14
+//--- dr1762: 14
+namespace dr1762 {
 #if __cplusplus >= 201103L
   float operator ""_E(const char *);
   // expected-error@+2 {{invalid suffix on literal; C++11 requires a space between literal and identifier}}
@@ -132,7 +140,8 @@
 #endif
 }
 
-namespace dr1778 { // dr1778: 9
+//--- dr1778: 9
+namespace dr1778 {
   // Superseded by P1286R2.
 #if __cplusplus >= 201103L
   struct A { A() noexcept(true) = default; };
diff --git a/clang/test/CXX/drs/dr18xx.cpp b/clang/test/CXX/drs/dr18xx.cpp
--- a/clang/test/CXX/drs/dr18xx.cpp
+++ b/clang/test/CXX/drs/dr18xx.cpp
@@ -10,7 +10,8 @@
 #define static_assert(...) __extension__ _Static_assert(__VA_ARGS__)
 #endif
 
-namespace dr1813 { // dr1813: 7
+//--- dr1813: 7
+namespace dr1813 {
   struct B { int i; };
   struct C : B {};
   struct D : C {};
@@ -32,7 +33,8 @@
   static_assert(!__is_standard_layout(U), "");
 }
 
-namespace dr1814 { // dr1814: yes
+//--- dr1814: yes
+namespace dr1814 {
 #if __cplusplus >= 201103L
   void test() {
     auto lam = [](int x = 42) { return x; };
@@ -40,7 +42,8 @@
 #endif
 }
 
-namespace dr1815 { // dr1815: no
+//--- dr1815: no
+namespace dr1815 {
 #if __cplusplus >= 201402L
   // FIXME: needs codegen test
   struct A { int &&r = 0; }; // expected-note {{default member init}}
@@ -51,7 +54,8 @@
 #endif
 }
 
-namespace dr1821 { // dr1821: yes
+//--- dr1821: yes
+namespace dr1821 {
 struct A {
   template <typename> struct B {
     void f();
@@ -67,7 +71,8 @@
 };
 } // namespace dr1821
 
-namespace dr1822 { // dr1822: yes
+//--- dr1822: yes
+namespace dr1822 {
 #if __cplusplus >= 201103L
   int a;
   auto x = [] (int a) {
@@ -76,7 +81,8 @@
 #endif
 }
 
-namespace dr1837 { // dr1837: 3.3
+//--- dr1837: 3.3
+namespace dr1837 {
 #if __cplusplus >= 201103L
   template <typename T>
   struct Fish { static const bool value = true; };
@@ -113,7 +119,8 @@
 #endif
 }
 
-namespace dr1872 { // dr1872: 9
+//--- dr1872: 9
+namespace dr1872 {
 #if __cplusplus >= 201103L
   template<typename T> struct A : T {
     constexpr int f() const { return 0; }
@@ -140,7 +147,8 @@
 #endif
 }
 
-namespace dr1881 { // dr1881: 7
+//--- dr1881: 7
+namespace dr1881 {
   struct A { int a : 4; };
   struct B : A { int b : 3; };
   static_assert(__is_standard_layout(A), "");
@@ -185,8 +193,9 @@
 #endif
 }
 
-namespace dr1894 { // dr1894: 3.8
-                   // NB: reusing part of dr407 test
+//--- dr1894: 3.8
+// NB: reusing part of dr407 test
+namespace dr1894 { 
 namespace A {
   struct S {};
 }
diff --git a/clang/test/CXX/drs/dr19xx.cpp b/clang/test/CXX/drs/dr19xx.cpp
--- a/clang/test/CXX/drs/dr19xx.cpp
+++ b/clang/test/CXX/drs/dr19xx.cpp
@@ -5,7 +5,8 @@
 
 namespace std { struct type_info; }
 
-namespace dr1902 { // dr1902: 3.7
+//--- dr1902: 3.7
+namespace dr1902 {
   struct A {};
   struct B {
     B(A);
@@ -64,7 +65,8 @@
   }
 }
 
-namespace dr1909 { // dr1909: yes
+//--- dr1909: yes
+namespace dr1909 {
   struct A {
     template<typename T> struct A {}; // expected-error {{member 'A' has the same name as its class}}
   };
@@ -79,7 +81,8 @@
   };
 }
 
-namespace dr1940 { // dr1940: yes
+//--- dr1940: yes
+namespace dr1940 {
 #if __cplusplus >= 201103L
 static union {
   static_assert(true, "");  // ok
@@ -89,7 +92,8 @@
 #endif
 }
 
-namespace dr1941 { // dr1941: 3.9
+//--- dr1941: 3.9
+namespace dr1941 {
 #if __cplusplus >= 201402L
 template<typename X>
 struct base {
@@ -119,7 +123,8 @@
 #endif
 }
 
-namespace dr1947 { // dr1947: yes
+//--- dr1947: yes
+namespace dr1947 {
 #if __cplusplus >= 201402L
 unsigned o = 0'01;  // ok
 unsigned b = 0b'01; // expected-error {{invalid digit 'b' in octal constant}}
@@ -133,7 +138,8 @@
 void *operator new(__SIZE_TYPE__) noexcept { return nullptr; } // expected-error{{exception specification in declaration does not match previous declaration}}
 #endif
 
-namespace dr1959 { // dr1959: 3.9
+//--- dr1959: 3.9
+namespace dr1959 {
 #if __cplusplus >= 201103L
   struct b;
   struct c;
@@ -167,7 +173,8 @@
 #endif
 }
 
-namespace dr1960 { // dr1960: no
+//--- dr1960: no
+namespace dr1960 {
 struct A {
 void f() {}
 protected:
@@ -188,7 +195,8 @@
 };
 }
 
-namespace dr1966 { // dr1966: 11
+//--- dr1966: 11
+namespace dr1966 {
 #if __cplusplus >= 201103L
   struct A {
     enum E : int {1}; // expected-error {{expected identifier}} (not bit-field)
@@ -205,7 +213,8 @@
 #endif
 }
 
-namespace dr1968 { // dr1968: no
+//--- dr1968: no
+namespace dr1968 {
 #if __cplusplus >= 201103L
   // FIXME: According to DR1968, both of these should be considered
   // non-constant.
@@ -216,7 +225,8 @@
 #endif
 }
 
-namespace dr1991 { // dr1991: 3.9
+//--- dr1991: 3.9
+namespace dr1991 {
 #if __cplusplus >= 201103L
   struct A {
     A(int, int) = delete;
diff --git a/clang/test/CXX/drs/dr1xx.cpp b/clang/test/CXX/drs/dr1xx.cpp
--- a/clang/test/CXX/drs/dr1xx.cpp
+++ b/clang/test/CXX/drs/dr1xx.cpp
@@ -5,7 +5,8 @@
 // RUN: %clang_cc1 -std=c++20 -triple x86_64-unknown-unknown %s -verify -fexceptions -fcxx-exceptions -pedantic-errors
 // RUN: %clang_cc1 -std=c++23 -triple x86_64-unknown-unknown %s -verify -fexceptions -fcxx-exceptions -pedantic-errors
 
-namespace dr100 { // dr100: yes
+//--- dr100: yes
+namespace dr100 {
   template<const char (*)[4]> struct A {}; // expected-note 0-1{{declared here}}
   template<const char (&)[4]> struct B {}; // expected-note 0-1{{declared here}}
   template<const char *> struct C {}; // expected-note 0-1{{declared here}}
@@ -27,7 +28,8 @@
 #endif
 }
 
-namespace dr101 { // dr101: 3.5
+//--- dr101: 3.5
+namespace dr101 {
   extern "C" void dr101_f();
   typedef unsigned size_t;
   namespace X {
@@ -40,7 +42,8 @@
   typedef unsigned size_t;
 }
 
-namespace dr102 { // dr102: yes
+//--- dr102: yes
+namespace dr102 {
   namespace A {
     template<typename T> T f(T a, T b) { return a + b; } // expected-error {{neither visible in the template definition nor found by argument-dependent lookup}}
   }
@@ -55,7 +58,8 @@
 // dr104: na lib
 // dr105: na
 
-namespace dr106 { // dr106: sup 540
+//--- dr106: sup 540
+namespace dr106 {
   typedef int &r1;
   typedef r1 &r1;
   typedef const r1 r1; // expected-warning {{has no effect}}
@@ -67,12 +71,14 @@
   typedef const r2 &r2; // expected-warning {{has no effect}}
 }
 
-namespace dr107 { // dr107: yes
+//--- dr107: yes
+namespace dr107 {
   struct S {};
   extern "C" S operator+(S, S) { return S(); }
 }
 
-namespace dr108 { // dr108: yes
+//--- dr108: yes
+namespace dr108 {
   template<typename T> struct A {
     struct B { typedef int X; };
     B::X x;
@@ -84,7 +90,8 @@
   template<> struct A<int>::B { int X; };
 }
 
-namespace dr109 { // dr109: yes
+//--- dr109: yes
+namespace dr109 {
   struct A { template<typename T> void f(T); };
   template<typename T> struct B : T {
     using T::template f; // expected-error {{'template' keyword not permitted here}}
@@ -95,14 +102,16 @@
   };
 }
 
-namespace dr111 { // dr111: dup 535
+//--- dr111: dup 535
+namespace dr111 {
   struct A { A(); A(volatile A&, int = 0); A(A&, const char * = "foo"); };
   struct B : A { B(); }; // expected-note +{{would lose const qualifier}} expected-note {{requires 0 arguments}}
   const B b1;
   B b2(b1); // expected-error {{no matching constructor}}
 }
 
-namespace dr112 { // dr112: yes
+//--- dr112: yes
+namespace dr112 {
   struct T { int n; };
   typedef T Arr[1];
 
@@ -123,7 +132,8 @@
 #endif
 }
 
-namespace dr113 { // dr113: yes
+//--- dr113: yes
+namespace dr113 {
   extern void (*p)();
   void f() {
     no_such_function(); // expected-error {{undeclared}}
@@ -133,7 +143,8 @@
   void (*p)() = &g;
 }
 
-namespace dr114 { // dr114: yes
+//--- dr114: yes
+namespace dr114 {
   struct A {
     virtual void f(int) = 0; // expected-note {{unimplemented}}
   };
@@ -143,7 +154,8 @@
   } b; // expected-error {{abstract}}
 }
 
-namespace dr115 { // dr115: yes
+//--- dr115: yes
+namespace dr115 {
   template<typename T> int f(T); // expected-note +{{}}
   template<typename T> int g(T); // expected-note +{{}}
   template<typename T> int g(T, int); // expected-note +{{}}
@@ -216,7 +228,8 @@
 #endif
 }
 
-namespace dr116 { // dr116: yes
+//--- dr116: yes
+namespace dr116 {
   template<int> struct A {};
   template<int N> void f(A<N>) {} // expected-note {{previous}}
   template<int M> void f(A<M>) {} // expected-error {{redefinition}}
@@ -229,7 +242,8 @@
 // dr119: na
 // dr120: na
 
-namespace dr121 { // dr121: yes
+//--- dr121: yes
+namespace dr121 {
   struct X {
     template<typename T> struct Y {};
   };
@@ -240,7 +254,8 @@
   Z<X> z;
 }
 
-namespace dr122 { // dr122: yes
+//--- dr122: yes
+namespace dr122 {
   template<typename T> void f();
   void g() { f<int>(); }
 }
@@ -261,7 +276,8 @@
   };
 }
 
-namespace dr126 { // dr126: partial
+//--- dr126: partial
+namespace dr126 {
   // FIXME: We do not yet generate correct code for this change:
   // eg:
   //   catch (void*&) should catch void* but not int*
@@ -355,7 +371,8 @@
 #endif
 }
 
-namespace dr127 { // dr127: yes
+//--- dr127: yes
+namespace dr127 {
   __extension__ typedef __decltype(sizeof(0)) size_t;
   template<typename T> struct A {
     A() { throw 0; }
@@ -367,7 +384,8 @@
   A<int> *q = new ("") A<int>; // expected-note {{instantiat}}
 }
 
-namespace dr128 { // dr128: yes
+//--- dr128: yes
+namespace dr128 {
   enum E1 { e1 } x = e1;
   enum E2 { e2 } y = static_cast<E2>(x), z = static_cast<E2>(e1);
 }
@@ -375,13 +393,15 @@
 // dr129: dup 616
 // dr130: na
 
-namespace dr131 { // dr131: sup P1949
+//--- dr131: sup P1949
+namespace dr131 {
   const char *a_with_\u0e8c = "\u0e8c";
   const char *b_with_\u0e8d = "\u0e8d";
   const char *c_with_\u0e8e = "\u0e8e";
 }
 
-namespace dr132 { // dr132: no
+//--- dr132: no
+namespace dr132 {
   void f() {
     extern struct {} x; // ok
     extern struct S {} y; // FIXME: This is invalid.
@@ -392,7 +412,8 @@
 // dr133: dup 87
 // dr134: na
 
-namespace dr135 { // dr135: yes
+//--- dr135: yes
+namespace dr135 {
   struct A {
     A f(A a) { return a; }
     friend A g(A a) { return a; }
@@ -400,7 +421,8 @@
   };
 }
 
-namespace dr136 { // dr136: 3.4
+//--- dr136: 3.4
+namespace dr136 {
   void f(int, int, int = 0); // expected-note {{previous declaration is here}}
   void g(int, int, int); // expected-note {{previous declaration is here}}
   struct A {
@@ -434,7 +456,8 @@
   };
 }
 
-namespace dr137 { // dr137: yes
+//--- dr137: yes
+namespace dr137 {
   extern void *p;
   extern const void *cp;
   extern volatile void *vp;
@@ -453,7 +476,8 @@
   const volatile int *cvqcv = static_cast<const volatile int*>(cvp);
 }
 
-namespace dr139 { // dr139: yes
+//--- dr139: yes
+namespace dr139 {
   namespace example1 {
     typedef int f; // expected-note {{previous}}
     struct A {
@@ -473,14 +497,16 @@
   }
 }
 
-namespace dr140 { // dr140: yes
+//--- dr140: yes
+namespace dr140 {
   void f(int *const) {} // expected-note {{previous}}
   void f(int[3]) {} // expected-error {{redefinition}}
   void g(const int);
   void g(int n) { n = 2; }
 }
 
-namespace dr141 { // dr141: yes
+//--- dr141: yes
+namespace dr141 {
   template<typename T> void f();
   template<typename T> struct S { int n; }; // expected-note {{'::dr141::S<int>::n' declared here}}
   struct A : S<int> {
@@ -518,7 +544,8 @@
   void i() { C<X>().i(); } // ok!!
 }
 
-namespace dr142 { // dr142: yes
+//--- dr142: yes
+namespace dr142 {
   class B { // expected-note +{{here}}
   public:
     int mi; // expected-note +{{here}}
@@ -546,7 +573,8 @@
   }
 }
 
-namespace dr143 { // dr143: yes
+//--- dr143: yes
+namespace dr143 {
   namespace A { struct X; }
   namespace B { void f(A::X); }
   namespace A {
@@ -557,7 +585,8 @@
   }
 }
 
-namespace dr145 { // dr145: yes
+//--- dr145: yes
+namespace dr145 {
   void f(bool b) {
 #if __cplusplus <= 201402L
     ++b; // expected-warning {{deprecated}}
@@ -569,7 +598,8 @@
   }
 }
 
-namespace dr147 { // dr147: yes
+//--- dr147: yes
+namespace dr147 {
   namespace example1 {
     template<typename> struct A {
       template<typename T> A(T);
@@ -594,7 +624,8 @@
   }
 }
 
-namespace dr148 { // dr148: yes
+//--- dr148: yes
+namespace dr148 {
   struct A { int A::*p; };
   int check1[__is_pod(int(A::*)) ? 1 : -1];
   int check2[__is_pod(A) ? 1 : -1];
@@ -602,7 +633,8 @@
 
 // dr149: na
 
-namespace dr151 { // dr151: yes
+//--- dr151: yes
+namespace dr151 {
   struct X {};
   typedef int X::*p;
 #if __cplusplus < 201103L
@@ -614,7 +646,8 @@
 #undef fold
 }
 
-namespace dr152 { // dr152: yes
+//--- dr152: yes
+namespace dr152 {
   struct A {
     A(); // expected-note 0-2{{not viable}}
     explicit A(const A&); // expected-note 1-2{{not a candidate}}
@@ -632,7 +665,8 @@
 
 // dr153: na
 
-namespace dr154 { // dr154: yes
+//--- dr154: yes
+namespace dr154 {
   union { int a; }; // expected-error {{must be declared 'static'}}
   namespace {
     union { int b; };
@@ -640,13 +674,15 @@
   static union { int c; };
 }
 
-namespace dr155 { // dr155: dup 632
+//--- dr155: dup 632
+namespace dr155 {
   struct S { int n; } s = { { 1 } }; // expected-warning {{braces around scalar initializer}}
 }
 
 // dr158 is in its own file.
 
-namespace dr159 { // dr159: 3.5
+//--- dr159: 3.5
+namespace dr159 {
   namespace X { void f(); }
   void f();
   void dr159::f() {} // expected-warning {{extra qualification}}
@@ -655,7 +691,8 @@
 
 // dr160: na
 
-namespace dr161 { // dr161: yes
+//--- dr161: yes
+namespace dr161 {
   class A {
   protected:
     struct B { int n; } b; // expected-note 2{{here}}
@@ -686,7 +723,8 @@
   };
 }
 
-namespace dr162 { // dr162: no
+//--- dr162: no
+namespace dr162 {
   struct A {
     char &f(char);
     static int &f(int);
@@ -703,7 +741,8 @@
 
 // dr163: na
 
-namespace dr164 { // dr164: yes
+//--- dr164: yes
+namespace dr164 {
   void f(int);
   template <class T> int g(T t) { return f(t); }
 
@@ -713,7 +752,8 @@
   int k = g(e);
 }
 
-namespace dr165 { // dr165: no
+//--- dr165: no
+namespace dr165 {
   namespace N {
     struct A { friend struct B; };
     void f() { void g(); }
@@ -724,7 +764,8 @@
   void N::g() {}
 }
 
-namespace dr166 { // dr166: yes
+//--- dr166: yes
+namespace dr166 {
   namespace A { class X; }
 
   template<typename T> int f(T t) { return t.n; }
@@ -753,7 +794,8 @@
 
 // dr167: sup 1012
 
-namespace dr168 { // dr168: no
+//--- dr168: no
+namespace dr168 {
   extern "C" typedef int (*p)();
   extern "C++" typedef int (*q)();
   struct S {
@@ -763,7 +805,8 @@
   q b = &S::f;
 }
 
-namespace dr169 { // dr169: yes
+//--- dr169: yes
+namespace dr169 {
   template<typename> struct A { int n; };
   struct B {
     template<typename> struct C;
@@ -787,7 +830,8 @@
   extern "C" void dr171b(); // expected-error {{conflicts}}
 }
 
-namespace dr172 { // dr172: yes
+//--- dr172: yes
+namespace dr172 {
   enum { zero };
   int check1[-1 < zero ? 1 : -1];
 
@@ -819,7 +863,8 @@
   int check8b[-f > 0 ? 1 : -1];
 }
 
-namespace dr173 { // dr173: yes
+//--- dr173: yes
+namespace dr173 {
   int check[('0' + 1 == '1' && '0' + 2 == '2' && '0' + 3 == '3' &&
              '0' + 4 == '4' && '0' + 5 == '5' && '0' + 6 == '6' &&
              '0' + 7 == '7' && '0' + 8 == '8' && '0' + 9 == '9') ? 1 : -1];
@@ -827,7 +872,8 @@
 
 // dr174: sup 1012
 
-namespace dr175 { // dr175: yes
+//--- dr175: yes
+namespace dr175 {
   struct A {}; // expected-note {{here}}
   struct B : private A {}; // expected-note {{constrained by private inheritance}}
   struct C : B {
@@ -836,7 +882,8 @@
   };
 }
 
-namespace dr176 { // dr176: yes
+//--- dr176: yes
+namespace dr176 {
   template<typename T> class Y;
   template<> class Y<int> {
     void f() {
@@ -867,7 +914,8 @@
   };
 }
 
-namespace dr177 { // dr177: yes
+//--- dr177: yes
+namespace dr177 {
   struct B {};
   struct A {
     A(A &); // expected-note 0-1{{not viable: expects an lvalue}}
@@ -886,7 +934,8 @@
   C c = e; // expected-error {{no viable constructor copying variable of type 'D'}}
 }
 
-namespace dr178 { // dr178: yes
+//--- dr178: yes
+namespace dr178 {
   int check[int() == 0 ? 1 : -1];
 #if __cplusplus >= 201103L
   static_assert(int{} == 0, "");
@@ -899,12 +948,14 @@
 #endif
 }
 
-namespace dr179 { // dr179: yes
+//--- dr179: yes
+namespace dr179 {
   void f();
   int n = &f - &f; // expected-error {{arithmetic on pointers to the function type 'void ()'}}
 }
 
-namespace dr180 { // dr180: yes
+//--- dr180: yes
+namespace dr180 {
   template<typename T> struct X : T, T::some_base {
     X() : T::some_type_that_might_be_T(), T::some_base() {}
     friend class T::some_class;
@@ -914,7 +965,8 @@
   };
 }
 
-namespace dr181 { // dr181: yes
+//--- dr181: yes
+namespace dr181 {
   namespace X {
     template <template X<class T> > struct A { }; // expected-error +{{}}
     template <template X<class T> > void f(A<X>) { } // expected-error +{{}}
@@ -926,7 +978,8 @@
   }
 }
 
-namespace dr182 { // dr182: yes
+//--- dr182: yes
+namespace dr182 {
   template <class T> struct C {
     void f();
     void g();
@@ -949,7 +1002,8 @@
   }
 }
 
-namespace dr183 { // dr183: sup 382
+//--- dr183: sup 382
+namespace dr183 {
   template<typename T> struct A {};
   template<typename T> struct B {
     typedef int X;
@@ -963,7 +1017,8 @@
   };
 }
 
-namespace dr184 { // dr184: yes
+//--- dr184: yes
+namespace dr184 {
   template<typename T = float> struct B {};
 
   template<template<typename TT = float> class T> struct A {
@@ -986,14 +1041,16 @@
 
 // dr185 FIXME: add codegen test
 
-namespace dr187 { // dr187: sup 481
+//--- dr187: sup 481
+namespace dr187 {
   const int Z = 1;
   template<int X = Z, int Z = X> struct A;
   typedef A<> T;
   typedef A<1, 1> T;
 }
 
-namespace dr188 { // dr188: yes
+//--- dr188: yes
+namespace dr188 {
   char c[10];
   int check[sizeof(0, c) == 10 ? 1 : -1];
 }
@@ -1001,7 +1058,8 @@
 // dr190 FIXME: add codegen test for tbaa
 
 int dr191_j;
-namespace dr191 { // dr191: yes
+//--- dr191: yes
+namespace dr191 {
   namespace example1 {
     struct outer {
       static int i;
@@ -1032,7 +1090,8 @@
 
 // dr193 FIXME: add codegen test
 
-namespace dr194 { // dr194: yes
+//--- dr194: yes
+namespace dr194 {
   struct A {
     A();
     void A(); // expected-error {{constructor cannot have a return type}}
@@ -1046,13 +1105,15 @@
   };
 }
 
-namespace dr195 { // dr195: yes
+//--- dr195: yes
+namespace dr195 {
   void f();
   int *p = (int*)&f; // expected-error 0-1{{extension}}
   void (*q)() = (void(*)())&p; // expected-error 0-1{{extension}}
 }
 
-namespace dr197 { // dr197: yes
+//--- dr197: yes
+namespace dr197 {
   char &f(char);
 
   template <class T> void g(T t) {
@@ -1073,7 +1134,8 @@
   }
 }
 
-namespace dr198 { // dr198: yes
+//--- dr198: yes
+namespace dr198 {
   struct A {
     int n;
     struct B {
diff --git a/clang/test/CXX/drs/dr20xx.cpp b/clang/test/CXX/drs/dr20xx.cpp
--- a/clang/test/CXX/drs/dr20xx.cpp
+++ b/clang/test/CXX/drs/dr20xx.cpp
@@ -10,7 +10,8 @@
 #define static_assert(...) _Static_assert(__VA_ARGS__)
 #endif
 
-namespace dr2007 { // dr2007: 3.4
+//--- dr2007: 3.4
+namespace dr2007 {
 template<typename T> struct A { typename T::error e; };
 template<typename T> struct B { };
 B<A<void> > b1;
@@ -21,7 +22,8 @@
 
 // dr2009: na
 
-namespace dr2026 { // dr2026: 11
+//--- dr2026: 11
+namespace dr2026 {
   template<int> struct X {};
 
   const int a = a + 1; // expected-warning {{uninitialized}} expected-note {{here}} expected-note 0-1{{outside its lifetime}}
@@ -61,7 +63,8 @@
   }
 }
 
-namespace dr2061 { // dr2061: yes
+//--- dr2061: yes
+namespace dr2061 {
 #if __cplusplus >= 201103L
   namespace A {
     inline namespace b {
@@ -89,7 +92,8 @@
 #endif // C++11
 }
 
-namespace dr2076 { // dr2076: 13
+//--- dr2076: 13
+namespace dr2076 {
 #if __cplusplus >= 201103L
   namespace std_example {
     struct A { A(int); };
@@ -130,14 +134,16 @@
 #endif
 }
 
-namespace dr2082 { // dr2082: 11
+//--- dr2082: 11
+namespace dr2082 {
   void test1(int x, int = sizeof(x)); // ok
 #if __cplusplus >= 201103L
   void test2(int x, int = decltype(x){}); // ok
 #endif
 }
 
-namespace dr2083 { // dr2083: partial
+//--- dr2083: partial
+namespace dr2083 {
 #if __cplusplus >= 201103L
   void non_const_mem_ptr() {
     struct A {
@@ -332,7 +338,8 @@
 #endif
 }
 
-namespace dr2094 { // dr2094: 5
+//--- dr2094: 5
+namespace dr2094 {
   struct A { int n; };
   struct B { volatile int n; };
   static_assert(__is_trivially_copyable(volatile int), "");
diff --git a/clang/test/CXX/drs/dr21xx.cpp b/clang/test/CXX/drs/dr21xx.cpp
--- a/clang/test/CXX/drs/dr21xx.cpp
+++ b/clang/test/CXX/drs/dr21xx.cpp
@@ -10,7 +10,8 @@
 #define static_assert(...) __extension__ _Static_assert(__VA_ARGS__)
 #endif
 
-namespace dr2100 { // dr2100: 12
+//--- dr2100: 12
+namespace dr2100 {
   template<const int *P, bool = true> struct X {};
   template<typename T> struct A {
     static const int n = 1;
@@ -52,7 +53,8 @@
   };
 }
 
-namespace dr2103 { // dr2103: yes
+//--- dr2103: yes
+namespace dr2103 {
   void f() {
     int a;
     int &r = a; // expected-note {{here}}
@@ -65,7 +67,8 @@
   }
 }
 
-namespace dr2120 { // dr2120: 7
+//--- dr2120: 7
+namespace dr2120 {
   struct A {};
   struct B : A {};
   struct C { A a; };
@@ -76,7 +79,8 @@
   static_assert(!__is_standard_layout(E), "");
 }
 
-namespace dr2126 { // dr2126: 12
+//--- dr2126: 12
+namespace dr2126 {
 #if __cplusplus >= 201103L
   struct A { int n; };
 
@@ -110,7 +114,8 @@
 #endif
 }
 
-namespace dr2140 { // dr2140: 9
+//--- dr2140: 9
+namespace dr2140 {
 #if __cplusplus >= 201103L
   union U { int a; decltype(nullptr) b; };
   constexpr int *test(U u) {
@@ -120,7 +125,8 @@
 #endif
 }
 
-namespace dr2157 { // dr2157: 11
+//--- dr2157: 11
+namespace dr2157 {
 #if __cplusplus >= 201103L
   enum E : int;
   struct X {
@@ -131,7 +137,8 @@
 
 // dr2165: na
 
-namespace dr2170 { // dr2170: 9
+//--- dr2170: 9
+namespace dr2170 {
 #if __cplusplus >= 201103L
   void f() {
     constexpr int arr[3] = {1, 2, 3}; // expected-note {{here}}
@@ -144,7 +151,8 @@
 #endif
 }
 
-namespace dr2171 { // dr2171: 15
+//--- dr2171: 15
+namespace dr2171 {
 #if __cplusplus >= 201103L
 
 struct NonConstCopy {
@@ -171,7 +179,8 @@
 #endif
 } // namespace dr2171
 
-namespace dr2180 { // dr2180: yes
+//--- dr2180: yes
+namespace dr2180 {
   class A {
     A &operator=(const A &); // expected-note 0-2{{here}}
     A &operator=(A &&); // expected-note 0-2{{here}} expected-error 0-1{{extension}}
@@ -191,8 +200,9 @@
 #endif
 }
 
-namespace dr2199 { // dr2199: 3.8
-                   // NB: reusing part of dr407 test
+//--- dr2199: 3.8
+// NB: reusing part of dr407 test
+namespace dr2199 {
 namespace A {
   struct S {};
 }
diff --git a/clang/test/CXX/drs/dr22xx.cpp b/clang/test/CXX/drs/dr22xx.cpp
--- a/clang/test/CXX/drs/dr22xx.cpp
+++ b/clang/test/CXX/drs/dr22xx.cpp
@@ -4,7 +4,8 @@
 // RUN: %clang_cc1 -std=c++1z -triple x86_64-unknown-unknown %s -verify -fexceptions -fcxx-exceptions -pedantic-errors
 
 #if __cplusplus >= 201103L
-namespace dr2211 { // dr2211: 8
+//--- dr2211: 8
+namespace dr2211 {
 void f() {
   int a;
   auto f = [a](int a) { (void)a; }; // expected-error {{a lambda parameter cannot shadow an explicitly captured entity}}
@@ -14,7 +15,8 @@
 }
 #endif
 
-namespace dr2213 { // dr2213: yes
+//--- dr2213: yes
+namespace dr2213 {
 template <typename T, typename U>
 struct A;
 
@@ -22,7 +24,8 @@
 struct A<int, U>;
 } // namespace dr2213
 
-namespace dr2229 { // dr2229: 7
+//--- dr2229: 7
+namespace dr2229 {
 struct AnonBitfieldQualifiers {
   const unsigned : 1; // expected-error {{anonymous bit-field cannot have qualifiers}}
   volatile unsigned : 1; // expected-error {{anonymous bit-field cannot have qualifiers}}
@@ -35,7 +38,8 @@
 };
 }
 
-namespace dr2233 { // dr2233: 11
+//--- dr2233: 11
+namespace dr2233 {
 #if __cplusplus >= 201103L
 template <typename... T>
 void f(int i = 0, T... args) {}
@@ -123,7 +127,8 @@
 #endif
 } // namespace dr2233
 
-namespace dr2292 { // dr2292: 9
+//--- dr2292: 9
+namespace dr2292 {
 #if __cplusplus >= 201103L
   template<typename T> using id = T;
   void test(int *p) {
diff --git a/clang/test/CXX/drs/dr23xx.cpp b/clang/test/CXX/drs/dr23xx.cpp
--- a/clang/test/CXX/drs/dr23xx.cpp
+++ b/clang/test/CXX/drs/dr23xx.cpp
@@ -6,7 +6,8 @@
 // RUN: %clang_cc1 -std=c++23 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors 2>&1 | FileCheck %s
 
 #if __cplusplus >= 201103L
-namespace dr2303 { // dr2303: 12
+//--- dr2303: 12
+namespace dr2303 {
 template <typename... T>
 struct A;
 template <>
@@ -40,7 +41,8 @@
 // dr2331: na
 
 #if __cplusplus >= 201103L
-namespace dr2338 { // dr2338: 12
+//--- dr2338: 12
+namespace dr2338 {
 namespace B {
 enum E : bool { Zero, One };
 static_assert((int)(E)2 == 1, "");
@@ -52,14 +54,16 @@
 } // namespace dr2338
 #endif
 
-namespace dr2346 { // dr2346: 11
+//--- dr2346: 11
+namespace dr2346 {
   void test() {
     const int i2 = 0;
     extern void h2b(int x = i2 + 0); // ok, not odr-use
   }
 }
 
-namespace dr2352 { // dr2352: 10
+//--- dr2352: 10
+namespace dr2352 {
   int **p;
   const int *const *const &f1() { return p; }
   int *const *const &f2() { return p; }
@@ -92,7 +96,8 @@
 #endif
 }
 
-namespace dr2353 { // dr2353: 9
+//--- dr2353: 9
+namespace dr2353 {
   struct X {
     static const int n = 0;
   };
@@ -125,7 +130,8 @@
 }
 
 #if __cplusplus >= 201402L
-namespace dr2358 { // dr2358: 16
+//--- dr2358: 16
+namespace dr2358 {
   void f2() {
     int i = 1;
     void g1(int = [xxx=1] { return xxx; }());  // OK
@@ -134,7 +140,8 @@
 }
 #endif
 
-namespace dr2370 { // dr2370: no
+//--- dr2370: no
+namespace dr2370 {
 namespace N {
 typedef int type;
 void g(type);
@@ -152,7 +159,8 @@
 // Otherwise, if the qualified-id std::tuple_size<E> names a complete class
 // type **with a member value**, the expression std::tuple_size<E>::value shall
 // be a well-formed integral constant expression
-namespace dr2386 { // dr2386: 9
+//--- dr2386: 9
+namespace dr2386 {
 struct Bad1 { int a, b; };
 struct Bad2 { int a, b; };
 } // namespace dr2386
@@ -171,7 +179,8 @@
 
 // dr2385: na
 
-namespace dr2387 { // dr2387: 9
+//--- dr2387: 9
+namespace dr2387 {
 #if __cplusplus >= 201402L
   template<int> int a = 0;
   extern template int a<0>; // ok
@@ -188,7 +197,8 @@
 #endif
 }
 
-namespace dr2394 { // dr2394: 15
+//--- dr2394: 15
+namespace dr2394 {
 
 struct A {};
 const A a;
@@ -199,7 +209,8 @@
 
 }
 
-namespace dr2396 { // dr2396: no
+//--- dr2396: no
+namespace dr2396 {
   struct A {
     struct B;
     operator B B::*();
@@ -216,7 +227,8 @@
 }
 
 #if __cplusplus >= 201103L
-namespace dr2397 { // dr2397: 17
+//--- dr2397: 17
+namespace dr2397 {
   void foo() {
     int a[5];
 
diff --git a/clang/test/CXX/drs/dr25xx.cpp b/clang/test/CXX/drs/dr25xx.cpp
--- a/clang/test/CXX/drs/dr25xx.cpp
+++ b/clang/test/CXX/drs/dr25xx.cpp
@@ -1,7 +1,8 @@
 // RUN: %clang_cc1 -std=c++20 -triple x86_64-unknown-unknown %s -verify
 
-namespace dr2516 { // dr2516: yes
-                   // NB: reusing 1482 test
+//--- dr2516: yes
+// NB: reusing 1482 test
+namespace dr2516 {
 #if __cplusplus >= 201103L
 template <typename T> struct S {
   typedef char I;
@@ -11,7 +12,8 @@
 #endif
 } // namespace dr2516
 
-namespace dr2518 { // dr2518: 17
+//--- dr2518: 17
+namespace dr2518 {
 
 template <class T>
 void f(T t) {
@@ -45,7 +47,8 @@
 }
 
 
-namespace dr2565 { // dr2565: 16 open
+//--- dr2565: 16 open
+namespace dr2565 {
   template<typename T>
     concept C = requires (typename T::type x) {
       x + 1;
diff --git a/clang/test/CXX/drs/dr26xx.cpp b/clang/test/CXX/drs/dr26xx.cpp
--- a/clang/test/CXX/drs/dr26xx.cpp
+++ b/clang/test/CXX/drs/dr26xx.cpp
@@ -1,6 +1,7 @@
 // RUN: %clang_cc1 -std=c++20 -triple x86_64-unknown-unknown %s -verify
 
-namespace dr2621 { // dr2621: yes
+//--- dr2621: yes
+namespace dr2621 {
 enum class E { a };
 namespace One {
 using E_t = E;
@@ -14,11 +15,11 @@
 }
 }
 
-namespace dr2628 { // dr2628: no open
-                   // this was reverted for the 16.x release
-                   // due to regressions, see the issue for more details:
-                   // https://github.com/llvm/llvm-project/issues/60777
-
+//--- dr2628: no open
+// this was reverted for the 16.x release
+// due to regressions, see the issue for more details:
+// https://github.com/llvm/llvm-project/issues/60777
+namespace dr2628 {
 template <bool A = false, bool B = false>
 struct foo {
   // The expected notes below should be removed when dr2628 is fully implemented again
@@ -36,7 +37,8 @@
 
 }
 
-namespace dr2631 { // dr2631: 16
+//--- dr2631: 16
+namespace dr2631 {
   constexpr int g();
   consteval int f() {
     return g();
@@ -52,7 +54,8 @@
   }
 }
 
-namespace dr2635 { // dr2635: 16
+//--- dr2635: 16
+namespace dr2635 {
 template<typename T>
 concept UnaryC = true;
 template<typename T, typename U>
@@ -82,7 +85,8 @@
 
   // dr2636: na
 
-namespace dr2640 { // dr2640: 16
+//--- dr2640: 16
+namespace dr2640 {
 
 int \N{Λ} = 0; //expected-error {{'Λ' is not a valid Unicode character name}} \
                //expected-error {{expected unqualified-id}}
@@ -99,7 +103,8 @@
 
   // dr2642: na
 
-namespace dr2644 { // dr2644: yes
+//--- dr2644: yes
+namespace dr2644 {
 
 auto z = [a = 42](int a) { // expected-error {{a lambda parameter cannot shadow an explicitly captured entity}} \
                            // expected-note {{variable 'a' is explicitly captured here}}
@@ -108,7 +113,8 @@
 
 }
 
-namespace dr2650 { // dr2650: yes
+//--- dr2650: yes
+namespace dr2650 {
 template <class T, T> struct S {};
 template <class T> int f(S<T, T{}>*); // expected-note {{type 'X' of non-type template parameter is not a structural type}}
 class X {
@@ -117,7 +123,8 @@
 int i0 = f<X>(0);   //expected-error {{no matching function for call to 'f'}}
 }
 
-namespace dr2654 { // dr2654: 16
+//--- dr2654: 16
+namespace dr2654 {
 void f() {
     int neck, tail;
     volatile int brachiosaur;
diff --git a/clang/test/CXX/drs/dr2xx.cpp b/clang/test/CXX/drs/dr2xx.cpp
--- a/clang/test/CXX/drs/dr2xx.cpp
+++ b/clang/test/CXX/drs/dr2xx.cpp
@@ -14,7 +14,8 @@
 #define fold
 #endif
 
-namespace dr200 { // dr200: dup 214
+//--- dr200: dup 214
+namespace dr200 {
   template <class T> T f(int);
   template <class T, class U> T f(U) = delete; // expected-error 0-1{{extension}}
 
@@ -25,7 +26,8 @@
 
 // dr201 FIXME: write codegen test
 
-namespace dr202 { // dr202: yes
+//--- dr202: yes
+namespace dr202 {
   template<typename T> T f();
   template<int (*g)()> struct X {
     int arr[fold(g == &f<int>) ? 1 : -1];
@@ -35,13 +37,15 @@
 
 // FIXME (export) dr204: no
 
-namespace dr206 { // dr206: yes
+//--- dr206: yes
+namespace dr206 {
   struct S; // expected-note 2{{declaration}}
   template<typename T> struct Q { S s; }; // expected-error {{incomplete}}
   template<typename T> void f() { S s; } // expected-error {{incomplete}}
 }
 
-namespace dr207 { // dr207: yes
+//--- dr207: yes
+namespace dr207 {
   class A {
   protected:
     static void f() {}
@@ -58,7 +62,8 @@
 
 // dr208 FIXME: write codegen test
 
-namespace dr209 { // dr209: yes
+//--- dr209: yes
+namespace dr209 {
   class A {
     void f(); // expected-note {{here}}
   };
@@ -69,7 +74,8 @@
 
 // dr210 FIXME: write codegen test
 
-namespace dr211 { // dr211: yes
+//--- dr211: yes
+namespace dr211 {
   struct A {
     A() try {
       throw 0;
@@ -79,7 +85,8 @@
   };
 }
 
-namespace dr213 { // dr213: yes
+//--- dr213: yes
+namespace dr213 {
   template <class T> struct A : T {
     void h(T t) {
       char &r1 = f(t);
@@ -95,7 +102,8 @@
   template void A<B>::h(B); // expected-note {{instantiation}}
 }
 
-namespace dr214 { // dr214: yes
+//--- dr214: yes
+namespace dr214 {
   template<typename T, typename U> T checked_cast(U from) { U::error; }
   template<typename T, typename U> T checked_cast(U *from);
   class C {};
@@ -108,7 +116,8 @@
   }
 }
 
-namespace dr215 { // dr215: yes
+//--- dr215: yes
+namespace dr215 {
   template<typename T> class X {
     friend void T::foo();
     int n;
@@ -118,7 +127,8 @@
   };
 }
 
-namespace dr216 { // dr216: no
+//--- dr216: no
+namespace dr216 {
   // FIXME: Should reject this: 'f' has linkage but its type does not,
   // and 'f' is odr-used but not defined in this TU.
   typedef enum { e } *E;
@@ -134,15 +144,17 @@
   void g(S s, S::E e) { s.f(e); }
 }
 
-namespace dr217 { // dr217: yes
+//--- dr217: yes
+namespace dr217 {
   template<typename T> struct S {
     void f(int);
   };
   template<typename T> void S<T>::f(int = 0) {} // expected-error {{default arguments cannot be added}}
 }
 
-namespace dr218 { // dr218: yes
-                  // NB: also dup 405
+//--- dr218: yes
+// NB: also dup 405
+namespace dr218 {
   namespace A {
     struct S {};
     void f(S);
@@ -198,7 +210,8 @@
 // dr219: na
 // dr220: na
 
-namespace dr221 { // dr221: yes
+//--- dr221: yes
+namespace dr221 {
   struct A { // expected-note 2-4{{candidate}}
     A &operator=(int&); // expected-note 2{{candidate}}
     A &operator+=(int&);
@@ -220,7 +233,8 @@
   }
 }
 
-namespace dr222 { // dr222: dup 637
+//--- dr222: dup 637
+namespace dr222 {
   void f(int a, int b, int c, int *x) {
 #pragma clang diagnostic push
 #pragma clang diagnostic warning "-Wunsequenced"
@@ -245,7 +259,8 @@
 
 // dr223: na
 
-namespace dr224 { // dr224: 16
+//--- dr224: 16
+namespace dr224 {
   namespace example1 {
     template <class T> class A {
       typedef int type;
@@ -334,7 +349,8 @@
 void dr225_g(int); // expected-note {{should be declared prior to the call site}}
 template void dr225_f(int); // expected-note {{in instantiation of}}
 
-namespace dr226 { // dr226: no
+//--- dr226: no
+namespace dr226 {
   template<typename T = void> void f() {}
 #if __cplusplus < 201103L
   // expected-error@-2 {{extension}}
@@ -395,7 +411,8 @@
     int n;
 }
 
-namespace dr228 { // dr228: yes
+//--- dr228: yes
+namespace dr228 {
   template <class T> struct X {
     void f();
   };
@@ -404,20 +421,23 @@
   };
 }
 
-namespace dr229 { // dr229: yes
+//--- dr229: yes
+namespace dr229 {
   template<typename T> void f();
   template<typename T> void f<T*>() {} // expected-error {{function template partial specialization}}
   template<> void f<int>() {}
 }
 
-namespace dr230 { // dr230: yes
+//--- dr230: yes
+namespace dr230 {
   struct S {
     S() { f(); } // expected-warning {{call to pure virtual member function}}
     virtual void f() = 0; // expected-note {{declared here}}
   };
 }
 
-namespace dr231 { // dr231: yes
+//--- dr231: yes
+namespace dr231 {
   namespace outer {
     namespace inner {
       int i; // expected-note {{here}}
@@ -430,7 +450,8 @@
 // dr234: na
 // dr235: na
 
-namespace dr236 { // dr236: yes
+//--- dr236: yes
+namespace dr236 {
   void *p = int();
 #if __cplusplus < 201103L
   // expected-warning@-2 {{null pointer}}
@@ -439,13 +460,15 @@
 #endif
 }
 
-namespace dr237 { // dr237: dup 470
+//--- dr237: dup 470
+namespace dr237 {
   template<typename T> struct A { void f() { T::error; } };
   template<typename T> struct B : A<T> {};
   template struct B<int>; // ok
 }
 
-namespace dr239 { // dr239: yes
+//--- dr239: yes
+namespace dr239 {
   namespace NS {
     class T {};
     void f(T);
@@ -463,7 +486,8 @@
 
 // dr240: dup 616
 
-namespace dr241 { // dr241: yes
+//--- dr241: yes
+namespace dr241 {
   namespace A {
     struct B {};
     template <int X> void f(); // expected-note 3{{candidate}}
@@ -487,7 +511,8 @@
   }
 }
 
-namespace dr243 { // dr243: yes
+//--- dr243: yes
+namespace dr243 {
   struct B;
   struct A {
     A(B); // expected-note {{candidate}}
@@ -499,8 +524,9 @@
   A a2 = b; // expected-error {{ambiguous}}
 }
 
-namespace dr244 { // dr244: 11
-                  // NB: this test is reused by dr399
+//--- dr244: 11
+// NB: this test is reused by dr399
+namespace dr244 {
   struct B {}; // expected-note {{type 'dr244::B' found by destructor name lookup}}
   struct D : B {};
 
@@ -579,14 +605,16 @@
   }
 }
 
-namespace dr245 { // dr245: yes
+//--- dr245: yes
+namespace dr245 {
   struct S {
     enum E {}; // expected-note {{here}}
     class E *p; // expected-error {{does not match previous declaration}}
   };
 }
 
-namespace dr246 { // dr246: yes
+//--- dr246: yes
+namespace dr246 {
   struct S {
     S() try { // expected-note {{try block}}
       throw 0;
@@ -597,7 +625,8 @@
   };
 }
 
-namespace dr247 { // dr247: yes
+//--- dr247: yes
+namespace dr247 {
   struct A {};
   struct B : A {
     void f();
@@ -623,16 +652,19 @@
   void (F::*i)() = &F::f;
 }
 
-namespace dr248 { // dr248: sup P1949
+//--- dr248: sup P1949
+namespace dr248 {
   int \u040d\u040e = 0;
 }
 
-namespace dr249 { // dr249: yes
+//--- dr249: yes
+namespace dr249 {
   template<typename T> struct X { void f(); };
   template<typename T> void X<T>::f() {}
 }
 
-namespace dr250 { // dr250: yes
+//--- dr250: yes
+namespace dr250 {
   typedef void (*FPtr)(double x[]);
 
   template<int I> void f(double x[]);
@@ -642,7 +674,8 @@
   FPtr gp = &g<>;
 }
 
-namespace dr252 { // dr252: yes
+//--- dr252: yes
+namespace dr252 {
   struct A {
     void operator delete(void*); // expected-note {{found}}
   };
@@ -682,7 +715,8 @@
   G::~G() {}
 }
 
-namespace dr254 { // dr254: yes
+//--- dr254: yes
+namespace dr254 {
   template<typename T> struct A {
     typedef typename T::type type; // ok even if this is a typedef-name, because
                                    // it's not an elaborated-type-specifier
@@ -694,7 +728,8 @@
   A<C>::type n; // expected-note {{instantiation of}}
 }
 
-namespace dr255 { // dr255: yes
+//--- dr255: yes
+namespace dr255 {
 struct S {
   void operator delete(void *){};
   void operator delete(void *, int){};
@@ -704,7 +739,8 @@
 
 // dr256: dup 624
 
-namespace dr257 { // dr257: yes
+//--- dr257: yes
+namespace dr257 {
   struct A { A(int); }; // expected-note {{here}}
   struct B : virtual A {
     B() {}
@@ -719,7 +755,8 @@
   };
 }
 
-namespace dr258 { // dr258: yes
+//--- dr258: yes
+namespace dr258 {
   struct A {
     void f(const int);
     template<typename> void g(int);
@@ -753,7 +790,8 @@
   } f; // expected-error {{abstract}}
 }
 
-namespace dr259 { // dr259: 4
+//--- dr259: 4
+namespace dr259 {
   template<typename T> struct A {};
   template struct A<int>; // expected-note {{previous}}
   template struct A<int>; // expected-error {{duplicate explicit instantiation}}
@@ -778,7 +816,8 @@
 
 // FIXME: When dr260 is resolved, also add tests for DR507.
 
-namespace dr261 { // dr261: no
+//--- dr261: no
+namespace dr261 {
 #pragma clang diagnostic push
 #pragma clang diagnostic warning "-Wused-but-marked-unused"
 
@@ -811,14 +850,16 @@
 #pragma clang diagnostic pop
 }
 
-namespace dr262 { // dr262: yes
+//--- dr262: yes
+namespace dr262 {
   int f(int = 0, ...);
   int k = f();
   int l = f(0);
   int m = f(0, 0);
 }
 
-namespace dr263 { // dr263: yes
+//--- dr263: yes
+namespace dr263 {
   struct X {};
   struct Y {
 #if __cplusplus < 201103L
@@ -841,7 +882,8 @@
 // dr269: na
 // dr270: na
 
-namespace dr272 { // dr272: yes
+//--- dr272: yes
+namespace dr272 {
   struct X {
     void f() {
       this->~X();
@@ -853,7 +895,8 @@
 
 #include <stdarg.h>
 #include <stddef.h>
-namespace dr273 { // dr273: yes
+//--- dr273: yes
+namespace dr273 {
   struct A {
     int n;
   };
@@ -868,7 +911,8 @@
 
 // dr274: na
 
-namespace dr275 { // dr275: no
+//--- dr275: no
+namespace dr275 {
   namespace N {
     template <class T> void f(T) {} // expected-note 1-4{{here}}
     template <class T> void g(T) {} // expected-note {{candidate}}
@@ -921,13 +965,15 @@
 
 // dr276: na
 
-namespace dr277 { // dr277: yes
+//--- dr277: yes
+namespace dr277 {
   typedef int *intp;
   int *p = intp();
   int a[fold(intp() ? -1 : 1)];
 }
 
-namespace dr280 { // dr280: yes
+//--- dr280: yes
+namespace dr280 {
   typedef void f0();
   typedef void f1(int);
   typedef void f2(int, int);
@@ -963,7 +1009,8 @@
   }
 }
 
-namespace dr281 { // dr281: no
+//--- dr281: no
+namespace dr281 {
   void a();
   inline void b();
 
@@ -980,7 +1027,8 @@
   };
 }
 
-namespace dr283 { // dr283: yes
+//--- dr283: yes
+namespace dr283 {
   template<typename T> // expected-note 2{{here}}
   struct S {
     friend class T; // expected-error {{shadows}}
@@ -988,7 +1036,8 @@
   };
 }
 
-namespace dr284 { // dr284: no
+//--- dr284: no
+namespace dr284 {
   namespace A {
     struct X;
     enum Y {};
@@ -1024,13 +1073,15 @@
   class D::Z z2; // ok per dr417
 }
 
-namespace dr285 { // dr285: yes
+//--- dr285: yes
+namespace dr285 {
   template<typename T> void f(T, int); // expected-note {{match}}
   template<typename T> void f(int, T); // expected-note {{match}}
   template<> void f<int>(int, int) {} // expected-error {{ambiguous}}
 }
 
-namespace dr286 { // dr286: yes
+//--- dr286: yes
+namespace dr286 {
   template<class T> struct A {
     class C {
       template<class T2> struct B {}; // expected-note {{here}}
@@ -1046,7 +1097,8 @@
 
 // dr288: na
 
-namespace dr289 { // dr289: yes
+//--- dr289: yes
+namespace dr289 {
   struct A; // expected-note {{forward}}
   struct B : A {}; // expected-error {{incomplete}}
 
@@ -1058,7 +1110,8 @@
 // dr291: dup 391
 // dr292 FIXME: write a codegen test
 
-namespace dr294 { // dr294: no
+//--- dr294: no
+namespace dr294 {
   void f() throw(int);
 #if __cplusplus > 201402L
     // expected-error@-2 {{ISO C++17 does not allow}} expected-note@-2 {{use 'noexcept}}
@@ -1089,7 +1142,8 @@
   }
 }
 
-namespace dr295 { // dr295: 3.7
+//--- dr295: 3.7
+namespace dr295 {
   typedef int f();
   const f g; // expected-warning {{'const' qualifier on function type 'f' (aka 'int ()') has no effect}}
   f &r = g;
@@ -1105,13 +1159,15 @@
   typedef volatile U *V; // expected-warning {{'volatile' qualifier on function type 'U' (aka 'int ()') has no effect}}
 }
 
-namespace dr296 { // dr296: yes
+//--- dr296: yes
+namespace dr296 {
   struct A {
     static operator int() { return 0; } // expected-error {{static}}
   };
 }
 
-namespace dr298 { // dr298: yes
+//--- dr298: yes
+namespace dr298 {
   struct A {
     typedef int type;
     A();
@@ -1142,7 +1198,8 @@
   G::~F() {} // ok
 }
 
-namespace dr299 { // dr299: yes c++11
+//--- dr299: yes c++11
+namespace dr299 {
   struct S {
     operator int();
   };
diff --git a/clang/test/CXX/drs/dr3xx.cpp b/clang/test/CXX/drs/dr3xx.cpp
--- a/clang/test/CXX/drs/dr3xx.cpp
+++ b/clang/test/CXX/drs/dr3xx.cpp
@@ -5,13 +5,15 @@
 // RUN: %clang_cc1 -std=c++11 -verify=expected,cxx98_17,cxx98_20 -triple %itanium_abi_triple %s -fexceptions -fcxx-exceptions -pedantic-errors
 // RUN: %clang_cc1 -std=c++98 -verify=expected,cxx98_17,cxx98_20 -triple %itanium_abi_triple %s -fexceptions -fcxx-exceptions -pedantic-errors
 
-namespace dr300 { // dr300: yes
+//--- dr300: yes
+namespace dr300 {
   template<typename R, typename A> void f(R (&)(A)) {}
   int g(int);
   void h() { f(g); }
 }
 
-namespace dr301 { // dr301: yes
+//--- dr301: yes
+namespace dr301 {
   // see also dr38
   struct S;
   template<typename T> void operator+(T, T);
@@ -42,7 +44,8 @@
   template<typename T> class S::operator&<T*> {}; // expected-error +{{}}
 }
 
-namespace dr302 { // dr302: yes
+//--- dr302: yes
+namespace dr302 {
   struct A { A(); ~A(); };
 #if __cplusplus < 201103L
   struct B { // expected-error {{implicit default constructor for 'dr302::B' must explicitly initialize the const member 'n'}}
@@ -70,7 +73,8 @@
 
 // dr303: na
 
-namespace dr304 { // dr304: yes
+//--- dr304: yes
+namespace dr304 {
   typedef int &a;
   int n = a(); // expected-error {{requires an initializer}}
 
@@ -85,7 +89,8 @@
 #endif
 }
 
-namespace dr305 { // dr305: no
+//--- dr305: no
+namespace dr305 {
   struct A {
     typedef A C;
   };
@@ -139,7 +144,8 @@
 #endif
 }
 
-namespace dr306 { // dr306: dup 39
+//--- dr306: dup 39
+namespace dr306 {
   struct A { struct B {}; };
   struct C { typedef A::B B; };
   struct D : A, A::B, C {};
@@ -154,7 +160,8 @@
 
 // dr307: na
 
-namespace dr308 { // dr308: yes
+//--- dr308: yes
+namespace dr308 {
   // This is mostly an ABI library issue.
   struct A {};
   struct B : A {};
@@ -182,7 +189,8 @@
 
 // dr309: dup 485
 
-namespace dr311 { // dr311: yes
+//--- dr311: yes
+namespace dr311 {
   namespace X { namespace Y {} }
   namespace X::Y {}
 #if __cplusplus <= 201402L
@@ -200,7 +208,8 @@
 
 // dr312: dup 616
 
-namespace dr313 { // dr313: dup 299 c++11
+//--- dr313: dup 299 c++11
+namespace dr313 {
   struct A { operator int() const; };
   int *p = new int[A()];
 #if __cplusplus < 201103L
@@ -220,7 +229,8 @@
 // dr315: na
 // dr316: sup 1004
 
-namespace dr317 { // dr317: 3.5
+//--- dr317: 3.5
+namespace dr317 {
   void f() {} // expected-note {{previous}}
   inline void f(); // expected-error {{inline declaration of 'f' follows non-inline definition}}
 
@@ -234,12 +244,14 @@
   inline int h(); // expected-error {{inline declaration of 'h' follows non-inline definition}}
 }
 
-namespace dr318 { // dr318: sup 1310
+//--- dr318: sup 1310
+namespace dr318 {
   struct A {};
   struct A::A a;
 }
 
-namespace dr319 { // dr319: no
+//--- dr319: no
+namespace dr319 {
   // FIXME: dup dr389
   // FIXME: We don't have a diagnostic for a name with linkage
   //        having a type without linkage.
@@ -278,7 +290,8 @@
 #endif
 }
 
-namespace dr320 { // dr320: yes
+//--- dr320: yes
+namespace dr320 {
 #if __cplusplus >= 201103L
   struct X {
     constexpr X() {}
@@ -291,7 +304,8 @@
 #endif
 }
 
-namespace dr321 { // dr321: dup 557
+//--- dr321: dup 557
+namespace dr321 {
   namespace N {
     template<int> struct A {
       template<int> struct B;
@@ -311,7 +325,8 @@
   bool x = i == j;
 }
 
-namespace dr322 { // dr322: yes
+//--- dr322: yes
+namespace dr322 {
   struct A {
     template<typename T> operator T&();
   } a;
@@ -321,7 +336,8 @@
 
 // dr323: no
 
-namespace dr324 { // dr324: yes
+//--- dr324: yes
+namespace dr324 {
   struct S { int n : 1; } s; // expected-note 3{{bit-field is declared here}}
   int &a = s.n; // expected-error {{non-const reference cannot bind to bit-field}}
   int *b = &s.n; // expected-error {{address of bit-field}}
@@ -334,12 +350,14 @@
   int *i = &++s.n; // expected-error {{address of bit-field}}
 }
 
-namespace dr326 { // dr326: yes
+//--- dr326: yes
+namespace dr326 {
   struct S {};
   int test[__is_trivially_constructible(S, const S&) ? 1 : -1];
 }
 
-namespace dr327 { // dr327: dup 538
+//--- dr327: dup 538
+namespace dr327 {
   struct A;
   class A {};
 
@@ -347,14 +365,16 @@
   struct B {};
 }
 
-namespace dr328 { // dr328: yes
+//--- dr328: yes
+namespace dr328 {
   struct A; // expected-note 3{{forward declaration}}
   struct B { A a; }; // expected-error {{incomplete}}
   template<typename> struct C { A a; }; // expected-error {{incomplete}}
   A *p = new A[0]; // expected-error {{incomplete}}
 }
 
-namespace dr329 { // dr329: 3.5
+//--- dr329: 3.5
+namespace dr329 {
   struct B {};
   template<typename T> struct A : B {
     friend void f(A a) { g(a); }
@@ -369,7 +389,8 @@
   }
 }
 
-namespace dr330 { // dr330: 7
+//--- dr330: 7
+namespace dr330 {
   // Conversions between P and Q will be allowed by P0388.
   typedef int *(*P)[3];
   typedef const int *const (*Q)[3];
@@ -451,13 +472,15 @@
   }
 }
 
-namespace dr331 { // dr331: yes
+//--- dr331: yes
+namespace dr331 {
   struct A {
     A(volatile A&); // expected-note 2{{candidate}}
   } const a, b(a); // expected-error 2{{no matching constructor}}
 }
 
-namespace dr332 { // dr332: dup 577
+//--- dr332: dup 577
+namespace dr332 {
   void f(volatile void); // expected-error {{'void' as parameter must not have type qualifiers}}
   // cxx20_23-warning@-1 {{volatile-qualified parameter type 'volatile void' is deprecated}}
   void g(const void); // expected-error {{'void' as parameter must not have type qualifiers}}
@@ -465,14 +488,16 @@
   // cxx20_23-warning@-1 {{volatile-qualified parameter type 'volatile void' is deprecated}}
 }
 
-namespace dr333 { // dr333: yes
+//--- dr333: yes
+namespace dr333 {
   int n = 0;
   int f(int(n));
   int g((int(n)));
   int h = f(g);
 }
 
-namespace dr334 { // dr334: yes
+//--- dr334: yes
+namespace dr334 {
   template<typename T> void f() {
     T x;
     f((x, 123));
@@ -486,7 +511,8 @@
 
 // dr335: no
 
-namespace dr336 { // dr336: yes
+//--- dr336: yes
+namespace dr336 {
   namespace Pre {
     template<class T1> class A {
       template<class T2> class B {
@@ -514,7 +540,8 @@
   }
 }
 
-namespace dr337 { // dr337: yes
+//--- dr337: yes
+namespace dr337 {
   template<typename T> void f(T (*)[1]);
   template<typename T> int &f(...);
 
@@ -529,7 +556,8 @@
   struct B { virtual ~B() = 0; };
 }
 
-namespace dr339 { // dr339: yes
+//--- dr339: yes
+namespace dr339 {
   template <int I> struct A { static const int value = I; };
 
   char xxx(int);
@@ -560,14 +588,16 @@
   A<1> c = make_A<char>();
 }
 
-namespace dr340 { // dr340: yes
+//--- dr340: yes
+namespace dr340 {
   struct A { A(int); };
   struct B { B(A, A, int); };
   int x, y;
   B b(A(x), A(y), 3);
 }
 
-namespace dr341 { // dr341: sup 1708
+//--- dr341: sup 1708
+namespace dr341 {
   namespace A {
     int n;
     extern "C" int &dr341_a = n; // expected-note {{previous}} expected-note {{declared with C language linkage here}}
@@ -602,12 +632,14 @@
   };
 }
 
-namespace dr344 { // dr344: dup 1435
+//--- dr344: dup 1435
+namespace dr344 {
   struct A { inline virtual ~A(); };
   struct B { friend A::~A(); };
 }
 
-namespace dr345 { // dr345: yes
+//--- dr345: yes
+namespace dr345 {
   struct A {
     struct X {};
     int X; // expected-note {{here}}
@@ -624,7 +656,8 @@
 
 // dr346: na
 
-namespace dr347 { // dr347: yes
+//--- dr347: yes
+namespace dr347 {
   struct base {
     struct nested;
     static int n;
@@ -642,7 +675,8 @@
 
 // dr348: na
 
-namespace dr349 { // dr349: no
+//--- dr349: no
+namespace dr349 {
   struct A {
     template <class T> operator T ***() {
       int ***p = 0;
@@ -669,7 +703,8 @@
 
 // dr351: na
 
-namespace dr352 { // dr352: yes
+//--- dr352: yes
+namespace dr352 {
   namespace example1 {
     namespace A {
       enum E {};
@@ -788,7 +823,8 @@
 
 // dr353 needs an IRGen test.
 
-namespace dr354 { // dr354: yes c++11
+//--- dr354: yes c++11
+namespace dr354 {
   // FIXME: Should we allow this in C++98 too?
   struct S {};
 
@@ -853,7 +889,8 @@
 
 // dr356: na
 
-namespace dr357 { // dr357: yes
+//--- dr357: yes
+namespace dr357 {
   template<typename T> struct A {
     void f() const; // expected-note {{const qualified}}
   };
@@ -865,7 +902,8 @@
   template<typename T> void B::f() const {} // expected-error {{does not match}}
 }
 
-namespace dr358 { // dr358: yes
+//--- dr358: yes
+namespace dr358 {
   extern "C" void dr358_f();
   namespace N {
     int var;
@@ -873,7 +911,8 @@
   }
 }
 
-namespace dr359 { // dr359: yes
+//--- dr359: yes
+namespace dr359 {
   // Note, the example in the DR is wrong; it doesn't contain an anonymous
   // union.
   struct E {
@@ -899,7 +938,8 @@
   };
 }
 
-namespace dr360 { // dr360: yes
+//--- dr360: yes
+namespace dr360 {
 struct A {
   int foo();
   int bar();
@@ -929,7 +969,8 @@
 // dr362: na
 // dr363: na
 
-namespace dr364 { // dr364: yes
+//--- dr364: yes
+namespace dr364 {
   struct S {
     static void f(int);
     void f(char);
@@ -944,7 +985,8 @@
 #if "foo" // expected-error {{invalid token}} dr366: yes
 #endif
 
-namespace dr367 { // dr367: yes
+//--- dr367: yes
+namespace dr367 {
   // FIXME: These diagnostics are terrible. Don't diagnose an ill-formed global
   // array as being a VLA!
   int a[true ? throw 0 : 4]; // expected-error 2{{variable length array}}
@@ -957,7 +999,8 @@
 #endif
 }
 
-namespace dr368 { // dr368: yes
+//--- dr368: yes
+namespace dr368 {
   template<typename T, T> struct S {}; // expected-note {{here}}
   template<typename T> int f(S<T, T()> *); // expected-error {{function type}}
   template<typename T> int g(S<T, (T())> *); // cxx98_17-note {{type 'X'}}
@@ -971,7 +1014,8 @@
 
 // dr370: na
 
-namespace dr372 { // dr372: no
+//--- dr372: no
+namespace dr372 {
   namespace example1 {
     template<typename T> struct X {
     protected:
@@ -1056,7 +1100,8 @@
   }
 }
 
-namespace dr373 { // dr373: 5
+//--- dr373: 5
+namespace dr373 {
   namespace X { int dr373; }
   struct dr373 { // expected-note {{here}}
     void f() {
@@ -1073,7 +1118,8 @@
   using namespace A::B; // expected-error {{expected namespace name}}
 }
 
-namespace dr374 { // dr374: yes
+//--- dr374: yes
+namespace dr374 {
   namespace N {
     template<typename T> void f();
     template<typename T> struct A { void f(); };
@@ -1086,7 +1132,8 @@
 // dr375: dup 345
 // dr376: na
 
-namespace dr377 { // dr377: yes
+//--- dr377: yes
+namespace dr377 {
   enum E { // expected-error {{enumeration values exceed range of largest integer}}
     a = -__LONG_LONG_MAX__ - 1, // expected-error 0-1{{extension}}
     b = 2 * (unsigned long long)__LONG_LONG_MAX__ // expected-error 0-2{{extension}}
@@ -1096,7 +1143,8 @@
 // dr378: dup 276
 // dr379: na
 
-namespace dr381 { // dr381: yes
+//--- dr381: yes
+namespace dr381 {
   struct A {
     int a;
   };
@@ -1113,7 +1161,8 @@
   }
 }
 
-namespace dr382 { // dr382: yes c++11
+//--- dr382: yes c++11
+namespace dr382 {
   // FIXME: Should we allow this in C++98 mode?
   struct A { typedef int T; };
   typename A::T t;
@@ -1125,7 +1174,8 @@
   typename A b; // expected-error {{expected a qualified name}}
 }
 
-namespace dr383 { // dr383: yes
+//--- dr383: yes
+namespace dr383 {
   struct A { A &operator=(const A&); };
   struct B { ~B(); };
   union C { C &operator=(const C&); };
@@ -1133,7 +1183,8 @@
   int check[(__is_pod(A) || __is_pod(B) || __is_pod(C) || __is_pod(D)) ? -1 : 1];
 }
 
-namespace dr384 { // dr384: yes
+//--- dr384: yes
+namespace dr384 {
   namespace N1 {
     template<typename T> struct Base {};
     template<typename T> struct X {
@@ -1155,7 +1206,8 @@
   }
 }
 
-namespace dr385 { // dr385: yes
+//--- dr385: yes
+namespace dr385 {
   struct A { protected: void f(); };
   struct B : A { using A::f; };
   struct C : A { void g(B b) { b.f(); } };
@@ -1167,7 +1219,8 @@
   int i(E e) { return e.n; } // expected-error {{protected member}}
 }
 
-namespace dr387 { // dr387: yes
+//--- dr387: yes
+namespace dr387 {
   namespace old {
     template<typename T> class number {
       number(int); // expected-note 2{{here}}
@@ -1198,7 +1251,8 @@
 
 // FIXME: dr388 needs codegen test
 
-namespace dr389 { // dr389: no
+//--- dr389: no
+namespace dr389 {
   struct S {
     typedef struct {} A;
     typedef enum {} B;
@@ -1310,7 +1364,8 @@
   }
 }
 
-namespace dr390 { // dr390: yes
+//--- dr390: yes
+namespace dr390 {
   template<typename T>
   struct A {
     A() { f(); } // expected-warning {{call to pure virt}}
@@ -1324,7 +1379,8 @@
   } b;
 }
 
-namespace dr391 { // dr391: yes c++11
+//--- dr391: yes c++11
+namespace dr391 {
   // FIXME: Should this apply to C++98 too?
   class A { A(const A&); }; // expected-note 0-1{{here}}
   A fa();
@@ -1351,7 +1407,8 @@
 // dr392 FIXME write codegen test
 // dr394: na
 
-namespace dr395 { // dr395: yes
+//--- dr395: yes
+namespace dr395 {
   struct S {
     template <typename T, int N>(&operator T())[N]; // expected-error {{cannot specify any part of a return type}}
     template <typename T, int N> operator(T (&)[N])(); // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error +{{}}
@@ -1386,7 +1443,8 @@
   int (S::*q)() = null2;
 }
 
-namespace dr396 { // dr396: yes
+//--- dr396: yes
+namespace dr396 {
   void f() {
     auto int a(); // expected-error {{storage class on function}}
     int (i); // expected-note {{previous}}
@@ -1399,7 +1457,8 @@
 
 // dr397: sup 1823
 
-namespace dr398 { // dr398: yes
+//--- dr398: yes
+namespace dr398 {
   namespace example1 {
     struct S {
       static int const I = 42;
@@ -1436,8 +1495,9 @@
   }
 }
 
-namespace dr399 { // dr399: 11
-                  // NB: reuse dr244 test 
+//--- dr399: 11
+// NB: reusing dr244 test
+namespace dr399 { 
   struct B {}; // expected-note {{type 'dr399::B' found by destructor name lookup}}
   struct D : B {};
 
diff --git a/clang/test/CXX/drs/dr4xx.cpp b/clang/test/CXX/drs/dr4xx.cpp
--- a/clang/test/CXX/drs/dr4xx.cpp
+++ b/clang/test/CXX/drs/dr4xx.cpp
@@ -10,7 +10,8 @@
 
 namespace std { struct type_info; }
 
-namespace dr400 { // dr400: yes
+//--- dr400: yes
+namespace dr400 {
   struct A { int a; struct a {}; }; // expected-note 2{{conflicting}} expected-note {{ambiguous}}
   struct B { int a; struct a {}; }; // expected-note 2{{target}} expected-note {{ambiguous}}
   struct C : A, B { using A::a; struct a b; };
@@ -18,7 +19,8 @@
   struct E : A, B { struct a b; }; // expected-error {{found in multiple base classes}}
 }
 
-namespace dr401 { // dr401: yes
+//--- dr401: yes
+namespace dr401 {
   template<class T, class U = typename T::type> class A : public T {}; // expected-error {{protected}} expected-error 2{{private}}
 
   class B {
@@ -63,7 +65,8 @@
 #endif
 }
 
-namespace dr403 { // dr403: yes
+//--- dr403: yes
+namespace dr403 {
   namespace A {
     struct S {};
     int f(void*);
@@ -80,8 +83,9 @@
 // dr404: na
 // (NB: also sup 594)
 
-namespace dr405 { // dr405: yes
-                  // NB: also dup 218
+//--- dr405: yes
+// NB: also dup 218
+namespace dr405 {
   namespace A {
     struct S {};
     void f(S);
@@ -114,7 +118,8 @@
   void testE(E::S es) { f(es); } // expected-error {{undeclared identifier}}
 }
 
-namespace dr406 { // dr406: yes
+//--- dr406: yes
+namespace dr406 {
   typedef struct {
     static int n; // expected-error {{static data member 'n' not allowed in anonymous struct}}
   } A;
@@ -123,8 +128,9 @@
   } B;
 }
 
-namespace dr407 { // dr407: 3.8
-                  // NB: reused by dr1894 and dr2199
+//--- dr407: 3.8
+// NB: reused by dr1894 and dr2199
+namespace dr407 {
   struct S;
   typedef struct S S;
   void f() {
@@ -178,7 +184,8 @@
   }
 }
 
-namespace dr408 { // dr408: 3.4
+//--- dr408: 3.4
+namespace dr408 {
   template<int N> void g() { int arr[N != 1 ? 1 : -1]; }
   template<> void g<2>() { }
 
@@ -207,7 +214,8 @@
   template void R<int>::f();
 }
 
-namespace dr409 { // dr409: yes
+//--- dr409: yes
+namespace dr409 {
   template<typename T> struct A {
     typedef int B;
     B b1;
@@ -220,7 +228,8 @@
   };
 }
 
-namespace dr410 { // dr410: no
+//--- dr410: no
+namespace dr410 {
   template<class T> void f(T);
   void g(int);
   namespace M {
@@ -247,7 +256,8 @@
 
 // dr412 is in its own file.
 
-namespace dr413 { // dr413: yes
+//--- dr413: yes
+namespace dr413 {
   struct S {
     int a;
     int : 17;
@@ -265,7 +275,8 @@
   T t2 = { 1, 2 }; // expected-error {{aggregate with no elements requires explicit braces}}
 }
 
-namespace dr414 { // dr414: dup 305
+//--- dr414: dup 305
+namespace dr414 {
   struct X {};
   void f() {
     X x;
@@ -274,13 +285,15 @@
   }
 }
 
-namespace dr415 { // dr415: yes
+//--- dr415: yes
+namespace dr415 {
   template<typename T> void f(T, ...) { T::error; }
   void f(int, int);
   void g() { f(0, 0); } // ok
 }
 
-namespace dr416 { // dr416: yes
+//--- dr416: yes
+namespace dr416 {
   extern struct A a;
   int &operator+(const A&, const A&);
   int &k = a + a;
@@ -288,7 +301,8 @@
   float &f = a + a;
 }
 
-namespace dr417 { // dr417: no
+//--- dr417: no
+namespace dr417 {
   struct A;
   struct dr417::A {}; // expected-warning {{extra qualification}}
   struct B { struct X; };
@@ -316,7 +330,8 @@
   }
 }
 
-namespace dr418 { // dr418: no
+//--- dr418: no
+namespace dr418 {
 namespace example1 {
 void f1(int, int = 0);
 void f1(int = 0, int);
@@ -360,7 +375,8 @@
 } // namespace example3
 } // namespace dr418
 
-namespace dr420 { // dr420: yes
+//--- dr420: yes
+namespace dr420 {
   template<typename T> struct ptr {
     T *operator->() const;
     T &operator*() const;
@@ -411,13 +427,15 @@
 #endif
 }
 
-namespace dr421 { // dr421: yes
+//--- dr421: yes
+namespace dr421 {
   struct X { X(); int n; int &r; };
   int *p = &X().n; // expected-error-re {{{{taking the address of a temporary|cannot take the address of an rvalue}}}}
   int *q = &X().r;
 }
 
-namespace dr422 { // dr422: yes
+//--- dr422: yes
+namespace dr422 {
   template<typename T, typename U> void f() {
     typedef T type; // expected-note {{prev}}
     typedef U type; // expected-error {{redef}}
@@ -426,12 +444,14 @@
   template void f<int, char>(); // expected-note {{instantiation}}
 }
 
-namespace dr423 { // dr423: yes
+//--- dr423: yes
+namespace dr423 {
   template<typename T> struct X { operator T&(); };
   void f(X<int> x) { x += 1; }
 }
 
-namespace dr424 { // dr424: yes
+//--- dr424: yes
+namespace dr424 {
   struct A {
     typedef int N; // expected-note {{previous}}
     typedef int N; // expected-error {{redefinition}}
@@ -455,7 +475,8 @@
   };
 }
 
-namespace dr425 { // dr425: yes
+//--- dr425: yes
+namespace dr425 {
   struct A { template<typename T> operator T() const; } a;
   float f = 1.0f * a; // expected-error {{ambiguous}} expected-note 5+{{built-in candidate}}
 
@@ -468,7 +489,8 @@
   float g = 1.0f * b; // ok
 }
 
-namespace dr427 { // dr427: yes
+//--- dr427: yes
+namespace dr427 {
   struct B {};
   struct D : public B {
     D(B &) = delete; // expected-error 0-1{{extension}} expected-note {{deleted}}
@@ -481,7 +503,8 @@
   const D &d4(b); // expected-error {{deleted}}
 }
 
-namespace dr428 { // dr428: yes
+//--- dr428: yes
+namespace dr428 {
   template<typename T> T make();
   extern struct X x; // expected-note 5{{forward declaration}}
   void f() {
@@ -496,7 +519,8 @@
   }
 }
 
-namespace dr429 { // dr429: yes c++11
+//--- dr429: yes c++11
+namespace dr429 {
   // FIXME: This rule is obviously intended to apply to C++98 as well.
   struct A {
     static void *operator new(size_t, size_t);
@@ -513,7 +537,8 @@
   } *b = new (0) B; // ok, second delete is not a non-placement deallocation function
 }
 
-namespace dr430 { // dr430: yes c++11
+//--- dr430: yes c++11
+namespace dr430 {
   // resolved by n2239
   // FIXME: This should apply in C++98 too.
   void f(int n) {
@@ -524,7 +549,8 @@
   }
 }
 
-namespace dr431 { // dr431: yes
+//--- dr431: yes
+namespace dr431 {
   struct A {
     template<typename T> T *get();
     template<typename T> struct B {
@@ -552,7 +578,8 @@
   }
 }
 
-namespace dr432 { // dr432: yes
+//--- dr432: yes
+namespace dr432 {
   template<typename T> struct A {};
   template<typename T> struct B : A<B> {}; // expected-error {{requires template arguments}} expected-note {{declared}}
   template<typename T> struct C : A<C<T> > {};
@@ -561,7 +588,8 @@
 #endif
 }
 
-namespace dr433 { // dr433: yes
+//--- dr433: yes
+namespace dr433 {
   template<class T> struct S {
     void f(union U*);
   };
@@ -571,7 +599,8 @@
   S<int> s;
 }
 
-namespace dr434 { // dr434: sup 2352
+//--- dr434: sup 2352
+namespace dr434 {
   void f() {
     const int ci = 0;
     int *pi = 0;
@@ -590,12 +619,14 @@
 
 // dr435: na
 
-namespace dr436 { // dr436: yes
+//--- dr436: yes
+namespace dr436 {
   enum E { f }; // expected-note {{previous}}
   void f(); // expected-error {{redefinition}}
 }
 
-namespace dr437 { // dr437: sup 1308
+//--- dr437: sup 1308
+namespace dr437 {
   // This is superseded by 1308, which is in turn superseded by 1330,
   // which restores this rule.
   template<typename U> struct T : U {};
@@ -623,7 +654,8 @@
 // dr442: sup 348
 // dr443: na
 
-namespace dr444 { // dr444: yes
+//--- dr444: yes
+namespace dr444 {
   struct D;
   struct B {                    // expected-note {{candidate function (the implicit copy}} expected-note 0-1 {{implicit move}}
     D &operator=(D &) = delete; // expected-error 0-1{{extension}} expected-note {{deleted}}
@@ -636,14 +668,16 @@
   }
 }
 
-namespace dr445 { // dr445: yes
+//--- dr445: yes
+namespace dr445 {
   class A { void f(); }; // expected-note {{private}}
   struct B {
     friend void A::f(); // expected-error {{private}}
   };
 }
 
-namespace dr446 { // dr446: yes
+//--- dr446: yes
+namespace dr446 {
   struct C;
   struct A {
     A();
@@ -673,7 +707,8 @@
   }
 }
 
-namespace dr447 { // dr447: yes
+//--- dr447: yes
+namespace dr447 {
   struct A { int n; int a[4]; };
   template<int> struct U {
     typedef int type;
@@ -695,7 +730,8 @@
   }
 }
 
-namespace dr448 { // dr448: yes
+//--- dr448: yes
+namespace dr448 {
   template<typename T = int> void f(int); // expected-error 0-1{{extension}} expected-note {{no known conversion}}
   template<typename T> void g(T t) {
     f<T>(t); // expected-error {{neither visible in the template definition nor found by argument-dependent lookup}}
@@ -709,7 +745,8 @@
 
 // dr449: na
 
-namespace dr450 { // dr450: yes
+//--- dr450: yes
+namespace dr450 {
   typedef int A[3];
   void f1(const A &);
   void f2(A &); // expected-note +{{not viable}}
@@ -726,13 +763,15 @@
 #endif
 }
 
-namespace dr451 { // dr451: yes
+//--- dr451: yes
+namespace dr451 {
   const int a = 1 / 0; // expected-warning {{undefined}}
   const int b = 1 / 0; // expected-warning {{undefined}} expected-note {{here}} expected-note 0-1{{division by zero}}
   int arr[b]; // expected-error +{{variable length arr}} expected-note {{initializer of 'b' is not a constant}}
 }
 
-namespace dr452 { // dr452: yes
+//--- dr452: yes
+namespace dr452 {
   struct A {
     int a, b, c;
     A *p;
@@ -743,7 +782,8 @@
 
 // dr454 FIXME write a codegen test
 
-namespace dr456 { // dr456: yes
+//--- dr456: yes
+namespace dr456 {
   // sup 903 c++11
   const int null = 0;
   void *p = null;
@@ -762,7 +802,8 @@
 #endif
 }
 
-namespace dr457 { // dr457: yes
+//--- dr457: yes
+namespace dr457 {
   const int a = 1;
   const volatile int b = 1;
   int ax[a];
@@ -774,7 +815,8 @@
   };
 }
 
-namespace dr458 { // dr458: 11
+//--- dr458: 11
+namespace dr458 {
   struct A {
     int T;
     int f();
@@ -809,7 +851,8 @@
   }
 }
 
-namespace dr460 { // dr460: yes
+//--- dr460: yes
+namespace dr460 {
   namespace X { namespace Q { int n; } }
   namespace Y {
     using X; // expected-error {{requires a qualified name}}
@@ -824,7 +867,8 @@
 // dr464: na
 // dr465: na
 
-namespace dr466 { // dr466: no
+//--- dr466: no
+namespace dr466 {
   typedef int I;
   typedef const int CI;
   typedef volatile int VI;
@@ -854,7 +898,8 @@
   }
 }
 
-namespace dr467 { // dr467: yes
+//--- dr467: yes
+namespace dr467 {
   int stuff();
 
   int f() {
@@ -874,7 +919,8 @@
   }
 }
 
-namespace dr468 { // dr468: yes c++11
+//--- dr468: yes c++11
+namespace dr468 {
   // FIXME: Should we allow this in C++98 too?
   template<typename> struct A {
     template<typename> struct B {
@@ -887,13 +933,15 @@
 #endif
 }
 
-namespace dr469 { // dr469: no
+//--- dr469: no
+namespace dr469 {
   template<typename T> struct X; // expected-note {{here}}
   template<typename T> struct X<const T> {};
   X<int&> x; // expected-error {{undefined}}
 }
 
-namespace dr470 { // dr470: yes
+//--- dr470: yes
+namespace dr470 {
   template<typename T> struct A {
     struct B {};
   };
@@ -908,7 +956,8 @@
   template struct C<char>;
 }
 
-namespace dr471 { // dr471: yes
+//--- dr471: yes
+namespace dr471 {
   struct A { int n; };
   struct B : private virtual A {};
   struct C : protected virtual A {};
@@ -924,7 +973,8 @@
   struct H : B, G { int f() { return n; } }; // expected-error {{private}}
 }
 
-namespace dr474 { // dr474: yes
+//--- dr474: yes
+namespace dr474 {
   namespace N {
     struct S {
       void f();
@@ -941,7 +991,8 @@
 
 // dr475 FIXME write a codegen test
 
-namespace dr477 { // dr477: 3.5
+//--- dr477: 3.5
+namespace dr477 {
   struct A {
     explicit A();
     virtual void f();
@@ -954,13 +1005,15 @@
   virtual void A::f() {} // expected-error {{can only be specified inside the class definition}}
 }
 
-namespace dr478 { // dr478: yes
+//--- dr478: yes
+namespace dr478 {
   struct A { virtual void f() = 0; }; // expected-note {{unimplemented}}
   void f(A *a);
   void f(A a[10]); // expected-error {{array of abstract class type}}
 }
 
-namespace dr479 { // dr479: yes
+//--- dr479: yes
+namespace dr479 {
   struct S {
     S();
   private:
@@ -995,7 +1048,8 @@
   }
 }
 
-namespace dr480 { // dr480: yes
+//--- dr480: yes
+namespace dr480 {
   struct A { int n; };
   struct B : A {};
   struct C : virtual B {};
@@ -1016,7 +1070,8 @@
   D &k = static_cast<D&>(j); // expected-error {{virtual base}}
 }
 
-namespace dr481 { // dr481: yes
+//--- dr481: yes
+namespace dr481 {
   template<class T, T U> class A { T *x; };
   T *x; // expected-error {{unknown type}}
 
@@ -1055,7 +1110,8 @@
   I<123, char*, J> *j;
 }
 
-namespace dr482 { // dr482: 3.5
+//--- dr482: 3.5
+namespace dr482 {
   extern int a;
   void f();
 
@@ -1089,7 +1145,8 @@
   };
 }
 
-namespace dr483 { // dr483: yes
+//--- dr483: yes
+namespace dr483 {
   namespace climits {
     int check1[__SCHAR_MAX__ >= 127 ? 1 : -1];
     int check2[__SHRT_MAX__ >= 32767 ? 1 : -1];
@@ -1109,7 +1166,8 @@
   }
 }
 
-namespace dr484 { // dr484: yes
+//--- dr484: yes
+namespace dr484 {
   struct A {
     A();
     void f();
@@ -1142,7 +1200,8 @@
   } S;
 }
 
-namespace dr485 { // dr485: yes
+//--- dr485: yes
+namespace dr485 {
   namespace N {
     struct S {};
     int operator+(S, S);
@@ -1155,7 +1214,8 @@
   int b = f<int>(s);
 }
 
-namespace dr486 { // dr486: yes
+//--- dr486: yes
+namespace dr486 {
   template<typename T> T f(T *); // expected-note 2{{substitution failure}}
   int &f(...);
 
@@ -1170,13 +1230,15 @@
   }
 }
 
-namespace dr487 { // dr487: yes
+//--- dr487: yes
+namespace dr487 {
   enum E { e };
   int operator+(int, E); // expected-note 0-1{{here}}
   int i[4 + e]; // expected-error 2{{variable length array}} expected-note 0-1{{non-constexpr}}
 }
 
-namespace dr488 { // dr488: yes c++11
+//--- dr488: yes c++11
+namespace dr488 {
   template <typename T> void f(T);
   void f(int);
   void g() {
@@ -1194,7 +1256,8 @@
 
 // dr489: na
 
-namespace dr490 { // dr490: yes
+//--- dr490: yes
+namespace dr490 {
   template<typename T> struct X {};
 
   struct A {
@@ -1234,14 +1297,16 @@
   };
 }
 
-namespace dr491 { // dr491: dup 413
+//--- dr491: dup 413
+namespace dr491 {
   struct A {} a, b[3] = { a, {} };
   A c[2] = { a, {}, b[1] }; // expected-error {{excess elements}}
 }
 
 // dr492 FIXME write a codegen test
 
-namespace dr493 { // dr493: dup 976
+//--- dr493: dup 976
+namespace dr493 {
   struct X {
     template <class T> operator const T &() const;
   };
@@ -1251,7 +1316,8 @@
   }
 }
 
-namespace dr494 { // dr494: dup 372
+//--- dr494: dup 372
+namespace dr494 {
   class A {
     class B {};
     friend class C;
@@ -1264,7 +1330,8 @@
   };
 }
 
-namespace dr495 { // dr495: 3.5
+//--- dr495: 3.5
+namespace dr495 {
   template<typename T>
   struct S {
     operator int() { return T::error; }
@@ -1282,7 +1349,8 @@
   long n2 = s2;
 }
 
-namespace dr496 { // dr496: sup 2094
+//--- dr496: sup 2094
+namespace dr496 {
   struct A { int n; };
   struct B { volatile int n; };
   int check1[ __is_trivially_copyable(const int) ? 1 : -1];
@@ -1294,7 +1362,8 @@
   int check6[ __is_trivially_assignable(B, const B&) ? 1 : -1];
 }
 
-namespace dr497 { // dr497: sup 253
+//--- dr497: sup 253
+namespace dr497 {
   void before() {
     struct S {
       mutable int i;
@@ -1315,7 +1384,8 @@
   }
 }
 
-namespace dr499 { // dr499: yes
+//--- dr499: yes
+namespace dr499 {
   extern char str[];
   void f() { throw str; }
 }
diff --git a/clang/test/CXX/drs/dr5xx.cpp b/clang/test/CXX/drs/dr5xx.cpp
--- a/clang/test/CXX/drs/dr5xx.cpp
+++ b/clang/test/CXX/drs/dr5xx.cpp
@@ -17,7 +17,8 @@
 void *operator new(size_t, std::align_val_t); // expected-note{{candidate}}
 #endif
 
-namespace dr500 { // dr500: dup 372
+//--- dr500: dup 372
+namespace dr500 {
   class D;
   class A {
     class B;
@@ -29,7 +30,8 @@
   class D : public A::B {};
 }
 
-namespace dr501 { // dr501: yes
+//--- dr501: yes
+namespace dr501 {
   struct A {
     friend void f() {}
     void g() {
@@ -38,7 +40,8 @@
   };
 }
 
-namespace dr502 { // dr502: yes
+//--- dr502: yes
+namespace dr502 {
   struct Q {};
   template<typename T> struct A {
     enum E { e = 1 };
@@ -52,12 +55,14 @@
   template struct A<int>;
 }
 
-namespace dr505 { // dr505: yes
+//--- dr505: yes
+namespace dr505 {
   const char *exts = "\e\(\{\[\%"; // expected-error 5{{use of non-standard escape}}
   const char *unknown = "\Q"; // expected-error {{unknown escape sequence}}
 }
 
-namespace dr506 { // dr506: yes
+//--- dr506: yes
+namespace dr506 {
   struct NonPod { ~NonPod(); };
   void f(...);
   void g(NonPod np) { f(np); } // expected-error {{cannot pass}}
@@ -70,7 +75,8 @@
 // dr509: na
 // dr510: na
 
-namespace dr512 { // dr512: yes
+//--- dr512: yes
+namespace dr512 {
   struct A {
     A(int);
   };
@@ -84,12 +90,14 @@
 
 // dr513: na
 
-namespace dr514 { // dr514: yes
+//--- dr514: yes
+namespace dr514 {
   namespace A { extern int x, y; }
   int A::x = y;
 }
 
-namespace dr515 { // dr515: sup 1017
+//--- dr515: sup 1017
+namespace dr515 {
   // FIXME: dr1017 reverses the wording of dr515, but the current draft has
   // dr515's wording, with a different fix for dr1017.
 
@@ -108,7 +116,8 @@
 
 // dr516: na
 
-namespace dr517 { // dr517: no
+//--- dr517: no
+namespace dr517 {
   // This is NDR, but we should diagnose it anyway.
   template<typename T> struct S {};
   template<typename T> int v = 0; // expected-error 0-1{{extension}}
@@ -128,14 +137,16 @@
   template<typename T> int v<T&> = 0; // expected-error 0-1{{extension}}
 }
 
-namespace dr518 { // dr518: yes c++11
+//--- dr518: yes c++11
+namespace dr518 {
   enum E { e, };
 #if __cplusplus < 201103L
   // expected-error@-2 {{C++11 extension}}
 #endif
 }
 
-namespace dr519 { // dr519: yes
+//--- dr519: yes
+namespace dr519 {
 // FIXME: Add a codegen test.
 #if __cplusplus >= 201103L
 #define fold(x) (__builtin_constant_p(x) ? (x) : (x))
@@ -150,7 +161,8 @@
 // FIXME: The wording here is broken. It's not reasonable to expect a
 // diagnostic here. Once the relevant DR gets a number, mark this as a dup.
 
-namespace dr522 { // dr522: yes
+//--- dr522: yes
+namespace dr522 {
   struct S {};
   template<typename T> void b1(volatile T &);
   template<typename T> void b2(volatile T * const *);
@@ -180,7 +192,8 @@
   }
 }
 
-namespace dr524 { // dr524: yes
+//--- dr524: yes
+namespace dr524 {
   template<typename T> void f(T a, T b) { operator+(a, b); } // expected-error {{call}}
 
   struct S {};
@@ -192,7 +205,8 @@
   template void f(N::S, N::S); // expected-note {{instantiation}}
 }
 
-namespace dr525 { // dr525: yes
+//--- dr525: yes
+namespace dr525 {
   namespace before {
     // Note, the example was correct prior to the change; instantiation is
     // required for cases like this:
@@ -209,7 +223,8 @@
   }
 }
 
-namespace dr526 { // dr526: yes
+//--- dr526: yes
+namespace dr526 {
   template<int> struct S {};
   template<int N> void f1(S<N> s);
   template<int N> void f2(S<(N)> s); // expected-note {{couldn't infer}}
@@ -239,7 +254,8 @@
   };
 }
 
-namespace dr527 { // dr527: na
+//--- dr527: na
+namespace dr527 {
   // This DR is meaningless. It removes a required diagnostic from the case
   // where a not-externally-visible object is odr-used but not defined, which
   // requires a diagnostic for a different reason.
@@ -254,7 +270,8 @@
   int ax = a.x, bx = b.x, cx = c.x, dx = d.x, ex = E::e->x, fx = F::f->x;
 }
 
-namespace dr530 { // dr530: yes
+//--- dr530: yes
+namespace dr530 {
   template<int*> struct S { enum { N = 1 }; };
   template<void(*)()> struct T { enum { N = 1 }; };
   int n;
@@ -263,7 +280,8 @@
   int b[T<&f>::N];
 }
 
-namespace dr531 { // dr531: partial
+//--- dr531: partial
+namespace dr531 {
   namespace good {
     template<typename T> struct A {
       void f(T) { T::error; }
@@ -364,7 +382,8 @@
 }
 
 // PR8130
-namespace dr532 { // dr532: 3.5
+//--- dr532: 3.5
+namespace dr532 {
   struct A { };
 
   template<class T> struct B {
@@ -381,13 +400,15 @@
 
 // dr533: na
 
-namespace dr534 { // dr534: yes
+//--- dr534: yes
+namespace dr534 {
   struct S {};
   template<typename T> void operator+(S, T);
   template<typename T> void operator+<T*>(S, T*) {} // expected-error {{function template partial spec}}
 }
 
-namespace dr535 { // dr535: yes
+//--- dr535: yes
+namespace dr535 {
   class X { private: X(const X&); };
   struct A {
     X x;
@@ -453,7 +474,8 @@
 #endif
 }
 
-namespace dr540 { // dr540: yes
+//--- dr540: yes
+namespace dr540 {
   typedef int &a;
   typedef const a &a; // expected-warning {{has no effect}}
   typedef const int &b;
@@ -462,7 +484,8 @@
   typedef const b &c; // expected-error {{different}} expected-warning {{has no effect}}
 }
 
-namespace dr541 { // dr541: yes
+//--- dr541: yes
+namespace dr541 {
   template<int> struct X { typedef int type; };
   template<typename T> struct S {
     int f(T);
@@ -486,7 +509,8 @@
   };
 }
 
-namespace dr542 { // dr542: yes
+//--- dr542: yes
+namespace dr542 {
 #if __cplusplus >= 201103L
   // In C++20 A and B are no longer aggregates and thus the constructor is
   // called, which fails.
@@ -511,7 +535,8 @@
 #endif
 }
 
-namespace dr543 { // dr543: yes
+//--- dr543: yes
+namespace dr543 {
   // In C++98+DR543, this is valid because value-initialization doesn't call a
   // trivial default constructor, so we never notice that defining the
   // constructor would be ill-formed.
@@ -529,7 +554,8 @@
 #endif
 }
 
-namespace dr544 { // dr544: yes
+//--- dr544: yes
+namespace dr544 {
   int *n;
 
   template<class T> struct A { int n; };
@@ -538,13 +564,15 @@
   int k = B<int>().get();
 }
 
-namespace dr546 { // dr546: yes
+//--- dr546: yes
+namespace dr546 {
   template<typename T> struct A { void f(); };
   template struct A<int>;
   template<typename T> void A<T>::f() { T::error; }
 }
 
-namespace dr547 { // dr547: yes
+//--- dr547: yes
+namespace dr547 {
   template<typename T> struct X;
   template<typename T> struct X<T() const> {};
   template<typename T, typename C> X<T> f(T C::*) { return X<T>(); }
@@ -553,14 +581,16 @@
   X<void() const> x = f(&S::f);
 }
 
-namespace dr548 { // dr548: dup 482
+//--- dr548: dup 482
+namespace dr548 {
   template<typename T> struct S {};
   template<typename T> void f() {}
   template struct dr548::S<int>;
   template void dr548::f<int>();
 }
 
-namespace dr551 { // dr551: yes c++11
+//--- dr551: yes c++11
+namespace dr551 {
   // FIXME: This obviously should apply in C++98 mode too.
   template<typename T> void f() {}
   template inline void f<int>();
@@ -583,7 +613,8 @@
 #endif
 }
 
-namespace dr552 { // dr552: yes
+//--- dr552: yes
+namespace dr552 {
   template<typename T, typename T::U> struct X {};
   struct Y { typedef int U; };
   X<Y, 0> x;
@@ -607,7 +638,8 @@
 // dr554: na
 // dr556: na
 
-namespace dr557 { // dr557: yes
+//--- dr557: yes
+namespace dr557 {
   template<typename T> struct S {
     friend void f(S<T> *);
     friend void g(S<S<T> > *);
@@ -618,7 +650,8 @@
   }
 }
 
-namespace dr558 { // dr558: yes
+//--- dr558: yes
+namespace dr558 {
   wchar_t a = L'\uD7FF';
   wchar_t b = L'\xD7FF';
   wchar_t c = L'\uD800'; // expected-error {{invalid universal character}}
@@ -631,7 +664,8 @@
 
 template<typename> struct dr559 { typedef int T; dr559::T u; }; // dr559: yes
 
-namespace dr561 { // dr561: yes
+//--- dr561: yes
+namespace dr561 {
   template<typename T> void f(int);
   template<typename T> void g(T t) {
     f<T>(t);
@@ -647,14 +681,16 @@
 
 // dr562: na
 
-namespace dr564 { // dr564: yes
+//--- dr564: yes
+namespace dr564 {
   extern "C++" void f(int);
   void f(int); // ok
   extern "C++" { extern int n; }
   int n; // ok
 }
 
-namespace dr565 { // dr565: yes
+//--- dr565: yes
+namespace dr565 {
   namespace N {
     template<typename T> int f(T); // expected-note {{target}}
   }
@@ -666,7 +702,8 @@
   template<typename T> int f(T); // expected-error {{conflicts with}}
 }
 
-namespace dr566 { // dr566: yes
+//--- dr566: yes
+namespace dr566 {
 #if __cplusplus >= 201103L
   int check[int(-3.99) == -3 ? 1 : -1];
 #endif
@@ -674,7 +711,8 @@
 
 // dr567: na
 
-namespace dr568 { // dr568: yes c++11
+//--- dr568: yes c++11
+namespace dr568 {
   // FIXME: This is a DR issue against C++98, so should probably apply there
   // too.
   struct x { int y; };
@@ -719,7 +757,8 @@
   }
 }
 
-namespace dr569 { // dr569: yes c++11
+//--- dr569: yes c++11
+namespace dr569 {
   // FIXME: This is a DR issue against C++98, so should probably apply there
   // too.
   ;;;;;
@@ -728,25 +767,29 @@
 #endif
 }
 
-namespace dr570 { // dr570: dup 633
+//--- dr570: dup 633
+namespace dr570 {
   int n;
   int &r = n; // expected-note {{previous}}
   int &r = n; // expected-error {{redefinition}}
 }
 
-namespace dr571 { // dr571 unknown
+//--- dr571 unknown
+namespace dr571 {
   // FIXME: Add a codegen test.
   typedef int &ir;
   int n;
   const ir r = n; // expected-warning {{has no effect}} FIXME: Test if this has internal linkage.
 }
 
-namespace dr572 { // dr572: yes
+//--- dr572: yes
+namespace dr572 {
   enum E { a = 1, b = 2 };
   int check[a + b == 3 ? 1 : -1];
 }
 
-namespace dr573 { // dr573: no
+//--- dr573: no
+namespace dr573 {
   void *a;
   int *b = reinterpret_cast<int*>(a);
   void (*c)() = reinterpret_cast<void(*)()>(a);
@@ -762,7 +805,8 @@
   template<int*> struct T;
 }
 
-namespace dr574 { // dr574: yes
+//--- dr574: yes
+namespace dr574 {
   struct A {
     A &operator=(const A&) const; // expected-note {{different qualifiers}}
   };
@@ -794,7 +838,8 @@
   };
 }
 
-namespace dr575 { // dr575: yes
+//--- dr575: yes
+namespace dr575 {
   template<typename T, typename U = typename T::type> void a(T); void a(...); // expected-error 0-1{{extension}}
   template<typename T, typename T::type U = 0> void b(T); void b(...); // expected-error 0-1{{extension}}
   template<typename T, int U = T::value> void c(T); void c(...); // expected-error 0-1{{extension}}
@@ -815,13 +860,15 @@
   void *p = h((void*)0);
 }
 
-namespace dr576 { // dr576: yes
+//--- dr576: yes
+namespace dr576 {
   typedef void f() {} // expected-error {{function definition declared 'typedef'}}
   void f(typedef int n); // expected-error {{invalid storage class}}
   void f(char c) { typedef int n; }
 }
 
-namespace dr577 { // dr577: yes
+//--- dr577: yes
+namespace dr577 {
   typedef void V;
   typedef const void CV;
   void a(void);
@@ -844,7 +891,8 @@
   }
 }
 
-namespace dr580 { // dr580: partial
+//--- dr580: partial
+namespace dr580 {
   class C;
   struct A { static C c; };
   struct B { static C c; };
@@ -887,7 +935,8 @@
 
 // dr582: na
 
-namespace dr583 { // dr583: 4
+//--- dr583: 4
+namespace dr583 {
   // see n3624
   int *p;
   bool b1 = p < 0; // expected-error {{ordered comparison between pointer and zero}}
@@ -898,7 +947,8 @@
 
 // dr584: na
 
-namespace dr585 { // dr585: yes
+//--- dr585: yes
+namespace dr585 {
   template<typename> struct T;
   struct A {
     friend T;
@@ -926,7 +976,8 @@
 
 // dr586: na
 
-namespace dr587 { // dr587: yes
+//--- dr587: yes
+namespace dr587 {
   template<typename T> void f(bool b, const T x, T y) {
     const T *p = &(b ? x : y);
   }
@@ -935,7 +986,8 @@
   template void f(bool, const S, S);
 }
 
-namespace dr588 { // dr588: yes
+//--- dr588: yes
+namespace dr588 {
   struct A { int n; }; // expected-note {{ambiguous}}
   template<typename T> int f() {
     struct S : A, T { int f() { return n; } } s;
@@ -946,7 +998,8 @@
   int k = f<B>(); // expected-note {{here}}
 }
 
-namespace dr589 { // dr589: yes
+//--- dr589: yes
+namespace dr589 {
   struct B { };
   struct D : B { };
   D f();
@@ -956,7 +1009,8 @@
   const B *q = &(a ? D() : b); // expected-error {{temporary}}
 }
 
-namespace dr590 { // dr590: yes
+//--- dr590: yes
+namespace dr590 {
   template<typename T> struct A {
     struct B {
       struct C {
@@ -967,7 +1021,8 @@
   template<typename T> typename A<T>::B::C A<T>::B::C::f(A<T>::B::C) {}
 }
 
-namespace dr591 { // dr591: no
+//--- dr591: no
+namespace dr591 {
   template<typename T> struct A {
     typedef int M;
     struct B {
@@ -986,7 +1041,8 @@
 // dr593 needs an IRGen test.
 // dr594: na
 
-namespace dr595 { // dr595: dup 1330
+//--- dr595: dup 1330
+namespace dr595 {
   template<class T> struct X {
     void f() throw(T) {}
 #if __cplusplus > 201402L
@@ -1000,7 +1056,8 @@
 
 // dr597: na
 
-namespace dr598 { // dr598: yes
+//--- dr598: yes
+namespace dr598 {
   namespace N {
     void f(int);
     void f(char);
@@ -1021,7 +1078,8 @@
   int &t = h(N::i);
 }
 
-namespace dr599 { // dr599: partial
+//--- dr599: partial
+namespace dr599 {
   typedef int Fn();
   struct S { operator void*(); };
   struct T { operator Fn*(); };
diff --git a/clang/test/CXX/drs/dr6xx.cpp b/clang/test/CXX/drs/dr6xx.cpp
--- a/clang/test/CXX/drs/dr6xx.cpp
+++ b/clang/test/CXX/drs/dr6xx.cpp
@@ -5,7 +5,8 @@
 // RUN: %clang_cc1 -std=c++20 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors -fno-spell-checking
 // RUN: %clang_cc1 -std=c++23 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors -fno-spell-checking
 
-namespace dr600 { // dr600: yes
+//--- dr600: yes
+namespace dr600 {
 struct S {
   void f(int);
 
@@ -25,7 +26,8 @@
   __extension__ typedef __SIZE_TYPE__ size_t;
 } // namespace std
 
-namespace dr601 { // dr601: yes
+//--- dr601: yes
+namespace dr601 {
 #if __cplusplus >= 201103L
 #define MAX __LLONG_MAX__
 #else
@@ -55,7 +57,8 @@
 #undef MAX
 }
 
-namespace dr602 { // dr602: yes
+//--- dr602: yes
+namespace dr602 {
   template<class T> struct A {
     template<class U> friend struct A;
   };
@@ -70,7 +73,8 @@
   B<int> b;
 }
 
-namespace dr603 { // dr603: yes
+//--- dr603: yes
+namespace dr603 {
   template<unsigned char> struct S {};
   typedef S<'\001'> S1;
   typedef S<(1ul << __CHAR_BIT__) + 1> S1;
@@ -82,7 +86,8 @@
 // dr604: na
 // dr605 needs IRGen test
 
-namespace dr606 { // dr606: yes
+//--- dr606: yes
+namespace dr606 {
 #if __cplusplus >= 201103L
   template<typename T> struct S {};
   template<typename T> void f(S<T> &&); // expected-note {{expects an rvalue}}
@@ -100,7 +105,8 @@
 #endif
 }
 
-namespace dr607 { // dr607: yes
+//--- dr607: yes
+namespace dr607 {
 namespace example1 {
 struct Y {};
 
@@ -128,7 +134,8 @@
 } // namespace example2
 } // namespace dr607
 
-namespace dr608 { // dr608: yes
+//--- dr608: yes
+namespace dr608 {
   struct A { virtual void f(); };
   struct B : A {};
   struct C : A { void f(); };
@@ -137,14 +144,16 @@
 
 int dr610[-0u == 0u ? 1 : -1]; // dr610: yes
 
-namespace dr611 { // dr611: yes
+//--- dr611: yes
+namespace dr611 {
   int k;
   struct S { int &r; } s = { k ? k : k };
 }
 
 // dr612: na
 
-namespace dr613 { // dr613: yes c++11
+//--- dr613: yes c++11
+namespace dr613 {
   // see also n2253
   struct A { int n; static void f(); };
   int f(int);
@@ -185,12 +194,14 @@
 int dr614_a[(-1) / 2 == 0 ? 1 : -1]; // dr614: yes
 int dr614_b[(-1) % 2 == -1 ? 1 : -1];
 
-namespace dr615 { // dr615: yes
+//--- dr615: yes
+namespace dr615 {
   int f();
   static int n = f();
 }
 
-namespace dr616 { // dr616: 4
+//--- dr616: 4
+namespace dr616 {
 #if __cplusplus >= 201103L
   struct S { int n; } s;
   S f();
@@ -208,13 +219,15 @@
 #endif
 }
 
-namespace dr618 { // dr618: yes
+//--- dr618: yes
+namespace dr618 {
 #if (unsigned)-1 > 0
 #error wrong
 #endif
 }
 
-namespace dr619 { // dr619: yes
+//--- dr619: yes
+namespace dr619 {
   extern int x[10];
   struct S { static int x[10]; };
 
@@ -245,20 +258,23 @@
 
 // dr624 needs an IRGen check.
 
-namespace dr625 { // dr625: yes
+//--- dr625: yes
+namespace dr625 {
   template<typename T> struct A {};
   A<auto> x = A<int>(); // expected-error {{'auto' not allowed in template argument}} expected-error 0-1{{extension}}
   void f(int);
   void (*p)(auto) = f; // expected-error {{'auto' not allowed in function prototype}} expected-error 0-1{{extension}}
 }
 
-namespace dr626 { // dr626: yes
+//--- dr626: yes
+namespace dr626 {
 #define STR(x) #x
   char c[2] = STR(c); // ok, type matches
   wchar_t w[2] = STR(w); // expected-error {{initializing wide char array with non-wide string literal}}
 }
 
-namespace dr627 { // dr627: yes
+//--- dr627: yes
+namespace dr627 {
   void f() {
     true a = 0; // expected-error +{{}} expected-warning {{unused}}
   }
@@ -266,7 +282,8 @@
 
 // dr628: na
 
-namespace dr629 { // dr629: yes
+//--- dr629: yes
+namespace dr629 {
   typedef int T;
   int n = 1;
   void f() {
@@ -284,7 +301,8 @@
   }
 }
 
-namespace dr630 { // dr630: yes
+//--- dr630: yes
+namespace dr630 {
 const bool MB_EQ_WC =
     ' ' == L' ' && '\t' == L'\t' && '\v' == L'\v' && '\r' == L'\r' &&
     '\n' == L'\n' && //
@@ -320,14 +338,16 @@
 
 // dr631: na
 
-namespace dr632 { // dr632: yes
+//--- dr632: yes
+namespace dr632 {
   struct S { int n; } s = {{5}}; // expected-warning {{braces}}
 }
 
 // dr633: na
 // see also n2993
 
-namespace dr634 { // dr634: yes
+//--- dr634: yes
+namespace dr634 {
   struct S { S(); S(const S&); virtual void f(); ~S(); };
   int f(...);
   char f(int);
@@ -337,7 +357,8 @@
   int k = f(S()); // expected-error {{cannot pass}}
 }
 
-namespace dr635 { // dr635: yes
+//--- dr635: yes
+namespace dr635 {
   template<typename T> struct A { A(); ~A(); };
   template<typename T> A<T>::A<T>() {} // expected-error {{cannot have template arguments}}
   template<typename T> A<T>::~A<T>() {}
@@ -358,7 +379,8 @@
   template<typename T> D<T>::D<T>() {} // expected-error {{redefinition}} expected-error {{cannot have template arg}}
 }
 
-namespace dr637 { // dr637: yes
+//--- dr637: yes
+namespace dr637 {
   void f(int i) {
     i = ++i + 1;
     i = i++ + 1;
@@ -368,7 +390,8 @@
   }
 }
 
-namespace dr638 { // dr638: no
+//--- dr638: no
+namespace dr638 {
   template<typename T> struct A {
     struct B;
     void f();
@@ -399,13 +422,15 @@
   };
 }
 
-namespace dr639 { // dr639: yes
+//--- dr639: yes
+namespace dr639 {
   void f(int i) {
     void((i = 0) + (i = 0)); // expected-warning {{unsequenced}}
   }
 }
 
-namespace dr641 { // dr641: yes
+//--- dr641: yes
+namespace dr641 {
   namespace std_example {
     struct abc;
 
@@ -445,7 +470,8 @@
   }
 }
 
-namespace dr642 { // dr642: yes
+//--- dr642: yes
+namespace dr642 {
   void f() {
     const int i = 2;
     {
@@ -462,7 +488,8 @@
 }
 
 #if __cplusplus >= 201103L
-namespace dr643 { // dr643: yes
+//--- dr643: yes
+namespace dr643 {
   struct A {
     int x;
     auto f() -> decltype(this->x);
@@ -477,7 +504,8 @@
 #endif
 
 #if __cplusplus >= 201103L
-namespace dr644 { // dr644: partial
+//--- dr644: partial
+namespace dr644 {
   struct A {
     A() = default;
     int x, y;
@@ -508,7 +536,8 @@
 // dr645: na
 
 #if __cplusplus >= 201103L
-namespace dr646 { // dr646: sup 981
+//--- dr646: sup 981
+namespace dr646 {
   struct A {
     constexpr A(const A&) = default; // ok
   };
@@ -522,7 +551,8 @@
 #endif
 
 #if __cplusplus >= 201103L
-namespace dr647 { // dr647: yes
+//--- dr647: yes
+namespace dr647 {
   // This is partially superseded by dr1358.
   struct A {
     constexpr virtual void f() const;
@@ -585,7 +615,8 @@
 #endif
 
 #if __cplusplus >= 201103L
-namespace dr648 { // dr648: yes
+//--- dr648: yes
+namespace dr648 {
   int f();
   constexpr int a = (true ? 1 : f());
   constexpr int b = false && f();
@@ -594,7 +625,8 @@
 #endif
 
 #if __cplusplus >= 201103L
-namespace dr649 { // dr649: yes
+//--- dr649: yes
+namespace dr649 {
 alignas(0x200000000) int n;       // expected-error {{requested alignment}}1
 struct alignas(0x200000000) X {}; // expected-error {{requested alignment}}
 struct Y {
@@ -609,7 +641,8 @@
 // dr650 FIXME: add codegen test
 
 #if __cplusplus >= 201103L
-namespace dr651 { // dr651: yes
+//--- dr651: yes
+namespace dr651 {
   struct X {
     virtual X &f();
   };
@@ -622,7 +655,8 @@
 #endif
 
 #if __cplusplus >= 201103L
-namespace dr652 { // dr652: yes
+//--- dr652: yes
+namespace dr652 {
   constexpr int n = 1.2 * 3.4;
   static_assert(n == 4, "");
 }
@@ -631,7 +665,8 @@
 // dr653 FIXME: add codegen test
 
 #if __cplusplus >= 201103L
-namespace dr654 { // dr654: sup 1423
+//--- dr654: sup 1423
+namespace dr654 {
   void f() {
     if (nullptr) {} // expected-warning {{implicit conversion of nullptr constant to 'bool'}}
     bool b = nullptr; // expected-error {{cannot initialize a variable of type 'bool' with an rvalue of type 'std::nullptr_t'}}
@@ -650,7 +685,8 @@
 }
 #endif
 
-namespace dr655 { // dr655: yes
+//--- dr655: yes
+namespace dr655 {
   struct A { A(int); }; // expected-note 2-3{{not viable}}
                         // expected-note@-1 {{'dr655::A' declared here}}
   struct B : A {
@@ -662,7 +698,8 @@
   };
 }
 
-namespace dr656 { // dr656: yes
+//--- dr656: yes
+namespace dr656 {
   struct A { A(const A&) = delete; }; // expected-error 0-1 {{C++11}}
   struct B : A {};
   struct X { operator B(); } x;
@@ -690,7 +727,8 @@
   }
 }
 
-namespace dr657 { // dr657: partial
+//--- dr657: partial
+namespace dr657 {
   struct Abs { virtual void x() = 0; };
   struct Der : public Abs { virtual void x(); };
 
@@ -730,7 +768,8 @@
 // dr658 FIXME: add codegen test
 
 #if __cplusplus >= 201103L
-namespace dr659 { // dr659: yes
+//--- dr659: yes
+namespace dr659 {
   static_assert(alignof(char) == alignof(char&), "");
   static_assert(alignof(int) == alignof(int&), "");
   int n = alignof(int(&)()); // expected-error {{application of 'alignof' to a function type}}
@@ -740,7 +779,8 @@
 #endif
 
 #if __cplusplus >= 201103L
-namespace dr660 { // dr660: yes
+//--- dr660: yes
+namespace dr660 {
   enum : int { a };
   enum class { b }; // expected-error {{requires a name}}
   auto x = a;
@@ -755,7 +795,8 @@
 
 // dr661 FIXME: add codegen test
 
-namespace dr662 { // dr662: yes
+//--- dr662: yes
+namespace dr662 {
   template <typename T> void f(T t) {
     T &tr = t;
     T *tp = &t; // expected-error {{pointer to a reference}}
@@ -766,12 +807,14 @@
   void g(int n) { f<int&>(n); } // expected-note {{instantiation of}}
 }
 
-namespace dr663 { // dr663: sup P1949
+//--- dr663: sup P1949
+namespace dr663 {
   int ЍЎ = 123;
 }
 
 #if __cplusplus >= 201103L
-namespace dr664 { // dr664: yes
+//--- dr664: yes
+namespace dr664 {
   struct A { A(const A&) = delete; };
   A &&f(A &&a, int n) {
     if (n)
@@ -781,7 +824,8 @@
 }
 #endif
 
-namespace dr665 { // dr665: yes
+//--- dr665: yes
+namespace dr665 {
   struct A { virtual ~A(); };
   struct B : A {} *b;
   struct C : private A {} *c; // expected-note {{here}}
@@ -801,7 +845,8 @@
   }
 }
 
-namespace dr666 { // dr666: yes
+//--- dr666: yes
+namespace dr666 {
   struct P { friend P operator*(P, P); P(int); } p(0);
 
   template<int> int f();
@@ -818,7 +863,8 @@
 
 // Triviality is entirely different in C++98.
 #if __cplusplus >= 201103L
-namespace dr667 { // dr667: yes
+//--- dr667: yes
+namespace dr667 {
   struct A {
     A() = default; // expected-warning {{explicitly defaulted default constructor is implicitly deleted}} expected-note{{replace 'default'}}
     int &r; // expected-note {{because field 'r' of reference type 'int &' would not be initialized}}
@@ -842,7 +888,8 @@
 // dr668 FIXME: add codegen test
 
 #if __cplusplus >= 201103L
-namespace dr669 { // dr669: yes
+//--- dr669: yes
+namespace dr669 {
   void f() {
     int n;
     using T = decltype(n);
@@ -870,7 +917,8 @@
 }
 #endif
 
-namespace dr671 { // dr671: yes
+//--- dr671: yes
+namespace dr671 {
   enum class E { e }; // expected-error 0-1 {{C++11}}
   E e = static_cast<E>(0);
   int n = static_cast<int>(E::e); // expected-error 0-1 {{C++11}}
@@ -879,7 +927,8 @@
 
 // dr672 FIXME: add codegen test
 
-namespace dr673 { // dr673: yes
+//--- dr673: yes
+namespace dr673 {
   template<typename> struct X { static const int n = 0; };
 
   class A {
@@ -896,7 +945,8 @@
   F *f; // expected-error {{unknown type name}}
 }
 
-namespace dr674 { // dr674: 8
+//--- dr674: 8
+namespace dr674 {
   template<typename T> int f(T);
 
   int g(int);
@@ -952,7 +1002,8 @@
   template int Y::h<>(int);
 }
 
-namespace dr675 { // dr675: dup 739
+//--- dr675: dup 739
+namespace dr675 {
   template<typename T> struct A { T n : 1; };
 #if __cplusplus >= 201103L
   static_assert(A<char>{1}.n < 0, ""); // expected-warning {{implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1}}
@@ -963,7 +1014,8 @@
 
 // dr676: na
 
-namespace dr677 { // dr677: no
+//--- dr677: no
+namespace dr677 {
   struct A {
     void *operator new(std::size_t);
     void operator delete(void*) = delete; // expected-error 0-1{{C++11}} expected-note {{deleted}}
@@ -981,7 +1033,8 @@
 
 // dr678 FIXME: check that the modules ODR check catches this
 
-namespace dr679 { // dr679: yes
+//--- dr679: yes
+namespace dr679 {
   struct X {};
   template<int> void operator+(X, X);
   template<> void operator+<0>(X, X) {} // expected-note {{previous}}
@@ -991,7 +1044,8 @@
 // dr680: na
 
 #if __cplusplus >= 201103L
-namespace dr681 { // dr681: partial
+//--- dr681: partial
+namespace dr681 {
   auto *a() -> int; // expected-error {{must specify return type 'auto', not 'auto *'}}
   auto (*b)() -> int;
   // FIXME: The errors here aren't great.
@@ -1009,7 +1063,8 @@
 #endif
 
 #if __cplusplus >= 201103L
-namespace dr683 { // dr683: yes
+//--- dr683: yes
+namespace dr683 {
   struct A {
     A() = default;
     A(const A&) = default;
@@ -1027,7 +1082,8 @@
 #endif
 
 #if __cplusplus >= 201103L
-namespace dr684 { // dr684: sup 1454
+//--- dr684: sup 1454
+namespace dr684 {
   void f() {
     int a; // expected-note {{here}}
     constexpr int *p = &a; // expected-error {{constant expression}} expected-note {{pointer to 'a'}}
@@ -1035,7 +1091,8 @@
 }
 #endif
 
-namespace dr685 { // dr685: yes
+//--- dr685: yes
+namespace dr685 {
   enum E : long { e };
 #if __cplusplus < 201103L
     // expected-error@-2 {{enumeration types with a fixed underlying type are a C++11 extension}}
@@ -1066,7 +1123,8 @@
   int x = k(g);
 }
 
-namespace dr686 { // dr686: yes
+//--- dr686: yes
+namespace dr686 {
   void f() {
     (void)dynamic_cast<struct A*>(0); // expected-error {{incomplete}} expected-note {{forward}}
     (void)dynamic_cast<struct A{}*>(0); // expected-error {{cannot be defined in a type specifier}}
@@ -1110,7 +1168,8 @@
   template<struct R {} *> struct Y; // expected-error {{cannot be defined in a type specifier}}
 }
 
-namespace dr687 { // dr687 (9 c++20, but the issue is still considered open)
+//--- dr687 (9 c++20, but the issue is still considered open)
+namespace dr687 {
   template<typename T> void f(T a) {
     // This is valid in C++20.
     g<int>(a);
@@ -1123,7 +1182,8 @@
   }
 }
 
-namespace dr692 { // dr692: 16
+//--- dr692: 16
+namespace dr692 {
   // Also see dr1395.
 
   namespace temp_func_order_example2 {
@@ -1191,7 +1251,8 @@
   }
 }
 
-namespace dr696 { // dr696: yes
+//--- dr696: yes
+namespace dr696 {
   void f(const int*);
   void g() {
     const int N = 10; // expected-note 1+{{here}}
diff --git a/clang/test/CXX/drs/dr7xx.cpp b/clang/test/CXX/drs/dr7xx.cpp
--- a/clang/test/CXX/drs/dr7xx.cpp
+++ b/clang/test/CXX/drs/dr7xx.cpp
@@ -4,7 +4,8 @@
 // RUN: %clang_cc1 -triple %itanium_abi_triple -std=c++17 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors
 // RUN: %clang_cc1 -triple %itanium_abi_triple -std=c++2a %s -verify -fexceptions -fcxx-exceptions -pedantic-errors
 
-namespace dr705 { // dr705: yes
+//--- dr705: yes
+namespace dr705 {
   namespace N {
     struct S {};
     void f(S); // expected-note {{declared here}}
@@ -17,7 +18,8 @@
   }
 }
 
-namespace dr712 { // dr712: partial
+//--- dr712: partial
+namespace dr712 {
   void use(int);
   void f() {
     const int a = 0; // expected-note 5{{here}}
@@ -53,7 +55,8 @@
 #endif
 }
 
-namespace dr727 { // dr727: partial
+//--- dr727: partial
+namespace dr727 {
   struct A {
     template<typename T> struct C; // expected-note 6{{here}}
     template<typename T> void f(); // expected-note {{here}}
@@ -220,7 +223,8 @@
   Collision<int, int> c; // expected-note {{in instantiation of}}
 }
 
-namespace dr777 { // dr777: 3.7
+//--- dr777: 3.7
+namespace dr777 {
 #if __cplusplus >= 201103L
 template <typename... T>
 void f(int i = 0, T ...args) {}
diff --git a/clang/test/CXX/drs/dr9xx.cpp b/clang/test/CXX/drs/dr9xx.cpp
--- a/clang/test/CXX/drs/dr9xx.cpp
+++ b/clang/test/CXX/drs/dr9xx.cpp
@@ -14,7 +14,8 @@
   };
 }
 
-namespace dr948 { // dr948: 3.7
+//--- dr948: 3.7
+namespace dr948 {
 #if __cplusplus >= 201103L
   class A {
   public:
@@ -43,7 +44,8 @@
 #endif
 }
 
-namespace dr952 { // dr952: yes
+//--- dr952: yes
+namespace dr952 {
 namespace example1 {
 struct A {
   typedef int I; // #dr952-typedef-decl
@@ -82,7 +84,8 @@
 } // namespace example2
 } // namespace dr952
 
-namespace dr974 { // dr974: yes
+//--- dr974: yes
+namespace dr974 {
 #if __cplusplus >= 201103L
   void test() {
     auto lam = [](int x = 42) { return x; };
@@ -90,7 +93,8 @@
 #endif
 }
 
-namespace dr977 { // dr977: yes
+//--- dr977: yes
+namespace dr977 {
 enum E { e = E() };
 #ifndef _WIN32
 // expected-error@-2 {{invalid use of incomplete type 'E'}}
@@ -103,7 +107,8 @@
 #endif
 } // namespace dr977
 
-namespace dr990 { // dr990: 3.5
+//--- dr990: 3.5
+namespace dr990 {
 #if __cplusplus >= 201103L
   struct A { // expected-note 2{{candidate}}
     A(std::initializer_list<int>); // expected-note {{candidate}}