5 files changed, 18 insertions, 18 deletions
diff --git a/clang/test/SemaCXX/cxx0x-compat.cpp b/clang/test/SemaCXX/cxx0x-compat.cpp
index bcf0cf11dc1..8f7aaab6a43 100644
--- a/clang/test/SemaCXX/cxx0x-compat.cpp
+++ b/clang/test/SemaCXX/cxx0x-compat.cpp
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -fsyntax-only -std=c++98 -Wc++11-compat -verify %s
-// RUN: %clang_cc1 -fsyntax-only -std=c++1z -Wc++11-compat -verify %s
+// RUN: %clang_cc1 -fsyntax-only -std=c++17 -Wc++11-compat -verify %s
 
 #if __cplusplus < 201103L
 
@@ -42,14 +42,14 @@ void h(size_t foo, size_t bar) {
 char c = 'x'_x; // expected-warning {{will be treated as a user-defined literal suffix}}
 
 template<int ...N> int f() { // expected-warning {{C++11 extension}}
-  return (N + ...); // expected-warning {{C++1z extension}}
+  return (N + ...); // expected-warning {{C++17 extension}}
 }
 
 #else
 
 auto init_capture = [a(0)] {}; // expected-warning {{initialized lambda captures are incompatible with C++ standards before C++14}}
-static_assert(true); // expected-warning {{incompatible with C++ standards before C++1z}}
+static_assert(true); // expected-warning {{incompatible with C++ standards before C++17}}
 
-template<int ...N> int f() { return (N + ...); } // expected-warning {{incompatible with C++ standards before C++1z}}
+template<int ...N> int f() { return (N + ...); } // expected-warning {{incompatible with C++ standards before C++17}}
 
 #endif
diff --git a/clang/test/SemaCXX/deprecated.cpp b/clang/test/SemaCXX/deprecated.cpp
index ac477d4b66b..26f30c91b09 100644
--- a/clang/test/SemaCXX/deprecated.cpp
+++ b/clang/test/SemaCXX/deprecated.cpp
@@ -1,9 +1,9 @@
 // RUN: %clang_cc1 -std=c++98 %s -Wdeprecated -verify -triple x86_64-linux-gnu
 // RUN: %clang_cc1 -std=c++11 %s -Wdeprecated -verify -triple x86_64-linux-gnu
-// RUN: %clang_cc1 -std=c++1y %s -Wdeprecated -verify -triple x86_64-linux-gnu
-// RUN: %clang_cc1 -std=c++1z %s -Wdeprecated -verify -triple x86_64-linux-gnu
+// RUN: %clang_cc1 -std=c++14 %s -Wdeprecated -verify -triple x86_64-linux-gnu
+// RUN: %clang_cc1 -std=c++17 %s -Wdeprecated -verify -triple x86_64-linux-gnu
 
-// RUN: %clang_cc1 -std=c++1y %s -Wdeprecated -verify -triple x86_64-linux-gnu -Wno-deprecated-register -DNO_DEPRECATED_FLAGS
+// RUN: %clang_cc1 -std=c++14 %s -Wdeprecated -verify -triple x86_64-linux-gnu -Wno-deprecated-register -DNO_DEPRECATED_FLAGS
 
 #include "Inputs/register.h"
 
@@ -12,8 +12,8 @@ void h() throw(int);
 void i() throw(...);
 #if __cplusplus > 201402L
 // expected-warning@-4 {{dynamic exception specifications are deprecated}} expected-note@-4 {{use 'noexcept' instead}}
-// expected-error@-4 {{ISO C++1z does not allow dynamic exception specifications}} expected-note@-4 {{use 'noexcept(false)' instead}}
-// expected-error@-4 {{ISO C++1z does not allow dynamic exception specifications}} expected-note@-4 {{use 'noexcept(false)' instead}}
+// expected-error@-4 {{ISO C++17 does not allow dynamic exception specifications}} expected-note@-4 {{use 'noexcept(false)' instead}}
+// expected-error@-4 {{ISO C++17 does not allow dynamic exception specifications}} expected-note@-4 {{use 'noexcept(false)' instead}}
 #elif __cplusplus >= 201103L
 // expected-warning@-8 {{dynamic exception specifications are deprecated}} expected-note@-8 {{use 'noexcept' instead}}
 // expected-warning@-8 {{dynamic exception specifications are deprecated}} expected-note@-8 {{use 'noexcept(false)' instead}}
@@ -23,7 +23,7 @@ void i() throw(...);
 void stuff() {
   register int n;
 #if __cplusplus > 201402L
-  // expected-error@-2 {{ISO C++1z does not allow 'register' storage class specifier}}
+  // expected-error@-2 {{ISO C++17 does not allow 'register' storage class specifier}}
 #elif __cplusplus >= 201103L && !defined(NO_DEPRECATED_FLAGS)
   // expected-warning@-4 {{'register' storage class specifier is deprecated}}
 #endif
@@ -34,14 +34,14 @@ void stuff() {
   bool b;
   ++b;
 #if __cplusplus > 201402L
-  // expected-error@-2 {{ISO C++1z does not allow incrementing expression of type bool}}
+  // expected-error@-2 {{ISO C++17 does not allow incrementing expression of type bool}}
 #else
   // expected-warning@-4 {{incrementing expression of type bool is deprecated}}
 #endif
 
   b++;
 #if __cplusplus > 201402L
-  // expected-error@-2 {{ISO C++1z does not allow incrementing expression of type bool}}
+  // expected-error@-2 {{ISO C++17 does not allow incrementing expression of type bool}}
 #else
   // expected-warning@-4 {{incrementing expression of type bool is deprecated}}
 #endif
diff --git a/clang/test/SemaCXX/inline.cpp b/clang/test/SemaCXX/inline.cpp
index b20bc18d0a3..ba29521ce50 100644
--- a/clang/test/SemaCXX/inline.cpp
+++ b/clang/test/SemaCXX/inline.cpp
@@ -1,6 +1,6 @@
 // RUN: %clang_cc1 -fsyntax-only -verify %s
 // RUN: %clang_cc1 -fsyntax-only -verify -std=c++14 %s
-// RUN: %clang_cc1 -fsyntax-only -verify -std=c++1z %s -Wc++98-c++11-c++14-compat
+// RUN: %clang_cc1 -fsyntax-only -verify -std=c++17 %s -Wc++98-c++11-c++14-compat
 
 // Check that we don't allow illegal uses of inline
 // (checking C++-only constructs here)
@@ -12,7 +12,7 @@ void localVar() {
 
 // Check that we warn appropriately.
 #if __cplusplus <= 201402L
-inline int a; // expected-warning{{inline variables are a C++1z extension}}
+inline int a; // expected-warning{{inline variables are a C++17 extension}}
 #else
-inline int a; // expected-warning{{inline variables are incompatible with C++ standards before C++1z}}
+inline int a; // expected-warning{{inline variables are incompatible with C++ standards before C++17}}
 #endif
diff --git a/clang/test/SemaCXX/static-assert.cpp b/clang/test/SemaCXX/static-assert.cpp
index 7de4d07b50b..196375c3d68 100644
--- a/clang/test/SemaCXX/static-assert.cpp
+++ b/clang/test/SemaCXX/static-assert.cpp
@@ -49,5 +49,5 @@ struct X { ~X(); };
 StaticAssertProtected<int> sap1;
 StaticAssertProtected<X> sap2; // expected-note {{instantiation}}
 
-static_assert(true); // expected-warning {{C++1z extension}}
+static_assert(true); // expected-warning {{C++17 extension}}
 static_assert(false); // expected-error-re {{failed{{$}}}} expected-warning {{extension}}
diff --git a/clang/test/SemaCXX/warn-c++1z-extensions.cpp b/clang/test/SemaCXX/warn-c++1z-extensions.cpp
index 9b5e1c205cf..a0d44a34ffe 100644
--- a/clang/test/SemaCXX/warn-c++1z-extensions.cpp
+++ b/clang/test/SemaCXX/warn-c++1z-extensions.cpp
@@ -1,8 +1,8 @@
 // RUN: %clang_cc1 -fsyntax-only -std=c++14 -verify %s
 
 void f() {
-  if (bool b = true; b) {} // expected-warning {{'if' initialization statements are a C++1z extension}}
-  switch (int n = 5; n) { // expected-warning {{'switch' initialization statements are a C++1z extension}}
+  if (bool b = true; b) {} // expected-warning {{'if' initialization statements are a C++17 extension}}
+  switch (int n = 5; n) { // expected-warning {{'switch' initialization statements are a C++17 extension}}
   case 5: break;
   }
 }