<div dir="ltr">Since we took the -std=c++17 change for Clang 5, we should take this one too.</div><div class="gmail_extra"><br><div class="gmail_quote">On 13 August 2017 at 15:26, Richard Smith via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: rsmith<br>
Date: Sun Aug 13 15:26:53 2017<br>
New Revision: 310804<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=310804&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=310804&view=rev</a><br>
Log:<br>
Replace remaining user-visible mentions of C++1z with C++17.<br>
<br>
Modified:<br>
cfe/trunk/include/clang/Basic/<wbr>DiagnosticGroups.td<br>
cfe/trunk/include/clang/Basic/<wbr>DiagnosticLexKinds.td<br>
cfe/trunk/include/clang/Basic/<wbr>DiagnosticParseKinds.td<br>
cfe/trunk/include/clang/Basic/<wbr>DiagnosticSemaKinds.td<br>
cfe/trunk/test/CXX/dcl.dcl/<wbr>dcl.attr/dcl.attr.nodiscard/<wbr>p2.cpp<br>
cfe/trunk/test/CXX/dcl.dcl/<wbr>dcl.attr/dcl.attr.unused/p3.<wbr>cpp<br>
cfe/trunk/test/CXX/drs/dr0xx.<wbr>cpp<br>
cfe/trunk/test/CXX/drs/dr13xx.<wbr>cpp<br>
cfe/trunk/test/CXX/drs/dr1xx.<wbr>cpp<br>
cfe/trunk/test/CXX/drs/dr2xx.<wbr>cpp<br>
cfe/trunk/test/CXX/drs/dr4xx.<wbr>cpp<br>
cfe/trunk/test/CXX/drs/dr5xx.<wbr>cpp<br>
cfe/trunk/test/CXX/stmt.stmt/<wbr>stmt.iter/stmt.ranged/p1.cpp<br>
cfe/trunk/test/FixIt/fixit.cpp<br>
cfe/trunk/test/Lexer/hexfloat.<wbr>cpp<br>
cfe/trunk/test/Parser/cxx0x-<wbr>attributes.cpp<br>
cfe/trunk/test/Parser/cxx1z-<wbr>constexpr-lambdas.cpp<br>
cfe/trunk/test/Parser/cxx1z-<wbr>nested-namespace-definition.<wbr>cpp<br>
cfe/trunk/test/SemaCXX/cxx0x-<wbr>compat.cpp<br>
cfe/trunk/test/SemaCXX/<wbr>deprecated.cpp<br>
cfe/trunk/test/SemaCXX/inline.<wbr>cpp<br>
cfe/trunk/test/SemaCXX/static-<wbr>assert.cpp<br>
cfe/trunk/test/SemaCXX/warn-c+<wbr>+1z-extensions.cpp<br>
cfe/trunk/test/SemaTemplate/<wbr>temp_arg_nontype_cxx11.cpp<br>
<br>
Modified: cfe/trunk/include/clang/Basic/<wbr>DiagnosticGroups.td<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticGroups.td?rev=310804&r1=310803&r2=310804&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/include/<wbr>clang/Basic/DiagnosticGroups.<wbr>td?rev=310804&r1=310803&r2=<wbr>310804&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/include/clang/Basic/<wbr>DiagnosticGroups.td (original)<br>
+++ cfe/trunk/include/clang/Basic/<wbr>DiagnosticGroups.td Sun Aug 13 15:26:53 2017<br>
@@ -156,9 +156,10 @@ def FormatZeroLength : DiagGroup<"format<br>
<br>
def InvalidIOSDeploymentTarget : DiagGroup<"invalid-ios-<wbr>deployment-target">;<br>
<br>
-def CXX1zCompatMangling : DiagGroup<"c++1z-compat-<wbr>mangling">;<br>
+def CXX17CompatMangling : DiagGroup<"c++17-compat-<wbr>mangling">;<br>
+def : DiagGroup<"c++1z-compat-<wbr>mangling", [CXX17CompatMangling]>;<br>
// Name of this warning in GCC.<br>
-def NoexceptType : DiagGroup<"noexcept-type", [CXX1zCompatMangling]>;<br>
+def NoexceptType : DiagGroup<"noexcept-type", [CXX17CompatMangling]>;<br>
<br>
// Warnings for C++1y code which is not compatible with prior C++ standards.<br>
def CXXPre14Compat : DiagGroup<"c++98-c++11-compat"<wbr>>;<br>
@@ -220,9 +221,10 @@ def CXX14Compat : DiagGroup<"c++14-compa<br>
def CXX14CompatPedantic : DiagGroup<"c++14-compat-<wbr>pedantic",<br>
[CXXPre1zCompatPedantic]>;<br>
<br>
-def CXX1zCompat : DiagGroup<"c++1z-compat", [DeprecatedRegister,<br>
+def CXX17Compat : DiagGroup<"c++17-compat", [DeprecatedRegister,<br>
DeprecatedIncrementBool,<br>
- CXX1zCompatMangling]>;<br>
+ CXX17CompatMangling]>;<br>
+def : DiagGroup<"c++1z-compat", [CXX17Compat]>;<br>
<br>
def CXX2aCompat : DiagGroup<"c++2a-compat">;<br>
<br>
@@ -780,10 +782,11 @@ def CXX14 : DiagGroup<"c++14-extensions"<br>
<br>
// A warning group for warnings about using C++1z features as extensions in<br>
// earlier C++ versions.<br>
-def CXX1z : DiagGroup<"c++1z-extensions">;<br>
+def CXX17 : DiagGroup<"c++17-extensions">;<br>
<br>
def : DiagGroup<"c++0x-extensions", [CXX11]>;<br>
def : DiagGroup<"c++1y-extensions", [CXX14]>;<br>
+def : DiagGroup<"c++1z-extensions", [CXX17]>;<br>
<br>
def DelegatingCtorCycles :<br>
DiagGroup<"delegating-ctor-<wbr>cycles">;<br>
<br>
Modified: cfe/trunk/include/clang/Basic/<wbr>DiagnosticLexKinds.td<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticLexKinds.td?rev=310804&r1=310803&r2=310804&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/include/<wbr>clang/Basic/<wbr>DiagnosticLexKinds.td?rev=<wbr>310804&r1=310803&r2=310804&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/include/clang/Basic/<wbr>DiagnosticLexKinds.td (original)<br>
+++ cfe/trunk/include/clang/Basic/<wbr>DiagnosticLexKinds.td Sun Aug 13 15:26:53 2017<br>
@@ -181,10 +181,10 @@ def err_hex_constant_requires : Error<<br>
def ext_hex_constant_invalid : Extension<<br>
"hexadecimal floating constants are a C99 feature">, InGroup<C99>;<br>
def ext_hex_literal_invalid : Extension<<br>
- "hexadecimal floating literals are a C++1z feature">, InGroup<CXX1z>;<br>
+ "hexadecimal floating literals are a C++17 feature">, InGroup<CXX17>;<br>
def warn_cxx1z_hex_literal : Warning<<br>
"hexadecimal floating literals are incompatible with "<br>
- "C++ standards before C++1z">,<br>
+ "C++ standards before C++17">,<br>
InGroup<<wbr>CXXPre1zCompatPedantic>, DefaultIgnore;<br>
def ext_binary_literal : Extension<<br>
"binary integer literals are a GNU extension">, InGroup<GNUBinaryLiteral>;<br>
@@ -208,7 +208,7 @@ def warn_cxx98_compat_unicode_<wbr>literal :<br>
"unicode literals are incompatible with C++98">,<br>
InGroup<CXX98Compat>, DefaultIgnore;<br>
def warn_cxx14_compat_u8_<wbr>character_literal : Warning<<br>
- "unicode literals are incompatible with C++ standards before C++1z">,<br>
+ "unicode literals are incompatible with C++ standards before C++17">,<br>
InGroup<CXXPre1zCompat>, DefaultIgnore;<br>
def warn_cxx11_compat_user_<wbr>defined_literal : Warning<<br>
"identifier after literal will be treated as a user-defined literal suffix "<br>
<br>
Modified: cfe/trunk/include/clang/Basic/<wbr>DiagnosticParseKinds.td<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td?rev=310804&r1=310803&r2=310804&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/include/<wbr>clang/Basic/<wbr>DiagnosticParseKinds.td?rev=<wbr>310804&r1=310803&r2=310804&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/include/clang/Basic/<wbr>DiagnosticParseKinds.td (original)<br>
+++ cfe/trunk/include/clang/Basic/<wbr>DiagnosticParseKinds.td Sun Aug 13 15:26:53 2017<br>
@@ -211,10 +211,10 @@ def err_inline_namespace_alias : Error<"<br>
def err_namespace_nonnamespace_<wbr>scope : Error<<br>
"namespaces can only be defined in global or namespace scope">;<br>
def ext_nested_namespace_<wbr>definition : ExtWarn<<br>
- "nested namespace definition is a C++1z extension; "<br>
- "define each namespace separately">, InGroup<CXX1z>;<br>
+ "nested namespace definition is a C++17 extension; "<br>
+ "define each namespace separately">, InGroup<CXX17>;<br>
def warn_cxx14_compat_nested_<wbr>namespace_definition : Warning<<br>
- "nested namespace definition is incompatible with C++ standards before C++1z">,<br>
+ "nested namespace definition is incompatible with C++ standards before C++17">,<br>
InGroup<CXXPre1zCompat>, DefaultIgnore;<br>
def err_inline_nested_namespace_<wbr>definition : Error<<br>
"nested namespace definition cannot be 'inline'">;<br>
@@ -358,7 +358,7 @@ def err_expected_coloncolon_after_<wbr>super<br>
"expected '::' after '__super'">;<br>
<br>
def ext_decomp_decl_empty : ExtWarn<<br>
- "ISO C++1z does not allow a decomposition group to be empty">,<br>
+ "ISO C++17 does not allow a decomposition group to be empty">,<br>
InGroup<DiagGroup<"empty-<wbr>decomposition">>;<br>
<br>
/// Objective-C parser diagnostics<br>
@@ -522,16 +522,16 @@ def err_function_is_not_record : Error<<br>
def err_super_in_using_declaration : Error<<br>
"'__super' cannot be used with a using declaration">;<br>
def ext_constexpr_if : ExtWarn<<br>
- "constexpr if is a C++1z extension">, InGroup<CXX1z>;<br>
+ "constexpr if is a C++17 extension">, InGroup<CXX17>;<br>
def warn_cxx14_compat_constexpr_if : Warning<<br>
- "constexpr if is incompatible with C++ standards before C++1z">,<br>
+ "constexpr if is incompatible with C++ standards before C++17">,<br>
DefaultIgnore, InGroup<CXXPre1zCompat>;<br>
def ext_init_statement : ExtWarn<<br>
- "'%select{if|switch}0' initialization statements are a C++1z extension">,<br>
- InGroup<CXX1z>;<br>
+ "'%select{if|switch}0' initialization statements are a C++17 extension">,<br>
+ InGroup<CXX17>;<br>
def warn_cxx14_compat_init_<wbr>statement : Warning<<br>
"%select{if|switch}0 initialization statements are incompatible with "<br>
- "C++ standards before C++1z">, DefaultIgnore, InGroup<CXXPre1zCompat>;<br>
+ "C++ standards before C++17">, DefaultIgnore, InGroup<CXXPre1zCompat>;<br>
<br>
// C++ derived classes<br>
def err_dup_virtual : Error<"duplicate 'virtual' in base specifier">;<br>
@@ -560,7 +560,7 @@ def warn_cxx98_compat_nullptr : Warning<<br>
<br>
def warn_cxx14_compat_attribute : Warning<<br>
"attributes on %select{a namespace|an enumerator}0 declaration are "<br>
- "incompatible with C++ standards before C++1z">,<br>
+ "incompatible with C++ standards before C++17">,<br>
InGroup<CXXPre1zCompat>, DefaultIgnore;<br>
def warn_cxx98_compat_alignas : Warning<"'alignas' is incompatible with C++98">,<br>
InGroup<CXX98Compat>, DefaultIgnore;<br>
@@ -577,10 +577,10 @@ def err_cxx11_attribute_repeated : Error<br>
"attribute %0 cannot appear multiple times in an attribute specifier">;<br>
def warn_cxx14_compat_using_<wbr>attribute_ns : Warning<<br>
"default scope specifier for attributes is incompatible with C++ standards "<br>
- "before C++1z">, InGroup<CXXPre1zCompat>, DefaultIgnore;<br>
+ "before C++17">, InGroup<CXXPre1zCompat>, DefaultIgnore;<br>
def ext_using_attribute_ns : ExtWarn<<br>
- "default scope specifier for attributes is a C++1z extension">,<br>
- InGroup<CXX1z>;<br>
+ "default scope specifier for attributes is a C++17 extension">,<br>
+ InGroup<CXX17>;<br>
def err_using_attribute_ns_<wbr>conflict : Error<<br>
"attribute with scope specifier cannot follow default scope specifier">;<br>
def err_attributes_not_allowed : Error<"an attribute list cannot appear here">;<br>
@@ -617,11 +617,11 @@ def err_expected_comma_greater : Error<<br>
def err_class_on_template_<wbr>template_param : Error<<br>
"template template parameter requires 'class' after the parameter list">;<br>
def ext_template_template_param_<wbr>typename : ExtWarn<<br>
- "template template parameter using 'typename' is a C++1z extension">,<br>
- InGroup<CXX1z>;<br>
+ "template template parameter using 'typename' is a C++17 extension">,<br>
+ InGroup<CXX17>;<br>
def warn_cxx14_compat_template_<wbr>template_param_typename : Warning<<br>
"template template parameter using 'typename' is "<br>
- "incompatible with C++ standards before C++1z">,<br>
+ "incompatible with C++ standards before C++17">,<br>
InGroup<CXXPre1zCompat>, DefaultIgnore;<br>
def err_template_spec_syntax_non_<wbr>template : Error<<br>
"identifier followed by '<' indicates a class template specialization but "<br>
@@ -695,10 +695,10 @@ def err_default_template_template_<wbr>parame<br>
"template">;<br>
<br>
def ext_fold_expression : ExtWarn<<br>
- "pack fold expression is a C++1z extension">,<br>
- InGroup<CXX1z>;<br>
+ "pack fold expression is a C++17 extension">,<br>
+ InGroup<CXX17>;<br>
def warn_cxx14_compat_fold_<wbr>expression : Warning<<br>
- "pack fold expression is incompatible with C++ standards before C++1z">,<br>
+ "pack fold expression is incompatible with C++ standards before C++17">,<br>
InGroup<CXXPre1zCompat>, DefaultIgnore;<br>
def err_expected_fold_operator : Error<<br>
"expected a foldable binary operator in fold expression">;<br>
@@ -751,16 +751,16 @@ def err_alias_declaration_pack_<wbr>expansion<br>
// C++1z using-declaration pack expansions<br>
def ext_multi_using_declaration : ExtWarn<<br>
"use of multiple declarators in a single using declaration is "<br>
- "a C++1z extension">, InGroup<CXX1z>;<br>
+ "a C++17 extension">, InGroup<CXX17>;<br>
def warn_cxx1z_compat_multi_using_<wbr>declaration : Warning<<br>
"use of multiple declarators in a single using declaration is "<br>
- "incompatible with C++ standards before C++1z">,<br>
+ "incompatible with C++ standards before C++17">,<br>
InGroup<CXXPre1zCompat>, DefaultIgnore;<br>
def ext_using_declaration_pack : ExtWarn<<br>
- "pack expansion of using declaration is a C++1z extension">, InGroup<CXX1z>;<br>
+ "pack expansion of using declaration is a C++17 extension">, InGroup<CXX17>;<br>
def warn_cxx1z_compat_using_<wbr>declaration_pack : Warning<<br>
"pack expansion using declaration is incompatible with C++ standards "<br>
- "before C++1z">, InGroup<CXXPre1zCompat>, DefaultIgnore;<br>
+ "before C++17">, InGroup<CXXPre1zCompat>, DefaultIgnore;<br>
<br>
// C++11 override control<br>
def ext_override_control_keyword : ExtWarn<<br>
@@ -817,10 +817,10 @@ def err_expected_star_this_capture : Err<br>
<br>
// C++1z constexpr lambda expressions<br>
def warn_cxx14_compat_constexpr_<wbr>on_lambda : Warning<<br>
- "constexpr on lambda expressions is incompatible with C++ standards before C++1z">,<br>
+ "constexpr on lambda expressions is incompatible with C++ standards before C++17">,<br>
InGroup<CXXPre1zCompat>, DefaultIgnore;<br>
def ext_constexpr_on_lambda_cxx1z : ExtWarn<<br>
- "'constexpr' on lambda expressions is a C++1z extension">, InGroup<CXX1z>;<br>
+ "'constexpr' on lambda expressions is a C++17 extension">, InGroup<CXX17>;<br>
<br>
// Availability attribute<br>
def err_expected_version : Error<<br>
<br>
Modified: cfe/trunk/include/clang/Basic/<wbr>DiagnosticSemaKinds.td<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=310804&r1=310803&r2=310804&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/include/<wbr>clang/Basic/<wbr>DiagnosticSemaKinds.td?rev=<wbr>310804&r1=310803&r2=310804&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/include/clang/Basic/<wbr>DiagnosticSemaKinds.td (original)<br>
+++ cfe/trunk/include/clang/Basic/<wbr>DiagnosticSemaKinds.td Sun Aug 13 15:26:53 2017<br>
@@ -213,9 +213,9 @@ def warn_auto_storage_class : Warning<<br>
<br>
def warn_deprecated_register : Warning<<br>
"'register' storage class specifier is deprecated "<br>
- "and incompatible with C++1z">, InGroup<DeprecatedRegister>;<br>
+ "and incompatible with C++17">, InGroup<DeprecatedRegister>;<br>
def ext_register_storage_class : ExtWarn<<br>
- "ISO C++1z does not allow 'register' storage class specifier">,<br>
+ "ISO C++17 does not allow 'register' storage class specifier">,<br>
DefaultError, InGroup<Register>;<br>
<br>
def err_invalid_decl_spec_<wbr>combination : Error<<br>
@@ -393,9 +393,9 @@ def err_decomp_decl_context : Error<<br>
"decomposition declaration not permitted in this context">;<br>
def warn_cxx14_compat_decomp_decl : Warning<<br>
"decomposition declarations are incompatible with "<br>
- "C++ standards before C++1z">, DefaultIgnore, InGroup<CXXPre1zCompat>;<br>
+ "C++ standards before C++17">, DefaultIgnore, InGroup<CXXPre1zCompat>;<br>
def ext_decomp_decl : ExtWarn<<br>
- "decomposition declarations are a C++1z extension">, InGroup<CXX1z>;<br>
+ "decomposition declarations are a C++17 extension">, InGroup<CXX17>;<br>
def err_decomp_decl_spec : Error<<br>
"decomposition declaration cannot be declared "<br>
"%plural{1:'%1'|:with '%1' specifiers}0">;<br>
@@ -496,7 +496,7 @@ def err_access_decl : Error<<br>
"ISO C++11 does not allow access declarations; "<br>
"use using declarations instead">;<br>
def ext_dynamic_exception_spec : ExtWarn<<br>
- "ISO C++1z does not allow dynamic exception specifications">,<br>
+ "ISO C++17 does not allow dynamic exception specifications">,<br>
InGroup<DynamicExceptionSpec>, DefaultError;<br>
def warn_exception_spec_deprecated : Warning<<br>
"dynamic exception specifications are deprecated">,<br>
@@ -509,7 +509,7 @@ def warn_deprecated_copy_operation : War<br>
InGroup<Deprecated>, DefaultIgnore;<br>
def warn_cxx1z_compat_exception_<wbr>spec_in_signature : Warning<<br>
"mangled name of %0 will change in C++17 due to non-throwing exception "<br>
- "specification in function signature">, InGroup<CXX1zCompatMangling>;<br>
+ "specification in function signature">, InGroup<CXX17CompatMangling>;<br>
<br>
def warn_global_constructor : Warning<<br>
"declaration requires a global constructor">,<br>
@@ -1216,15 +1216,15 @@ def err_static_assert_expression_<wbr>is_not_<br>
"static_assert expression is not an integral constant expression">;<br>
def err_static_assert_failed : Error<"static_assert failed%select{ %1|}0">;<br>
def ext_static_assert_no_message : ExtWarn<<br>
- "static_assert with no message is a C++1z extension">, InGroup<CXX1z>;<br>
+ "static_assert with no message is a C++17 extension">, InGroup<CXX17>;<br>
def warn_cxx14_compat_static_<wbr>assert_no_message : Warning<<br>
- "static_assert with no message is incompatible with C++ standards before C++1z">,<br>
+ "static_assert with no message is incompatible with C++ standards before C++17">,<br>
DefaultIgnore, InGroup<CXXPre1zCompat>;<br>
<br>
def ext_inline_variable : ExtWarn<<br>
- "inline variables are a C++1z extension">, InGroup<CXX1z>;<br>
+ "inline variables are a C++17 extension">, InGroup<CXX17>;<br>
def warn_cxx14_compat_inline_<wbr>variable : Warning<<br>
- "inline variables are incompatible with C++ standards before C++1z">,<br>
+ "inline variables are incompatible with C++ standards before C++17">,<br>
DefaultIgnore, InGroup<CXXPre1zCompat>;<br>
<br>
def warn_inline_namespace_<wbr>reopened_noninline : Warning<<br>
@@ -1938,7 +1938,7 @@ def err_auto_not_allowed : Error<<br>
"|in non-static struct member|in struct member"<br>
"|in non-static union member|in union member"<br>
"|in non-static class member|in interface member"<br>
- "|in exception declaration|in template parameter until C++1z|in block literal"<br>
+ "|in exception declaration|in template parameter until C++17|in block literal"<br>
"|in template argument|in typedef|in type alias|in function return type"<br>
"|in conversion function type|here|in lambda parameter"<br>
"|in type allocated by 'new'|in K&R-style function parameter"<br>
@@ -2163,11 +2163,11 @@ def err_for_range_iter_deduction_<wbr>failure<br>
def err_for_range_member_begin_<wbr>end_mismatch : Error<<br>
"range type %0 has '%select{begin|end}1' member but no '%select{end|begin}1' member">;<br>
def ext_for_range_begin_end_types_<wbr>differ : ExtWarn<<br>
- "'begin' and 'end' returning different types (%0 and %1) is a C++1z extension">,<br>
- InGroup<CXX1z>;<br>
+ "'begin' and 'end' returning different types (%0 and %1) is a C++17 extension">,<br>
+ InGroup<CXX17>;<br>
def warn_for_range_begin_end_<wbr>types_differ : Warning<<br>
"'begin' and 'end' returning different types (%0 and %1) is incompatible "<br>
- "with C++ standards before C++1z">, InGroup<CXXPre1zCompat>, DefaultIgnore;<br>
+ "with C++ standards before C++17">, InGroup<CXXPre1zCompat>, DefaultIgnore;<br>
def note_in_for_range: Note<<br>
"when looking up '%select{begin|end}0' function for range expression "<br>
"of type %1">;<br>
@@ -3927,7 +3927,7 @@ def err_template_nontype_parm_bad_<wbr>type :<br>
"a non-type template parameter cannot have type %0">;<br>
def warn_cxx14_compat_template_<wbr>nontype_parm_auto_type : Warning<<br>
"non-type template parameters declared with %0 are incompatible with C++ "<br>
- "standards before C++1z">,<br>
+ "standards before C++17">,<br>
DefaultIgnore, InGroup<CXXPre1zCompat>;<br>
def err_template_param_default_<wbr>arg_redefinition : Error<<br>
"template parameter redefines default argument">;<br>
@@ -6363,9 +6363,9 @@ def note_member_first_declared_<wbr>here : No<br>
def err_decrement_bool : Error<"cannot decrement expression of type bool">;<br>
def warn_increment_bool : Warning<<br>
"incrementing expression of type bool is deprecated and "<br>
- "incompatible with C++1z">, InGroup<<wbr>DeprecatedIncrementBool>;<br>
+ "incompatible with C++17">, InGroup<<wbr>DeprecatedIncrementBool>;<br>
def ext_increment_bool : ExtWarn<<br>
- "ISO C++1z does not allow incrementing expression of type bool">,<br>
+ "ISO C++17 does not allow incrementing expression of type bool">,<br>
DefaultError, InGroup<IncrementBool>;<br>
def err_increment_decrement_enum : Error<<br>
"cannot %select{decrement|increment}0 expression of enum type %1">;<br>
@@ -6554,10 +6554,10 @@ let CategoryName = "Lambda Issue" in {<br>
<br>
// C++1z '*this' captures.<br>
def warn_cxx14_compat_star_this_<wbr>lambda_capture : Warning<<br>
- "by value capture of '*this' is incompatible with C++ standards before C++1z">,<br>
+ "by value capture of '*this' is incompatible with C++ standards before C++17">,<br>
InGroup<CXXPre1zCompat>, DefaultIgnore;<br>
def ext_star_this_lambda_capture_<wbr>cxx1z : ExtWarn<<br>
- "capture of '*this' by copy is a C++1z extension">, InGroup<CXX1z>;<br>
+ "capture of '*this' by copy is a C++17 extension">, InGroup<CXX17>;<br>
}<br>
<br>
def err_return_in_captured_stmt : Error<<br>
@@ -7230,7 +7230,7 @@ def warn_unused_volatile : Warning<<br>
def ext_cxx14_attr : Extension<<br>
"use of the %0 attribute is a C++14 extension">, InGroup<CXX14>;<br>
def ext_cxx1z_attr : Extension<<br>
- "use of the %0 attribute is a C++1z extension">, InGroup<CXX1z>;<br>
+ "use of the %0 attribute is a C++17 extension">, InGroup<CXX17>;<br>
<br>
def warn_unused_comparison : Warning<<br>
"%select{%select{|in}<wbr>1equality|relational}0 comparison result unused">,<br>
<br>
Modified: cfe/trunk/test/CXX/dcl.dcl/<wbr>dcl.attr/dcl.attr.nodiscard/<wbr>p2.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/dcl.dcl/dcl.attr/dcl.attr.nodiscard/p2.cpp?rev=310804&r1=310803&r2=310804&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/CXX/<wbr>dcl.dcl/dcl.attr/dcl.attr.<wbr>nodiscard/p2.cpp?rev=310804&<wbr>r1=310803&r2=310804&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/CXX/dcl.dcl/<wbr>dcl.attr/dcl.attr.nodiscard/<wbr>p2.cpp (original)<br>
+++ cfe/trunk/test/CXX/dcl.dcl/<wbr>dcl.attr/dcl.attr.nodiscard/<wbr>p2.cpp Sun Aug 13 15:26:53 2017<br>
@@ -1,5 +1,5 @@<br>
-// RUN: %clang_cc1 -fsyntax-only -std=c++1z -verify -Wc++1z-extensions %s<br>
-// RUN: %clang_cc1 -fsyntax-only -std=c++11 -verify -DEXT -Wc++1z-extensions %s<br>
+// RUN: %clang_cc1 -fsyntax-only -std=c++17 -verify -Wc++17-extensions %s<br>
+// RUN: %clang_cc1 -fsyntax-only -std=c++11 -verify -DEXT -Wc++17-extensions %s<br>
<br>
struct [[nodiscard]] S {};<br>
S get_s();<br>
@@ -23,7 +23,7 @@ void f() {<br>
}<br>
<br>
#ifdef EXT<br>
-// expected-warning@4 {{use of the 'nodiscard' attribute is a C++1z extension}}<br>
-// expected-warning@8 {{use of the 'nodiscard' attribute is a C++1z extension}}<br>
-// expected-warning@11 {{use of the 'nodiscard' attribute is a C++1z extension}}<br>
+// expected-warning@4 {{use of the 'nodiscard' attribute is a C++17 extension}}<br>
+// expected-warning@8 {{use of the 'nodiscard' attribute is a C++17 extension}}<br>
+// expected-warning@11 {{use of the 'nodiscard' attribute is a C++17 extension}}<br>
#endif<br>
<br>
Modified: cfe/trunk/test/CXX/dcl.dcl/<wbr>dcl.attr/dcl.attr.unused/p3.<wbr>cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/dcl.dcl/dcl.attr/dcl.attr.unused/p3.cpp?rev=310804&r1=310803&r2=310804&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/CXX/<wbr>dcl.dcl/dcl.attr/dcl.attr.<wbr>unused/p3.cpp?rev=310804&r1=<wbr>310803&r2=310804&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/CXX/dcl.dcl/<wbr>dcl.attr/dcl.attr.unused/p3.<wbr>cpp (original)<br>
+++ cfe/trunk/test/CXX/dcl.dcl/<wbr>dcl.attr/dcl.attr.unused/p3.<wbr>cpp Sun Aug 13 15:26:53 2017<br>
@@ -1,5 +1,5 @@<br>
-// RUN: %clang_cc1 -fsyntax-only -Wunused -Wused-but-marked-unused -std=c++1z -Wc++1z-extensions -verify %s<br>
-// RUN: %clang_cc1 -fsyntax-only -Wunused -Wused-but-marked-unused -std=c++11 -Wc++1z-extensions -verify -DEXT %s<br>
+// RUN: %clang_cc1 -fsyntax-only -Wunused -Wused-but-marked-unused -std=c++17 -Wc++17-extensions -verify %s<br>
+// RUN: %clang_cc1 -fsyntax-only -Wunused -Wused-but-marked-unused -std=c++11 -Wc++17-extensions -verify -DEXT %s<br>
<br>
static_assert(__has_cpp_<wbr>attribute(maybe_unused) == 201603, "");<br>
<br>
@@ -20,7 +20,7 @@ void f() {<br>
}<br>
<br>
#ifdef EXT<br>
-// expected-warning@6 {{use of the 'maybe_unused' attribute is a C++1z extension}}<br>
-// expected-warning@13 {{use of the 'maybe_unused' attribute is a C++1z extension}}<br>
-// expected-warning@14 {{use of the 'maybe_unused' attribute is a C++1z extension}}<br>
+// expected-warning@6 {{use of the 'maybe_unused' attribute is a C++17 extension}}<br>
+// expected-warning@13 {{use of the 'maybe_unused' attribute is a C++17 extension}}<br>
+// expected-warning@14 {{use of the 'maybe_unused' attribute is a C++17 extension}}<br>
#endif<br>
<br>
Modified: cfe/trunk/test/CXX/drs/dr0xx.<wbr>cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/drs/dr0xx.cpp?rev=310804&r1=310803&r2=310804&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/CXX/<wbr>drs/dr0xx.cpp?rev=310804&r1=<wbr>310803&r2=310804&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/CXX/drs/dr0xx.<wbr>cpp (original)<br>
+++ cfe/trunk/test/CXX/drs/dr0xx.<wbr>cpp Sun Aug 13 15:26:53 2017<br>
@@ -1,7 +1,7 @@<br>
// RUN: %clang_cc1 -std=c++98 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors -Wno-bind-to-temporary-copy<br>
// RUN: %clang_cc1 -std=c++11 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors -triple %itanium_abi_triple<br>
// RUN: %clang_cc1 -std=c++14 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors -triple %itanium_abi_triple<br>
-// RUN: %clang_cc1 -std=c++1z %s -verify -fexceptions -fcxx-exceptions -pedantic-errors -triple %itanium_abi_triple<br>
+// RUN: %clang_cc1 -std=c++17 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors -triple %itanium_abi_triple<br>
<br>
namespace dr1 { // dr1: no<br>
namespace X { extern "C" void dr1_f(int a = 1); }<br>
@@ -276,9 +276,9 @@ namespace dr23 { // dr23: yes<br>
<br>
namespace dr25 { // dr25: yes<br>
struct A {<br>
- void f() throw(int); // expected-error 0-1{{ISO C++1z does not allow}} expected-note 0-1{{use 'noexcept}}<br>
+ void f() throw(int); // expected-error 0-1{{ISO C++17 does not allow}} expected-note 0-1{{use 'noexcept}}<br>
};<br>
- void (A::*f)() throw (int); // expected-error 0-1{{ISO C++1z does not allow}} expected-note 0-1{{use 'noexcept}}<br>
+ void (A::*f)() throw (int); // expected-error 0-1{{ISO C++17 does not allow}} expected-note 0-1{{use 'noexcept}}<br>
void (A::*g)() throw () = f;<br>
#if __cplusplus <= 201402L<br>
// expected-error@-2 {{is not superset of source}}<br>
@@ -286,7 +286,7 @@ namespace dr25 { // dr25: yes<br>
// expected-error@-4 {{different exception specifications}}<br>
#endif<br>
void (A::*g2)() throw () = 0;<br>
- void (A::*h)() throw (int, char) = f; // expected-error 0-1{{ISO C++1z does not allow}} expected-note 0-1{{use 'noexcept}}<br>
+ void (A::*h)() throw (int, char) = f; // expected-error 0-1{{ISO C++17 does not allow}} expected-note 0-1{{use 'noexcept}}<br>
void (A::*i)() throw () = &A::f;<br>
#if __cplusplus <= 201402L<br>
// expected-error@-2 {{is not superset of source}}<br>
@@ -294,7 +294,7 @@ namespace dr25 { // dr25: yes<br>
// expected-error@-4 {{different exception specifications}}<br>
#endif<br>
void (A::*i2)() throw () = 0;<br>
- void (A::*j)() throw (int, char) = &A::f; // expected-error 0-1{{ISO C++1z does not allow}} expected-note 0-1{{use 'noexcept}}<br>
+ void (A::*j)() throw (int, char) = &A::f; // expected-error 0-1{{ISO C++17 does not allow}} expected-note 0-1{{use 'noexcept}}<br>
void x() {<br>
g2 = f;<br>
#if __cplusplus <= 201402L<br>
@@ -941,7 +941,7 @@ namespace dr84 { // dr84: yes<br>
};<br>
A a;<br>
// Cannot use B(C) / operator C() pair to construct the B from the B temporary<br>
- // here. In C++1z, we initialize the B object directly using 'A::operator B()'.<br>
+ // here. In C++17, we initialize the B object directly using 'A::operator B()'.<br>
B b = a;<br>
#if __cplusplus <= 201402L<br>
// expected-error@-2 {{no viable}}<br>
@@ -1033,14 +1033,14 @@ namespace dr91 { // dr91: yes<br>
}<br>
<br>
namespace dr92 { // dr92: 4 c++17<br>
- void f() throw(int, float); // expected-error 0-1{{ISO C++1z does not allow}} expected-note 0-1{{use 'noexcept}}<br>
- void (*p)() throw(int) = &f; // expected-error 0-1{{ISO C++1z does not allow}} expected-note 0-1{{use 'noexcept}}<br>
+ void f() throw(int, float); // expected-error 0-1{{ISO C++17 does not allow}} expected-note 0-1{{use 'noexcept}}<br>
+ void (*p)() throw(int) = &f; // expected-error 0-1{{ISO C++17 does not allow}} expected-note 0-1{{use 'noexcept}}<br>
#if __cplusplus <= 201402L<br>
// expected-error@-2 {{target exception specification is not superset of source}}<br>
#else<br>
// expected-warning@-4 {{target exception specification is not superset of source}}<br>
#endif<br>
- void (*q)() throw(int); // expected-error 0-1{{ISO C++1z does not allow}} expected-note 0-1{{use 'noexcept}}<br>
+ void (*q)() throw(int); // expected-error 0-1{{ISO C++17 does not allow}} expected-note 0-1{{use 'noexcept}}<br>
void (**pp)() throw() = &q;<br>
#if __cplusplus <= 201402L<br>
// expected-error@-2 {{exception specifications are not allowed}}<br>
@@ -1064,7 +1064,7 @@ namespace dr92 { // dr92: 4 c++17<br>
// expected-error@-2 {{not implicitly convertible}}<br>
#endif<br>
<br>
- template<void() throw(int)> struct Y {}; // expected-error 0-1{{ISO C++1z does not allow}} expected-note 0-1{{use 'noexcept}}<br>
+ template<void() throw(int)> struct Y {}; // expected-error 0-1{{ISO C++17 does not allow}} expected-note 0-1{{use 'noexcept}}<br>
Y<&h> yp; // ok<br>
}<br>
<br>
<br>
Modified: cfe/trunk/test/CXX/drs/dr13xx.<wbr>cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/drs/dr13xx.cpp?rev=310804&r1=310803&r2=310804&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/CXX/<wbr>drs/dr13xx.cpp?rev=310804&r1=<wbr>310803&r2=310804&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/CXX/drs/dr13xx.<wbr>cpp (original)<br>
+++ cfe/trunk/test/CXX/drs/dr13xx.<wbr>cpp Sun Aug 13 15:26:53 2017<br>
@@ -1,7 +1,7 @@<br>
// RUN: %clang_cc1 -std=c++98 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors<br>
// RUN: %clang_cc1 -std=c++11 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors<br>
// RUN: %clang_cc1 -std=c++14 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors<br>
-// RUN: %clang_cc1 -std=c++1z %s -verify -fexceptions -fcxx-exceptions -pedantic-errors<br>
+// RUN: %clang_cc1 -std=c++17 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors<br>
<br>
__extension__ typedef __SIZE_TYPE__ size_t;<br>
<br>
@@ -124,7 +124,7 @@ namespace dr1315 { // dr1315: partial<br>
namespace dr1330 { // dr1330: 4 c++11<br>
// exception-specifications are parsed in a context where the class is complete.<br>
struct A {<br>
- void f() throw(T) {} // expected-error 0-1{{C++1z}} expected-note 0-1{{noexcept}}<br>
+ void f() throw(T) {} // expected-error 0-1{{C++17}} expected-note 0-1{{noexcept}}<br>
struct T {};<br>
<br>
#if __cplusplus >= 201103L<br>
@@ -134,7 +134,7 @@ namespace dr1330 { // dr1330: 4 c++11<br>
#endif<br>
};<br>
<br>
- void (A::*af1)() throw(A::T) = &A::f; // expected-error 0-1{{C++1z}} expected-note 0-1{{noexcept}}<br>
+ void (A::*af1)() throw(A::T) = &A::f; // expected-error 0-1{{C++17}} expected-note 0-1{{noexcept}}<br>
void (A::*af2)() throw() = &A::f; // expected-error-re {{{{not superset|different exception spec}}}}<br>
<br>
#if __cplusplus >= 201103L<br>
@@ -144,7 +144,7 @@ namespace dr1330 { // dr1330: 4 c++11<br>
// Likewise, they're instantiated separately from an enclosing class template.<br>
template<typename U><br>
struct B {<br>
- void f() throw(T, typename U::type) {} // expected-error 0-1{{C++1z}} expected-note 0-1{{noexcept}}<br>
+ void f() throw(T, typename U::type) {} // expected-error 0-1{{C++17}} expected-note 0-1{{noexcept}}<br>
struct T {};<br>
<br>
#if __cplusplus >= 201103L<br>
@@ -161,7 +161,7 @@ namespace dr1330 { // dr1330: 4 c++11<br>
static const int value = true;<br>
};<br>
<br>
- void (B<P>::*bpf1)() throw(B<P>::T, int) = &B<P>::f; // expected-error 0-1{{C++1z}} expected-note 0-1{{noexcept}}<br>
+ void (B<P>::*bpf1)() throw(B<P>::T, int) = &B<P>::f; // expected-error 0-1{{C++17}} expected-note 0-1{{noexcept}}<br>
#if __cplusplus < 201103L<br>
// expected-error@-2 {{not superset}}<br>
// FIXME: We only delay instantiation in C++11 onwards. In C++98, something<br>
@@ -172,7 +172,7 @@ namespace dr1330 { // dr1330: 4 c++11<br>
// the "T has not yet been instantiated" error here, rather than giving<br>
// confusing errors later on.<br>
#endif<br>
- void (B<P>::*bpf2)() throw(int) = &B<P>::f; // expected-error 0-1{{C++1z}} expected-note 0-1{{noexcept}}<br>
+ void (B<P>::*bpf2)() throw(int) = &B<P>::f; // expected-error 0-1{{C++17}} expected-note 0-1{{noexcept}}<br>
#if __cplusplus <= 201402L<br>
// expected-error@-2 {{not superset}}<br>
#else<br>
@@ -194,7 +194,7 @@ namespace dr1330 { // dr1330: 4 c++11<br>
<br>
template<typename T> int f() throw(typename T::error) { return 0; } // expected-error 1-4{{prior to '::'}} expected-note 0-1{{prior to '::'}} expected-note 0-1{{requested here}}<br>
#if __cplusplus > 201402L<br>
- // expected-error@-2 0-1{{C++1z}} expected-note@-2 0-1{{noexcept}}<br>
+ // expected-error@-2 0-1{{C++17}} expected-note@-2 0-1{{noexcept}}<br>
#endif<br>
// An exception-specification is needed even if the function is only used in<br>
// an unevaluated operand.<br>
@@ -203,7 +203,7 @@ namespace dr1330 { // dr1330: 4 c++11<br>
decltype(f<char>()) f2; // expected-note {{instantiation of}}<br>
bool f3 = noexcept(f<float>()); // expected-note {{instantiation of}}<br>
#endif<br>
- // In C++1z onwards, substituting explicit template arguments into the<br>
+ // In C++17 onwards, substituting explicit template arguments into the<br>
// function type substitutes into the exception specification (because it's<br>
// part of the type). In earlier languages, we don't notice there's a problem<br>
// until we've already started to instantiate.<br>
@@ -217,7 +217,7 @@ namespace dr1330 { // dr1330: 4 c++11<br>
template<typename T> struct C {<br>
C() throw(typename T::type); // expected-error 1-2{{prior to '::'}}<br>
#if __cplusplus > 201402L<br>
- // expected-error@-2 0-1{{C++1z}} expected-note@-2 0-1{{noexcept}}<br>
+ // expected-error@-2 0-1{{C++17}} expected-note@-2 0-1{{noexcept}}<br>
#endif<br>
};<br>
struct D : C<void> {}; // ok<br>
<br>
Modified: cfe/trunk/test/CXX/drs/dr1xx.<wbr>cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/drs/dr1xx.cpp?rev=310804&r1=310803&r2=310804&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/CXX/<wbr>drs/dr1xx.cpp?rev=310804&r1=<wbr>310803&r2=310804&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/CXX/drs/dr1xx.<wbr>cpp (original)<br>
+++ cfe/trunk/test/CXX/drs/dr1xx.<wbr>cpp Sun Aug 13 15:26:53 2017<br>
@@ -1,7 +1,7 @@<br>
// RUN: %clang_cc1 -std=c++98 -triple x86_64-unknown-unknown %s -verify -fexceptions -fcxx-exceptions -pedantic-errors<br>
// RUN: %clang_cc1 -std=c++11 -triple x86_64-unknown-unknown %s -verify -fexceptions -fcxx-exceptions -pedantic-errors<br>
// RUN: %clang_cc1 -std=c++14 -triple x86_64-unknown-unknown %s -verify -fexceptions -fcxx-exceptions -pedantic-errors<br>
-// RUN: %clang_cc1 -std=c++1z -triple x86_64-unknown-unknown %s -verify -fexceptions -fcxx-exceptions -pedantic-errors<br>
+// RUN: %clang_cc1 -std=c++17 -triple x86_64-unknown-unknown %s -verify -fexceptions -fcxx-exceptions -pedantic-errors<br>
<br>
namespace dr100 { // dr100: yes<br>
template<const char *> struct A {}; // expected-note 0-1{{declared here}}<br>
@@ -313,7 +313,7 @@ namespace dr126 { // dr126: no<br>
virtual void z() throw(long); // expected-error {{more lax}}<br>
};<br>
#else<br>
- void f() throw(int); // expected-error {{ISO C++1z does not allow}} expected-note {{use 'noexcept}}<br>
+ void f() throw(int); // expected-error {{ISO C++17 does not allow}} expected-note {{use 'noexcept}}<br>
#endif<br>
}<br>
<br>
<br>
Modified: cfe/trunk/test/CXX/drs/dr2xx.<wbr>cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/drs/dr2xx.cpp?rev=310804&r1=310803&r2=310804&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/CXX/<wbr>drs/dr2xx.cpp?rev=310804&r1=<wbr>310803&r2=310804&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/CXX/drs/dr2xx.<wbr>cpp (original)<br>
+++ cfe/trunk/test/CXX/drs/dr2xx.<wbr>cpp Sun Aug 13 15:26:53 2017<br>
@@ -1,7 +1,7 @@<br>
// RUN: %clang_cc1 -std=c++98 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors<br>
// RUN: %clang_cc1 -std=c++11 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors<br>
// RUN: %clang_cc1 -std=c++14 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors<br>
-// RUN: %clang_cc1 -std=c++1z %s -verify -fexceptions -fcxx-exceptions -pedantic-errors<br>
+// RUN: %clang_cc1 -std=c++17 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors<br>
<br>
// PR13819 -- __SIZE_TYPE__ is incompatible.<br>
typedef __SIZE_TYPE__ size_t; // expected-error 0-1 {{extension}}<br>
@@ -984,7 +984,7 @@ namespace dr289 { // dr289: yes<br>
namespace dr294 { // dr294: no<br>
void f() throw(int);<br>
#if __cplusplus > 201402L<br>
- // expected-error@-2 {{ISO C++1z does not allow}} expected-note@-2 {{use 'noexcept}}<br>
+ // expected-error@-2 {{ISO C++17 does not allow}} expected-note@-2 {{use 'noexcept}}<br>
#endif<br>
int main() {<br>
(void)static_cast<void (*)() throw()>(f); // FIXME: ill-formed in C++14 and before<br>
@@ -1001,13 +1001,13 @@ namespace dr294 { // dr294: no<br>
#endif<br>
(void)static_cast<void (*)() throw(int)>(f); // FIXME: ill-formed in C++14 and before<br>
#if __cplusplus > 201402L<br>
- // expected-error@-2 {{ISO C++1z does not allow}} expected-note@-2 {{use 'noexcept}}<br>
+ // expected-error@-2 {{ISO C++17 does not allow}} expected-note@-2 {{use 'noexcept}}<br>
#endif<br>
<br>
void (*p)() throw() = f; // expected-error-re {{{{not superset|different exception specification}}}}<br>
void (*q)() throw(int) = f;<br>
#if __cplusplus > 201402L<br>
- // expected-error@-2 {{ISO C++1z does not allow}} expected-note@-2 {{use 'noexcept}}<br>
+ // expected-error@-2 {{ISO C++17 does not allow}} expected-note@-2 {{use 'noexcept}}<br>
#endif<br>
}<br>
}<br>
<br>
Modified: cfe/trunk/test/CXX/drs/dr4xx.<wbr>cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/drs/dr4xx.cpp?rev=310804&r1=310803&r2=310804&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/CXX/<wbr>drs/dr4xx.cpp?rev=310804&r1=<wbr>310803&r2=310804&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/CXX/drs/dr4xx.<wbr>cpp (original)<br>
+++ cfe/trunk/test/CXX/drs/dr4xx.<wbr>cpp Sun Aug 13 15:26:53 2017<br>
@@ -1,7 +1,7 @@<br>
// RUN: env ASAN_OPTIONS=detect_stack_use_<wbr>after_return=0 %clang_cc1 -std=c++98 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors<br>
// RUN: env ASAN_OPTIONS=detect_stack_use_<wbr>after_return=0 %clang_cc1 -std=c++11 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors<br>
// RUN: env ASAN_OPTIONS=detect_stack_use_<wbr>after_return=0 %clang_cc1 -std=c++14 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors<br>
-// RUN: env ASAN_OPTIONS=detect_stack_use_<wbr>after_return=0 %clang_cc1 -std=c++1z %s -verify -fexceptions -fcxx-exceptions -pedantic-errors<br>
+// RUN: env ASAN_OPTIONS=detect_stack_use_<wbr>after_return=0 %clang_cc1 -std=c++17 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors<br>
<br>
// FIXME: __SIZE_TYPE__ expands to 'long long' on some targets.<br>
__extension__ typedef __SIZE_TYPE__ size_t;<br>
@@ -507,16 +507,16 @@ namespace dr437 { // dr437: sup 1308<br>
struct S {<br>
void f() throw(S);<br>
#if __cplusplus > 201402L<br>
- // expected-error@-2 {{ISO C++1z does not allow}} expected-note@-2 {{use 'noexcept}}<br>
+ // expected-error@-2 {{ISO C++17 does not allow}} expected-note@-2 {{use 'noexcept}}<br>
#endif<br>
void g() throw(T<S>);<br>
#if __cplusplus > 201402L<br>
- // expected-error@-2 {{ISO C++1z does not allow}} expected-note@-2 {{use 'noexcept}}<br>
+ // expected-error@-2 {{ISO C++17 does not allow}} expected-note@-2 {{use 'noexcept}}<br>
#endif<br>
struct U;<br>
void h() throw(U);<br>
#if __cplusplus > 201402L<br>
- // expected-error@-2 {{ISO C++1z does not allow}} expected-note@-2 {{use 'noexcept}}<br>
+ // expected-error@-2 {{ISO C++17 does not allow}} expected-note@-2 {{use 'noexcept}}<br>
#endif<br>
struct U {};<br>
};<br>
<br>
Modified: cfe/trunk/test/CXX/drs/dr5xx.<wbr>cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/drs/dr5xx.cpp?rev=310804&r1=310803&r2=310804&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/CXX/<wbr>drs/dr5xx.cpp?rev=310804&r1=<wbr>310803&r2=310804&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/CXX/drs/dr5xx.<wbr>cpp (original)<br>
+++ cfe/trunk/test/CXX/drs/dr5xx.<wbr>cpp Sun Aug 13 15:26:53 2017<br>
@@ -1,7 +1,7 @@<br>
// RUN: %clang_cc1 -std=c++98 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors<br>
// RUN: %clang_cc1 -std=c++11 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors<br>
// RUN: %clang_cc1 -std=c++14 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors<br>
-// RUN: %clang_cc1 -std=c++1z %s -verify -fexceptions -fcxx-exceptions -pedantic-errors<br>
+// RUN: %clang_cc1 -std=c++17 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors<br>
<br>
// FIXME: This is included to avoid a diagnostic with no source location<br>
// pointing at the implicit operator new. We can't match such a diagnostic<br>
@@ -966,7 +966,7 @@ namespace dr595 { // dr595: dup 1330<br>
template<class T> struct X {<br>
void f() throw(T) {}<br>
#if __cplusplus > 201402L<br>
- // expected-error@-2 {{ISO C++1z does not allow}} expected-note@-2 {{use 'noexcept}}<br>
+ // expected-error@-2 {{ISO C++17 does not allow}} expected-note@-2 {{use 'noexcept}}<br>
#endif<br>
};<br>
struct S {<br>
<br>
Modified: cfe/trunk/test/CXX/stmt.stmt/<wbr>stmt.iter/stmt.ranged/p1.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/stmt.stmt/stmt.iter/stmt.ranged/p1.cpp?rev=310804&r1=310803&r2=310804&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/CXX/<wbr>stmt.stmt/stmt.iter/stmt.<wbr>ranged/p1.cpp?rev=310804&r1=<wbr>310803&r2=310804&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/CXX/stmt.stmt/<wbr>stmt.iter/stmt.ranged/p1.cpp (original)<br>
+++ cfe/trunk/test/CXX/stmt.stmt/<wbr>stmt.iter/stmt.ranged/p1.cpp Sun Aug 13 15:26:53 2017<br>
@@ -1,6 +1,6 @@<br>
// RUN: %clang_cc1 -std=c++11 -fsyntax-only -verify %s<br>
// RUN: %clang_cc1 -std=c++14 -fsyntax-only -verify %s<br>
-// RUN: %clang_cc1 -std=c++1z -fsyntax-only -verify %s<br>
+// RUN: %clang_cc1 -std=c++17 -fsyntax-only -verify %s<br>
<br>
struct pr12960 {<br>
int begin;<br>
@@ -125,7 +125,7 @@ void g() {<br>
};<br>
for (auto a : Differ())<br>
#if __cplusplus <= 201402L<br>
- // expected-warning@-2 {{'begin' and 'end' returning different types ('int *' and 'null_t') is a C++1z extension}}<br>
+ // expected-warning@-2 {{'begin' and 'end' returning different types ('int *' and 'null_t') is a C++17 extension}}<br>
// expected-note@-6 {{selected 'begin' function with iterator type 'int *'}}<br>
// expected-note@-6 {{selected 'end' function with iterator type 'null_t'}}<br>
#endif<br>
<br>
Modified: cfe/trunk/test/FixIt/fixit.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/FixIt/fixit.cpp?rev=310804&r1=310803&r2=310804&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/FixIt/<wbr>fixit.cpp?rev=310804&r1=<wbr>310803&r2=310804&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/FixIt/fixit.cpp (original)<br>
+++ cfe/trunk/test/FixIt/fixit.cpp Sun Aug 13 15:26:53 2017<br>
@@ -216,7 +216,7 @@ template<class T> typedef Mystery<T>::ty<br>
}<br>
<br>
template<template<typename> Foo, // expected-error {{template template parameter requires 'class' after the parameter list}}<br>
- template<typename> typename Bar, // expected-warning {{template template parameter using 'typename' is a C++1z extension}}<br>
+ template<typename> typename Bar, // expected-warning {{template template parameter using 'typename' is a C++17 extension}}<br>
template<typename> struct Baz> // expected-error {{template template parameter requires 'class' after the parameter list}}<br>
void func();<br>
<br>
<br>
Modified: cfe/trunk/test/Lexer/hexfloat.<wbr>cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Lexer/hexfloat.cpp?rev=310804&r1=310803&r2=310804&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Lexer/<wbr>hexfloat.cpp?rev=310804&r1=<wbr>310803&r2=310804&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/Lexer/hexfloat.<wbr>cpp (original)<br>
+++ cfe/trunk/test/Lexer/hexfloat.<wbr>cpp Sun Aug 13 15:26:53 2017<br>
@@ -1,7 +1,7 @@<br>
// RUN: %clang_cc1 -std=c++98 -fsyntax-only -verify -pedantic %s<br>
// RUN: %clang_cc1 -std=c++11 -fsyntax-only -verify -pedantic %s<br>
// RUN: %clang_cc1 -std=c++14 -fsyntax-only -verify -pedantic %s<br>
-// RUN: %clang_cc1 -std=c++1z -fsyntax-only -verify -pedantic %s<br>
+// RUN: %clang_cc1 -std=c++17 -fsyntax-only -verify -pedantic %s<br>
double e = 0x.p0; // expected-error-re {{hexadecimal floating {{constant|literal}} requires a significand}}<br>
<br>
float f = 0x1p+1;<br>
@@ -9,10 +9,10 @@ double d = 0x.2p2;<br>
float g = 0x1.2p2;<br>
double h = 0x1.p2;<br>
#if __cplusplus <= 201402L<br>
-// expected-warning@-5 {{hexadecimal floating literals are a C++1z feature}}<br>
-// expected-warning@-5 {{hexadecimal floating literals are a C++1z feature}}<br>
-// expected-warning@-5 {{hexadecimal floating literals are a C++1z feature}}<br>
-// expected-warning@-5 {{hexadecimal floating literals are a C++1z feature}}<br>
+// expected-warning@-5 {{hexadecimal floating literals are a C++17 feature}}<br>
+// expected-warning@-5 {{hexadecimal floating literals are a C++17 feature}}<br>
+// expected-warning@-5 {{hexadecimal floating literals are a C++17 feature}}<br>
+// expected-warning@-5 {{hexadecimal floating literals are a C++17 feature}}<br>
#endif<br>
<br>
// PR12717: In order to minimally diverge from the C++ standard, we do not lex<br>
<br>
Modified: cfe/trunk/test/Parser/cxx0x-<wbr>attributes.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/cxx0x-attributes.cpp?rev=310804&r1=310803&r2=310804&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Parser/<wbr>cxx0x-attributes.cpp?rev=<wbr>310804&r1=310803&r2=310804&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/Parser/cxx0x-<wbr>attributes.cpp (original)<br>
+++ cfe/trunk/test/Parser/cxx0x-<wbr>attributes.cpp Sun Aug 13 15:26:53 2017<br>
@@ -1,4 +1,4 @@<br>
-// RUN: %clang_cc1 -fcxx-exceptions -fexceptions -fsyntax-only -verify -std=c++11 -Wc++14-compat -Wc++14-extensions -Wc++1z-extensions %s<br>
+// RUN: %clang_cc1 -fcxx-exceptions -fexceptions -fsyntax-only -verify -std=c++11 -Wc++14-compat -Wc++14-extensions -Wc++17-extensions %s<br>
<br>
// Need std::initializer_list<br>
namespace std {<br>
@@ -127,7 +127,7 @@ extern "C++" [[]] { } // expected-error<br>
[[]] using ns::i; // expected-error {{an attribute list cannot appear here}}<br>
[[unknown]] using namespace ns; // expected-warning {{unknown attribute 'unknown' ignored}}<br>
[[noreturn]] using namespace ns; // expected-error {{'noreturn' attribute only applies to functions}}<br>
-namespace [[]] ns2 {} // expected-warning {{attributes on a namespace declaration are incompatible with C++ standards before C++1z}}<br>
+namespace [[]] ns2 {} // expected-warning {{attributes on a namespace declaration are incompatible with C++ standards before C++17}}<br>
<br>
using [[]] alignas(4) [[]] ns::i; // expected-error {{an attribute list cannot appear here}}<br>
using [[]] alignas(4) [[]] foobar = int; // expected-error {{an attribute list cannot appear here}} expected-error {{'alignas' attribute only applies to}}<br>
@@ -179,7 +179,7 @@ enum [[]] E2; // expected-error {{forbid<br>
enum [[]] E1;<br>
enum [[]] E3 : int;<br>
enum [[]] {<br>
- k_123 [[]] = 123 // expected-warning {{attributes on an enumerator declaration are incompatible with C++ standards before C++1z}}<br>
+ k_123 [[]] = 123 // expected-warning {{attributes on an enumerator declaration are incompatible with C++ standards before C++17}}<br>
};<br>
enum [[]] E1 e; // expected-error {{an attribute list cannot appear here}}<br>
enum [[]] class E4 { }; // expected-error {{an attribute list cannot appear here}}<br>
@@ -352,7 +352,7 @@ int fallthru(int n) {<br>
switch (n) {<br>
case 0:<br>
n += 5;<br>
- [[fallthrough]]; // expected-warning {{use of the 'fallthrough' attribute is a C++1z extension}}<br>
+ [[fallthrough]]; // expected-warning {{use of the 'fallthrough' attribute is a C++17 extension}}<br>
case 1:<br>
n *= 2;<br>
break;<br>
<br>
Modified: cfe/trunk/test/Parser/cxx1z-<wbr>constexpr-lambdas.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/cxx1z-constexpr-lambdas.cpp?rev=310804&r1=310803&r2=310804&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Parser/<wbr>cxx1z-constexpr-lambdas.cpp?<wbr>rev=310804&r1=310803&r2=<wbr>310804&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/Parser/cxx1z-<wbr>constexpr-lambdas.cpp (original)<br>
+++ cfe/trunk/test/Parser/cxx1z-<wbr>constexpr-lambdas.cpp Sun Aug 13 15:26:53 2017<br>
@@ -1,4 +1,4 @@<br>
-// RUN: %clang_cc1 -std=c++1z %s -verify<br>
+// RUN: %clang_cc1 -std=c++17 %s -verify<br>
// RUN: %clang_cc1 -std=c++14 %s -verify<br>
// RUN: %clang_cc1 -std=c++11 %s -verify<br>
<br>
@@ -23,9 +23,9 @@ auto XL16 = [] () constexpr<br>
{ };<br>
<br>
#else<br>
-auto L = []() mutable constexpr {return 0; }; //expected-warning{{is a C++1z extension}}<br>
-auto L2 = []() constexpr { return 0;};//expected-warning{{is a C++1z extension}}<br>
-auto L4 = []() constexpr mutable { return 0; }; //expected-warning{{is a C++1z extension}}<br>
+auto L = []() mutable constexpr {return 0; }; //expected-warning{{is a C++17 extension}}<br>
+auto L2 = []() constexpr { return 0;};//expected-warning{{is a C++17 extension}}<br>
+auto L4 = []() constexpr mutable { return 0; }; //expected-warning{{is a C++17 extension}}<br>
#endif<br>
<br>
<br>
<br>
Modified: cfe/trunk/test/Parser/cxx1z-<wbr>nested-namespace-definition.<wbr>cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/cxx1z-nested-namespace-definition.cpp?rev=310804&r1=310803&r2=310804&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Parser/<wbr>cxx1z-nested-namespace-<wbr>definition.cpp?rev=310804&r1=<wbr>310803&r2=310804&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/Parser/cxx1z-<wbr>nested-namespace-definition.<wbr>cpp (original)<br>
+++ cfe/trunk/test/Parser/cxx1z-<wbr>nested-namespace-definition.<wbr>cpp Sun Aug 13 15:26:53 2017<br>
@@ -2,13 +2,13 @@<br>
// RUN: %clang_cc1 -fsyntax-only -verify %s<br>
// RUN: not %clang_cc1 -x c++ -fixit %t -Werror -DFIXIT<br>
// RUN: %clang_cc1 -x c++ %t -DFIXIT<br>
-// RUN: %clang_cc1 -fsyntax-only -verify %s -std=c++1z -Wc++14-compat<br>
+// RUN: %clang_cc1 -fsyntax-only -verify %s -std=c++17 -Wc++14-compat<br>
<br>
namespace foo1::foo2::foo3 {<br>
#if __cplusplus <= 201400L<br>
-// expected-warning@-2 {{nested namespace definition is a C++1z extension; define each namespace separately}}<br>
+// expected-warning@-2 {{nested namespace definition is a C++17 extension; define each namespace separately}}<br>
#else<br>
-// expected-warning@-4 {{nested namespace definition is incompatible with C++ standards before C++1z}}<br>
+// expected-warning@-4 {{nested namespace definition is incompatible with C++ standards before C++17}}<br>
#endif<br>
int foo(int x) { return x; }<br>
}<br>
<br>
Modified: cfe/trunk/test/SemaCXX/cxx0x-<wbr>compat.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/cxx0x-compat.cpp?rev=310804&r1=310803&r2=310804&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/<wbr>SemaCXX/cxx0x-compat.cpp?rev=<wbr>310804&r1=310803&r2=310804&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/SemaCXX/cxx0x-<wbr>compat.cpp (original)<br>
+++ cfe/trunk/test/SemaCXX/cxx0x-<wbr>compat.cpp Sun Aug 13 15:26:53 2017<br>
@@ -1,5 +1,5 @@<br>
// RUN: %clang_cc1 -fsyntax-only -std=c++98 -Wc++11-compat -verify %s<br>
-// RUN: %clang_cc1 -fsyntax-only -std=c++1z -Wc++11-compat -verify %s<br>
+// RUN: %clang_cc1 -fsyntax-only -std=c++17 -Wc++11-compat -verify %s<br>
<br>
#if __cplusplus < 201103L<br>
<br>
@@ -42,14 +42,14 @@ void h(size_t foo, size_t bar) {<br>
char c = 'x'_x; // expected-warning {{will be treated as a user-defined literal suffix}}<br>
<br>
template<int ...N> int f() { // expected-warning {{C++11 extension}}<br>
- return (N + ...); // expected-warning {{C++1z extension}}<br>
+ return (N + ...); // expected-warning {{C++17 extension}}<br>
}<br>
<br>
#else<br>
<br>
auto init_capture = [a(0)] {}; // expected-warning {{initialized lambda captures are incompatible with C++ standards before C++14}}<br>
-static_assert(true); // expected-warning {{incompatible with C++ standards before C++1z}}<br>
+static_assert(true); // expected-warning {{incompatible with C++ standards before C++17}}<br>
<br>
-template<int ...N> int f() { return (N + ...); } // expected-warning {{incompatible with C++ standards before C++1z}}<br>
+template<int ...N> int f() { return (N + ...); } // expected-warning {{incompatible with C++ standards before C++17}}<br>
<br>
#endif<br>
<br>
Modified: cfe/trunk/test/SemaCXX/<wbr>deprecated.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/deprecated.cpp?rev=310804&r1=310803&r2=310804&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/<wbr>SemaCXX/deprecated.cpp?rev=<wbr>310804&r1=310803&r2=310804&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/SemaCXX/<wbr>deprecated.cpp (original)<br>
+++ cfe/trunk/test/SemaCXX/<wbr>deprecated.cpp Sun Aug 13 15:26:53 2017<br>
@@ -1,9 +1,9 @@<br>
// RUN: %clang_cc1 -std=c++98 %s -Wdeprecated -verify -triple x86_64-linux-gnu<br>
// RUN: %clang_cc1 -std=c++11 %s -Wdeprecated -verify -triple x86_64-linux-gnu<br>
-// RUN: %clang_cc1 -std=c++1y %s -Wdeprecated -verify -triple x86_64-linux-gnu<br>
-// RUN: %clang_cc1 -std=c++1z %s -Wdeprecated -verify -triple x86_64-linux-gnu<br>
+// RUN: %clang_cc1 -std=c++14 %s -Wdeprecated -verify -triple x86_64-linux-gnu<br>
+// RUN: %clang_cc1 -std=c++17 %s -Wdeprecated -verify -triple x86_64-linux-gnu<br>
<br>
-// RUN: %clang_cc1 -std=c++1y %s -Wdeprecated -verify -triple x86_64-linux-gnu -Wno-deprecated-register -DNO_DEPRECATED_FLAGS<br>
+// RUN: %clang_cc1 -std=c++14 %s -Wdeprecated -verify -triple x86_64-linux-gnu -Wno-deprecated-register -DNO_DEPRECATED_FLAGS<br>
<br>
#include "Inputs/register.h"<br>
<br>
@@ -12,8 +12,8 @@ void h() throw(int);<br>
void i() throw(...);<br>
#if __cplusplus > 201402L<br>
// expected-warning@-4 {{dynamic exception specifications are deprecated}} expected-note@-4 {{use 'noexcept' instead}}<br>
-// expected-error@-4 {{ISO C++1z does not allow dynamic exception specifications}} expected-note@-4 {{use 'noexcept(false)' instead}}<br>
-// expected-error@-4 {{ISO C++1z does not allow dynamic exception specifications}} expected-note@-4 {{use 'noexcept(false)' instead}}<br>
+// expected-error@-4 {{ISO C++17 does not allow dynamic exception specifications}} expected-note@-4 {{use 'noexcept(false)' instead}}<br>
+// expected-error@-4 {{ISO C++17 does not allow dynamic exception specifications}} expected-note@-4 {{use 'noexcept(false)' instead}}<br>
#elif __cplusplus >= 201103L<br>
// expected-warning@-8 {{dynamic exception specifications are deprecated}} expected-note@-8 {{use 'noexcept' instead}}<br>
// expected-warning@-8 {{dynamic exception specifications are deprecated}} expected-note@-8 {{use 'noexcept(false)' instead}}<br>
@@ -23,7 +23,7 @@ void i() throw(...);<br>
void stuff() {<br>
register int n;<br>
#if __cplusplus > 201402L<br>
- // expected-error@-2 {{ISO C++1z does not allow 'register' storage class specifier}}<br>
+ // expected-error@-2 {{ISO C++17 does not allow 'register' storage class specifier}}<br>
#elif __cplusplus >= 201103L && !defined(NO_DEPRECATED_FLAGS)<br>
// expected-warning@-4 {{'register' storage class specifier is deprecated}}<br>
#endif<br>
@@ -34,14 +34,14 @@ void stuff() {<br>
bool b;<br>
++b;<br>
#if __cplusplus > 201402L<br>
- // expected-error@-2 {{ISO C++1z does not allow incrementing expression of type bool}}<br>
+ // expected-error@-2 {{ISO C++17 does not allow incrementing expression of type bool}}<br>
#else<br>
// expected-warning@-4 {{incrementing expression of type bool is deprecated}}<br>
#endif<br>
<br>
b++;<br>
#if __cplusplus > 201402L<br>
- // expected-error@-2 {{ISO C++1z does not allow incrementing expression of type bool}}<br>
+ // expected-error@-2 {{ISO C++17 does not allow incrementing expression of type bool}}<br>
#else<br>
// expected-warning@-4 {{incrementing expression of type bool is deprecated}}<br>
#endif<br>
<br>
Modified: cfe/trunk/test/SemaCXX/inline.<wbr>cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/inline.cpp?rev=310804&r1=310803&r2=310804&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/<wbr>SemaCXX/inline.cpp?rev=310804&<wbr>r1=310803&r2=310804&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/SemaCXX/inline.<wbr>cpp (original)<br>
+++ cfe/trunk/test/SemaCXX/inline.<wbr>cpp Sun Aug 13 15:26:53 2017<br>
@@ -1,6 +1,6 @@<br>
// RUN: %clang_cc1 -fsyntax-only -verify %s<br>
// RUN: %clang_cc1 -fsyntax-only -verify -std=c++14 %s<br>
-// RUN: %clang_cc1 -fsyntax-only -verify -std=c++1z %s -Wc++98-c++11-c++14-compat<br>
+// RUN: %clang_cc1 -fsyntax-only -verify -std=c++17 %s -Wc++98-c++11-c++14-compat<br>
<br>
// Check that we don't allow illegal uses of inline<br>
// (checking C++-only constructs here)<br>
@@ -12,7 +12,7 @@ void localVar() {<br>
<br>
// Check that we warn appropriately.<br>
#if __cplusplus <= 201402L<br>
-inline int a; // expected-warning{{inline variables are a C++1z extension}}<br>
+inline int a; // expected-warning{{inline variables are a C++17 extension}}<br>
#else<br>
-inline int a; // expected-warning{{inline variables are incompatible with C++ standards before C++1z}}<br>
+inline int a; // expected-warning{{inline variables are incompatible with C++ standards before C++17}}<br>
#endif<br>
<br>
Modified: cfe/trunk/test/SemaCXX/static-<wbr>assert.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/static-assert.cpp?rev=310804&r1=310803&r2=310804&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/<wbr>SemaCXX/static-assert.cpp?rev=<wbr>310804&r1=310803&r2=310804&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/SemaCXX/static-<wbr>assert.cpp (original)<br>
+++ cfe/trunk/test/SemaCXX/static-<wbr>assert.cpp Sun Aug 13 15:26:53 2017<br>
@@ -49,5 +49,5 @@ struct X { ~X(); };<br>
StaticAssertProtected<int> sap1;<br>
StaticAssertProtected<X> sap2; // expected-note {{instantiation}}<br>
<br>
-static_assert(true); // expected-warning {{C++1z extension}}<br>
+static_assert(true); // expected-warning {{C++17 extension}}<br>
static_assert(false); // expected-error-re {{failed{{$}}}} expected-warning {{extension}}<br>
<br>
Modified: cfe/trunk/test/SemaCXX/warn-c+<wbr>+1z-extensions.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/warn-c%2B%2B1z-extensions.cpp?rev=310804&r1=310803&r2=310804&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/<wbr>SemaCXX/warn-c%2B%2B1z-<wbr>extensions.cpp?rev=310804&r1=<wbr>310803&r2=310804&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/SemaCXX/warn-c+<wbr>+1z-extensions.cpp (original)<br>
+++ cfe/trunk/test/SemaCXX/warn-c+<wbr>+1z-extensions.cpp Sun Aug 13 15:26:53 2017<br>
@@ -1,8 +1,8 @@<br>
// RUN: %clang_cc1 -fsyntax-only -std=c++14 -verify %s<br>
<br>
void f() {<br>
- if (bool b = true; b) {} // expected-warning {{'if' initialization statements are a C++1z extension}}<br>
- switch (int n = 5; n) { // expected-warning {{'switch' initialization statements are a C++1z extension}}<br>
+ if (bool b = true; b) {} // expected-warning {{'if' initialization statements are a C++17 extension}}<br>
+ switch (int n = 5; n) { // expected-warning {{'switch' initialization statements are a C++17 extension}}<br>
case 5: break;<br>
}<br>
}<br>
<br>
Modified: cfe/trunk/test/SemaTemplate/<wbr>temp_arg_nontype_cxx11.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaTemplate/temp_arg_nontype_cxx11.cpp?rev=310804&r1=310803&r2=310804&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/<wbr>SemaTemplate/temp_arg_nontype_<wbr>cxx11.cpp?rev=310804&r1=<wbr>310803&r2=310804&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/SemaTemplate/<wbr>temp_arg_nontype_cxx11.cpp (original)<br>
+++ cfe/trunk/test/SemaTemplate/<wbr>temp_arg_nontype_cxx11.cpp Sun Aug 13 15:26:53 2017<br>
@@ -25,7 +25,7 @@ namespace CanonicalNullptr {<br>
}<br>
<br>
namespace Auto {<br>
- template<auto> struct A { }; // expected-error {{until C++1z}}<br>
+ template<auto> struct A { }; // expected-error {{until C++17}}<br>
}<br>
<br>
namespace check_conversion_early {<br>
<br>
<br>
______________________________<wbr>_________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>