Re: r310804 - Replace remaining user-visible mentions of C++1z with C++17.

2017-08-14 Thread Hans Wennborg via cfe-commits
r310862. Thanks!

On Sun, Aug 13, 2017 at 3:41 PM, Richard Smith  wrote:
> Since we took the -std=c++17 change for Clang 5, we should take this one
> too.
>
> On 13 August 2017 at 15:26, Richard Smith via cfe-commits
>  wrote:
>>
>> Author: rsmith
>> Date: Sun Aug 13 15:26:53 2017
>> New Revision: 310804
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=310804=rev
>> Log:
>> Replace remaining user-visible mentions of C++1z with C++17.
>>
>> Modified:
>> cfe/trunk/include/clang/Basic/DiagnosticGroups.td
>> cfe/trunk/include/clang/Basic/DiagnosticLexKinds.td
>> cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td
>> cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
>> cfe/trunk/test/CXX/dcl.dcl/dcl.attr/dcl.attr.nodiscard/p2.cpp
>> cfe/trunk/test/CXX/dcl.dcl/dcl.attr/dcl.attr.unused/p3.cpp
>> cfe/trunk/test/CXX/drs/dr0xx.cpp
>> cfe/trunk/test/CXX/drs/dr13xx.cpp
>> cfe/trunk/test/CXX/drs/dr1xx.cpp
>> cfe/trunk/test/CXX/drs/dr2xx.cpp
>> cfe/trunk/test/CXX/drs/dr4xx.cpp
>> cfe/trunk/test/CXX/drs/dr5xx.cpp
>> cfe/trunk/test/CXX/stmt.stmt/stmt.iter/stmt.ranged/p1.cpp
>> cfe/trunk/test/FixIt/fixit.cpp
>> cfe/trunk/test/Lexer/hexfloat.cpp
>> cfe/trunk/test/Parser/cxx0x-attributes.cpp
>> cfe/trunk/test/Parser/cxx1z-constexpr-lambdas.cpp
>> cfe/trunk/test/Parser/cxx1z-nested-namespace-definition.cpp
>> cfe/trunk/test/SemaCXX/cxx0x-compat.cpp
>> cfe/trunk/test/SemaCXX/deprecated.cpp
>> cfe/trunk/test/SemaCXX/inline.cpp
>> cfe/trunk/test/SemaCXX/static-assert.cpp
>> cfe/trunk/test/SemaCXX/warn-c++1z-extensions.cpp
>> cfe/trunk/test/SemaTemplate/temp_arg_nontype_cxx11.cpp
>>
>> Modified: cfe/trunk/include/clang/Basic/DiagnosticGroups.td
>> URL:
>> http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticGroups.td?rev=310804=310803=310804=diff
>>
>> ==
>> --- cfe/trunk/include/clang/Basic/DiagnosticGroups.td (original)
>> +++ cfe/trunk/include/clang/Basic/DiagnosticGroups.td Sun Aug 13 15:26:53
>> 2017
>> @@ -156,9 +156,10 @@ def FormatZeroLength : DiagGroup<"format
>>
>>  def InvalidIOSDeploymentTarget :
>> DiagGroup<"invalid-ios-deployment-target">;
>>
>> -def CXX1zCompatMangling : DiagGroup<"c++1z-compat-mangling">;
>> +def CXX17CompatMangling : DiagGroup<"c++17-compat-mangling">;
>> +def : DiagGroup<"c++1z-compat-mangling", [CXX17CompatMangling]>;
>>  // Name of this warning in GCC.
>> -def NoexceptType : DiagGroup<"noexcept-type", [CXX1zCompatMangling]>;
>> +def NoexceptType : DiagGroup<"noexcept-type", [CXX17CompatMangling]>;
>>
>>  // Warnings for C++1y code which is not compatible with prior C++
>> standards.
>>  def CXXPre14Compat : DiagGroup<"c++98-c++11-compat">;
>> @@ -220,9 +221,10 @@ def CXX14Compat : DiagGroup<"c++14-compa
>>  def CXX14CompatPedantic : DiagGroup<"c++14-compat-pedantic",
>>  [CXXPre1zCompatPedantic]>;
>>
>> -def CXX1zCompat : DiagGroup<"c++1z-compat", [DeprecatedRegister,
>> +def CXX17Compat : DiagGroup<"c++17-compat", [DeprecatedRegister,
>>   DeprecatedIncrementBool,
>> - CXX1zCompatMangling]>;
>> + CXX17CompatMangling]>;
>> +def : DiagGroup<"c++1z-compat", [CXX17Compat]>;
>>
>>  def CXX2aCompat : DiagGroup<"c++2a-compat">;
>>
>> @@ -780,10 +782,11 @@ def CXX14 : DiagGroup<"c++14-extensions"
>>
>>  // A warning group for warnings about using C++1z features as extensions
>> in
>>  // earlier C++ versions.
>> -def CXX1z : DiagGroup<"c++1z-extensions">;
>> +def CXX17 : DiagGroup<"c++17-extensions">;
>>
>>  def : DiagGroup<"c++0x-extensions", [CXX11]>;
>>  def : DiagGroup<"c++1y-extensions", [CXX14]>;
>> +def : DiagGroup<"c++1z-extensions", [CXX17]>;
>>
>>  def DelegatingCtorCycles :
>>DiagGroup<"delegating-ctor-cycles">;
>>
>> Modified: cfe/trunk/include/clang/Basic/DiagnosticLexKinds.td
>> URL:
>> http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticLexKinds.td?rev=310804=310803=310804=diff
>>
>> ==
>> --- cfe/trunk/include/clang/Basic/DiagnosticLexKinds.td (original)
>> +++ cfe/trunk/include/clang/Basic/DiagnosticLexKinds.td Sun Aug 13
>> 15:26:53 2017
>> @@ -181,10 +181,10 @@ def err_hex_constant_requires : Error<
>>  def ext_hex_constant_invalid : Extension<
>>"hexadecimal floating constants are a C99 feature">, InGroup;
>>  def ext_hex_literal_invalid : Extension<
>> -  "hexadecimal floating literals are a C++1z feature">, InGroup;
>> +  "hexadecimal floating literals are a C++17 feature">, InGroup;
>>  def warn_cxx1z_hex_literal : Warning<
>>"hexadecimal floating literals are incompatible with "
>> -  "C++ standards before C++1z">,
>> +  "C++ standards before C++17">,

Re: r310804 - Replace remaining user-visible mentions of C++1z with C++17.

2017-08-13 Thread Richard Smith via cfe-commits
Since we took the -std=c++17 change for Clang 5, we should take this one
too.

On 13 August 2017 at 15:26, Richard Smith via cfe-commits <
cfe-commits@lists.llvm.org> wrote:

> Author: rsmith
> Date: Sun Aug 13 15:26:53 2017
> New Revision: 310804
>
> URL: http://llvm.org/viewvc/llvm-project?rev=310804=rev
> Log:
> Replace remaining user-visible mentions of C++1z with C++17.
>
> Modified:
> cfe/trunk/include/clang/Basic/DiagnosticGroups.td
> cfe/trunk/include/clang/Basic/DiagnosticLexKinds.td
> cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td
> cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
> cfe/trunk/test/CXX/dcl.dcl/dcl.attr/dcl.attr.nodiscard/p2.cpp
> cfe/trunk/test/CXX/dcl.dcl/dcl.attr/dcl.attr.unused/p3.cpp
> cfe/trunk/test/CXX/drs/dr0xx.cpp
> cfe/trunk/test/CXX/drs/dr13xx.cpp
> cfe/trunk/test/CXX/drs/dr1xx.cpp
> cfe/trunk/test/CXX/drs/dr2xx.cpp
> cfe/trunk/test/CXX/drs/dr4xx.cpp
> cfe/trunk/test/CXX/drs/dr5xx.cpp
> cfe/trunk/test/CXX/stmt.stmt/stmt.iter/stmt.ranged/p1.cpp
> cfe/trunk/test/FixIt/fixit.cpp
> cfe/trunk/test/Lexer/hexfloat.cpp
> cfe/trunk/test/Parser/cxx0x-attributes.cpp
> cfe/trunk/test/Parser/cxx1z-constexpr-lambdas.cpp
> cfe/trunk/test/Parser/cxx1z-nested-namespace-definition.cpp
> cfe/trunk/test/SemaCXX/cxx0x-compat.cpp
> cfe/trunk/test/SemaCXX/deprecated.cpp
> cfe/trunk/test/SemaCXX/inline.cpp
> cfe/trunk/test/SemaCXX/static-assert.cpp
> cfe/trunk/test/SemaCXX/warn-c++1z-extensions.cpp
> cfe/trunk/test/SemaTemplate/temp_arg_nontype_cxx11.cpp
>
> Modified: cfe/trunk/include/clang/Basic/DiagnosticGroups.td
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/
> clang/Basic/DiagnosticGroups.td?rev=310804=310803=310804=diff
> 
> ==
> --- cfe/trunk/include/clang/Basic/DiagnosticGroups.td (original)
> +++ cfe/trunk/include/clang/Basic/DiagnosticGroups.td Sun Aug 13 15:26:53
> 2017
> @@ -156,9 +156,10 @@ def FormatZeroLength : DiagGroup<"format
>
>  def InvalidIOSDeploymentTarget : DiagGroup<"invalid-ios-
> deployment-target">;
>
> -def CXX1zCompatMangling : DiagGroup<"c++1z-compat-mangling">;
> +def CXX17CompatMangling : DiagGroup<"c++17-compat-mangling">;
> +def : DiagGroup<"c++1z-compat-mangling", [CXX17CompatMangling]>;
>  // Name of this warning in GCC.
> -def NoexceptType : DiagGroup<"noexcept-type", [CXX1zCompatMangling]>;
> +def NoexceptType : DiagGroup<"noexcept-type", [CXX17CompatMangling]>;
>
>  // Warnings for C++1y code which is not compatible with prior C++
> standards.
>  def CXXPre14Compat : DiagGroup<"c++98-c++11-compat">;
> @@ -220,9 +221,10 @@ def CXX14Compat : DiagGroup<"c++14-compa
>  def CXX14CompatPedantic : DiagGroup<"c++14-compat-pedantic",
>  [CXXPre1zCompatPedantic]>;
>
> -def CXX1zCompat : DiagGroup<"c++1z-compat", [DeprecatedRegister,
> +def CXX17Compat : DiagGroup<"c++17-compat", [DeprecatedRegister,
>   DeprecatedIncrementBool,
> - CXX1zCompatMangling]>;
> + CXX17CompatMangling]>;
> +def : DiagGroup<"c++1z-compat", [CXX17Compat]>;
>
>  def CXX2aCompat : DiagGroup<"c++2a-compat">;
>
> @@ -780,10 +782,11 @@ def CXX14 : DiagGroup<"c++14-extensions"
>
>  // A warning group for warnings about using C++1z features as extensions
> in
>  // earlier C++ versions.
> -def CXX1z : DiagGroup<"c++1z-extensions">;
> +def CXX17 : DiagGroup<"c++17-extensions">;
>
>  def : DiagGroup<"c++0x-extensions", [CXX11]>;
>  def : DiagGroup<"c++1y-extensions", [CXX14]>;
> +def : DiagGroup<"c++1z-extensions", [CXX17]>;
>
>  def DelegatingCtorCycles :
>DiagGroup<"delegating-ctor-cycles">;
>
> Modified: cfe/trunk/include/clang/Basic/DiagnosticLexKinds.td
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/
> DiagnosticLexKinds.td?rev=310804=310803=310804=diff
> 
> ==
> --- cfe/trunk/include/clang/Basic/DiagnosticLexKinds.td (original)
> +++ cfe/trunk/include/clang/Basic/DiagnosticLexKinds.td Sun Aug 13
> 15:26:53 2017
> @@ -181,10 +181,10 @@ def err_hex_constant_requires : Error<
>  def ext_hex_constant_invalid : Extension<
>"hexadecimal floating constants are a C99 feature">, InGroup;
>  def ext_hex_literal_invalid : Extension<
> -  "hexadecimal floating literals are a C++1z feature">, InGroup;
> +  "hexadecimal floating literals are a C++17 feature">, InGroup;
>  def warn_cxx1z_hex_literal : Warning<
>"hexadecimal floating literals are incompatible with "
> -  "C++ standards before C++1z">,
> +  "C++ standards before C++17">,
>InGroup, DefaultIgnore;
>  def ext_binary_literal : Extension<
>"binary integer literals are a GNU extension">,
> InGroup;
> @@ -208,7 +208,7 @@ def warn_cxx98_compat_unicode_literal :
>

r310804 - Replace remaining user-visible mentions of C++1z with C++17.

2017-08-13 Thread Richard Smith via cfe-commits
Author: rsmith
Date: Sun Aug 13 15:26:53 2017
New Revision: 310804

URL: http://llvm.org/viewvc/llvm-project?rev=310804=rev
Log:
Replace remaining user-visible mentions of C++1z with C++17.

Modified:
cfe/trunk/include/clang/Basic/DiagnosticGroups.td
cfe/trunk/include/clang/Basic/DiagnosticLexKinds.td
cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td
cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
cfe/trunk/test/CXX/dcl.dcl/dcl.attr/dcl.attr.nodiscard/p2.cpp
cfe/trunk/test/CXX/dcl.dcl/dcl.attr/dcl.attr.unused/p3.cpp
cfe/trunk/test/CXX/drs/dr0xx.cpp
cfe/trunk/test/CXX/drs/dr13xx.cpp
cfe/trunk/test/CXX/drs/dr1xx.cpp
cfe/trunk/test/CXX/drs/dr2xx.cpp
cfe/trunk/test/CXX/drs/dr4xx.cpp
cfe/trunk/test/CXX/drs/dr5xx.cpp
cfe/trunk/test/CXX/stmt.stmt/stmt.iter/stmt.ranged/p1.cpp
cfe/trunk/test/FixIt/fixit.cpp
cfe/trunk/test/Lexer/hexfloat.cpp
cfe/trunk/test/Parser/cxx0x-attributes.cpp
cfe/trunk/test/Parser/cxx1z-constexpr-lambdas.cpp
cfe/trunk/test/Parser/cxx1z-nested-namespace-definition.cpp
cfe/trunk/test/SemaCXX/cxx0x-compat.cpp
cfe/trunk/test/SemaCXX/deprecated.cpp
cfe/trunk/test/SemaCXX/inline.cpp
cfe/trunk/test/SemaCXX/static-assert.cpp
cfe/trunk/test/SemaCXX/warn-c++1z-extensions.cpp
cfe/trunk/test/SemaTemplate/temp_arg_nontype_cxx11.cpp

Modified: cfe/trunk/include/clang/Basic/DiagnosticGroups.td
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticGroups.td?rev=310804=310803=310804=diff
==
--- cfe/trunk/include/clang/Basic/DiagnosticGroups.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticGroups.td Sun Aug 13 15:26:53 2017
@@ -156,9 +156,10 @@ def FormatZeroLength : DiagGroup<"format
 
 def InvalidIOSDeploymentTarget : DiagGroup<"invalid-ios-deployment-target">;
 
-def CXX1zCompatMangling : DiagGroup<"c++1z-compat-mangling">;
+def CXX17CompatMangling : DiagGroup<"c++17-compat-mangling">;
+def : DiagGroup<"c++1z-compat-mangling", [CXX17CompatMangling]>;
 // Name of this warning in GCC.
-def NoexceptType : DiagGroup<"noexcept-type", [CXX1zCompatMangling]>;
+def NoexceptType : DiagGroup<"noexcept-type", [CXX17CompatMangling]>;
 
 // Warnings for C++1y code which is not compatible with prior C++ standards.
 def CXXPre14Compat : DiagGroup<"c++98-c++11-compat">;
@@ -220,9 +221,10 @@ def CXX14Compat : DiagGroup<"c++14-compa
 def CXX14CompatPedantic : DiagGroup<"c++14-compat-pedantic",
 [CXXPre1zCompatPedantic]>;
 
-def CXX1zCompat : DiagGroup<"c++1z-compat", [DeprecatedRegister,
+def CXX17Compat : DiagGroup<"c++17-compat", [DeprecatedRegister,
  DeprecatedIncrementBool,
- CXX1zCompatMangling]>;
+ CXX17CompatMangling]>;
+def : DiagGroup<"c++1z-compat", [CXX17Compat]>;
 
 def CXX2aCompat : DiagGroup<"c++2a-compat">;
 
@@ -780,10 +782,11 @@ def CXX14 : DiagGroup<"c++14-extensions"
 
 // A warning group for warnings about using C++1z features as extensions in
 // earlier C++ versions.
-def CXX1z : DiagGroup<"c++1z-extensions">;
+def CXX17 : DiagGroup<"c++17-extensions">;
 
 def : DiagGroup<"c++0x-extensions", [CXX11]>;
 def : DiagGroup<"c++1y-extensions", [CXX14]>;
+def : DiagGroup<"c++1z-extensions", [CXX17]>;
 
 def DelegatingCtorCycles :
   DiagGroup<"delegating-ctor-cycles">;

Modified: cfe/trunk/include/clang/Basic/DiagnosticLexKinds.td
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticLexKinds.td?rev=310804=310803=310804=diff
==
--- cfe/trunk/include/clang/Basic/DiagnosticLexKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticLexKinds.td Sun Aug 13 15:26:53 2017
@@ -181,10 +181,10 @@ def err_hex_constant_requires : Error<
 def ext_hex_constant_invalid : Extension<
   "hexadecimal floating constants are a C99 feature">, InGroup;
 def ext_hex_literal_invalid : Extension<
-  "hexadecimal floating literals are a C++1z feature">, InGroup;
+  "hexadecimal floating literals are a C++17 feature">, InGroup;
 def warn_cxx1z_hex_literal : Warning<
   "hexadecimal floating literals are incompatible with "
-  "C++ standards before C++1z">,
+  "C++ standards before C++17">,
   InGroup, DefaultIgnore;
 def ext_binary_literal : Extension<
   "binary integer literals are a GNU extension">, InGroup;
@@ -208,7 +208,7 @@ def warn_cxx98_compat_unicode_literal :
   "unicode literals are incompatible with C++98">,
   InGroup, DefaultIgnore;
 def warn_cxx14_compat_u8_character_literal : Warning<
-  "unicode literals are incompatible with C++ standards before C++1z">,
+  "unicode literals are incompatible with C++ standards before C++17">,
   InGroup, DefaultIgnore;
 def warn_cxx11_compat_user_defined_literal : Warning<
   "identifier after