3 files changed, 4 insertions, 6 deletions
diff --git a/clang/test/SemaCXX/PR10177.cpp b/clang/test/SemaCXX/PR10177.cpp
index 0d2e792f522..59630be5088 100644
--- a/clang/test/SemaCXX/PR10177.cpp
+++ b/clang/test/SemaCXX/PR10177.cpp
@@ -57,10 +57,11 @@ namespace N {
 }
 
 #else
+// expected-no-diagnostics
 
 namespace { template<typename> extern int n; }
 template<typename T> int g() { return n<int>; }
-namespace { extern template int n<int>; } // expected-error {{explicit instantiation declaration of 'n<int>' with internal linkage}}
+namespace { extern template int n<int>; }
 
 #endif
 
diff --git a/clang/test/SemaCXX/warn-unused-filescoped.cpp b/clang/test/SemaCXX/warn-unused-filescoped.cpp
index e052ecb1af9..93c6bbd7edc 100644
--- a/clang/test/SemaCXX/warn-unused-filescoped.cpp
+++ b/clang/test/SemaCXX/warn-unused-filescoped.cpp
@@ -207,9 +207,8 @@ static void completeRedeclChainForTemplateSpecialization() { } // expected-warni
 
 namespace test10 {
 #if __cplusplus >= 201103L
-// FIXME: Warn on template definitions with no instantiations?
 template<class T>
-constexpr T pi = T(3.14);
+constexpr T pi = T(3.14); // expected-warning {{unused}}
 #endif
 }
 
diff --git a/clang/test/SemaCXX/warn-unused-variables.cpp b/clang/test/SemaCXX/warn-unused-variables.cpp
index 97634ac43c5..a7ac9afc36a 100644
--- a/clang/test/SemaCXX/warn-unused-variables.cpp
+++ b/clang/test/SemaCXX/warn-unused-variables.cpp
@@ -135,9 +135,7 @@ namespace PR19305 {
   template<typename T> int m = 0;
   template<typename T> int m<T*> = 0;
 
-  // This has external linkage, so could be referenced by a declaration in a
-  // different translation unit.
-  template<> const int m<void> = 0; // no warning
+  template<> const int m<void> = 0; // expected-warning {{unused variable}}
 }
 
 namespace ctor_with_cleanups {