2 files changed, 7 insertions, 7 deletions
diff --git a/compilerplugins/clang/test/external.cxx b/compilerplugins/clang/test/external.cxx
index d0391f0cd612..77bb53c6b250 100644
--- a/compilerplugins/clang/test/external.cxx
+++ b/compilerplugins/clang/test/external.cxx
@@ -129,18 +129,18 @@ enum E : int
 }
 }
 
-// expected-note@+1 {{a function associating 'N::I1::E' is declared here [loplugin:external]}}
+// expected-note-re@+1 {{a function associating 'N{{(::I1)?}}::E' is declared here [loplugin:external]}}
 static void g(std::vector<E>)
 {
     // expected-note@+1 {{another declaration is here [loplugin:external]}}
     void f(E const*);
 }
 
-// expected-note@+1 {{a function associating 'N::I1::E' is declared here [loplugin:external]}}
+// expected-note-re@+1 {{a function associating 'N{{(::I1)?}}::E' is declared here [loplugin:external]}}
 void f(E const*);
 
 extern "C++" {
-// expected-note@+1 {{a function associating 'N::I1::E' is declared here [loplugin:external]}}
+// expected-note-re@+1 {{a function associating 'N{{(::I1)?}}::E' is declared here [loplugin:external]}}
 void fc(E const*);
 }
 
@@ -163,12 +163,12 @@ struct S3
 
 inline namespace I2
 {
-// expected-note@+1 {{a function associating 'N::I1::E' is declared here [loplugin:external]}}
+// expected-note-re@+1 {{a function associating 'N{{(::I1)?}}::E' is declared here [loplugin:external]}}
 void f3(E);
 
 inline namespace I3
 {
-// expected-note@+1 {{a function associating 'N::I1::E' is declared here [loplugin:external]}}
+// expected-note-re@+1 {{a function associating 'N{{(::I1)?}}::E' is declared here [loplugin:external]}}
 void f4(E);
 }
 }
diff --git a/compilerplugins/clang/test/makeshared.cxx b/compilerplugins/clang/test/makeshared.cxx
index d3ac22389c8f..d6c3cbdac736 100644
--- a/compilerplugins/clang/test/makeshared.cxx
+++ b/compilerplugins/clang/test/makeshared.cxx
@@ -54,9 +54,9 @@ void test2()
     (void)y;
 
     std::unique_ptr<int> u1;
-    // expected-error-re@+1 {{rather use make_shared than constructing from {{.+}} (aka 'std{{.*}}::unique_ptr<int, std{{.*}}::default_delete<int>{{ ?}}>') [loplugin:makeshared]}}
+    // expected-error-re@+1 {{rather use make_shared than constructing from {{.+}} (aka 'std{{.*}}::unique_ptr<int{{.*}}>') [loplugin:makeshared]}}
     std::shared_ptr<int> z = std::move(u1);
-    // expected-error-re@+1 {{rather use make_shared than constructing from {{.+}} (aka 'std{{.*}}::unique_ptr<int, std{{.*}}::default_delete<int>{{ ?}}>') [loplugin:makeshared]}}
+    // expected-error-re@+1 {{rather use make_shared than constructing from {{.+}} (aka 'std{{.*}}::unique_ptr<int{{.*}}>') [loplugin:makeshared]}}
     z = std::move(u1);
 }