1 files changed, 8 insertions, 16 deletions
diff --git a/test/SemaTemplate/ms-function-specialization-class-scope.cpp b/test/SemaTemplate/ms-function-specialization-class-scope.cpp
index 3c7111d058389..dcab9bfaeabcb 100644
--- a/test/SemaTemplate/ms-function-specialization-class-scope.cpp
+++ b/test/SemaTemplate/ms-function-specialization-class-scope.cpp
@@ -1,18 +1,15 @@
 // RUN: %clang_cc1 -fms-extensions -fsyntax-only -verify %s
 // RUN: %clang_cc1 -fms-extensions -fdelayed-template-parsing -fsyntax-only -verify %s
 
+// expected-no-diagnostics
 class A {
 public:
   template<class U> A(U p) {}
-  template<> A(int p) {
-    // expected-warning@-1 {{explicit specialization of 'A' within class scope is a Microsoft extension}}
-  }
+  template<> A(int p) {}
 
   template<class U> void f(U p) {}
 
-  template<> void f(int p) {
-    // expected-warning@-1 {{explicit specialization of 'f' within class scope is a Microsoft extension}}
-  }
+  template<> void f(int p) {}
 
   void f(int p) {}
 };
@@ -28,14 +25,11 @@ void test1() {
 template<class T> class B {
 public:
   template<class U> B(U p) {}
-  template<> B(int p) {
-    // expected-warning@-1 {{explicit specialization of 'B<T>' within class scope is a Microsoft extension}}
-  }
+  template<> B(int p) {}
 
   template<class U> void f(U p) { T y = 9; }
 
   template<> void f(int p) {
-    // expected-warning@-1 {{explicit specialization of 'f' within class scope is a Microsoft extension}}
     T a = 3;
   }
 
@@ -56,9 +50,7 @@ namespace PR12709 {
 
     template<bool b> void specialized_member_template() {}
 
-    template<> void specialized_member_template<false>() {
-      // expected-warning@-1 {{explicit specialization of 'specialized_member_template' within class scope is a Microsoft extension}}
-    }
+    template<> void specialized_member_template<false>() {}
   };
 
   void f() { TemplateClass<int> t; }
@@ -67,8 +59,8 @@ namespace PR12709 {
 namespace Duplicates {
   template<typename T> struct A {
     template<typename U> void f();
-    template<> void f<int>() {} // expected-warning {{Microsoft extension}}
-    template<> void f<T>() {} // expected-warning {{Microsoft extension}}
+    template<> void f<int>() {}
+    template<> void f<T>() {}
   };
 
   // FIXME: We should diagnose the duplicate explicit specialization definitions
@@ -81,6 +73,6 @@ struct S {
   template <int>
   int f(int = 0);
   template <>
-  int f<0>(int); // expected-warning {{Microsoft extension}}
+  int f<0>(int);
 };
 }