Merged in r310848.
On Wed, Aug 9, 2017 at 1:12 PM, Hans Wennborg via cfe-commits <cfe-commits@lists.llvm.org> wrote: > Author: hans > Date: Wed Aug 9 13:12:53 2017 > New Revision: 310516 > > URL: http://llvm.org/viewvc/llvm-project?rev=310516&view=rev > Log: > Make -std=c++17 an alias of -std=c++1z > > As suggested on PR33912. > > Trying to keep this small to make it easy to merge to the 5.0 branch. We > can do a follow-up with more thorough renaming (diagnostic text, > options, ids, etc.) later. > > (For C++14 this was done in r215982, and I think a smaller patch for the > 3.5 branch: > http://lists.llvm.org/pipermail/cfe-commits/Week-of-Mon-20140818/113013.html) > > Differential Revision: https://reviews.llvm.org/D36532 > > Modified: > cfe/trunk/include/clang/Frontend/LangStandards.def > cfe/trunk/test/Driver/unknown-std.cpp > cfe/trunk/test/SemaCXX/cxx1z-init-statement.cpp > > Modified: cfe/trunk/include/clang/Frontend/LangStandards.def > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Frontend/LangStandards.def?rev=310516&r1=310515&r2=310516&view=diff > ============================================================================== > --- cfe/trunk/include/clang/Frontend/LangStandards.def (original) > +++ cfe/trunk/include/clang/Frontend/LangStandards.def Wed Aug 9 13:12:53 > 2017 > @@ -109,15 +109,17 @@ LANGSTANDARD(gnucxx14, "gnu++14", > GNUMode) > LANGSTANDARD_ALIAS_DEPR(gnucxx14, "gnu++1y") > > -LANGSTANDARD(cxx1z, "c++1z", > - CXX, "Working draft for ISO C++ 2017", > +LANGSTANDARD(cxx17, "c++17", > + CXX, "ISO C++ 2017 with amendments", > LineComment | CPlusPlus | CPlusPlus11 | CPlusPlus14 | > CPlusPlus1z | > Digraphs | HexFloat) > +LANGSTANDARD_ALIAS_DEPR(cxx17, "c++1z") > > -LANGSTANDARD(gnucxx1z, "gnu++1z", > - CXX, "Working draft for ISO C++ 2017 with GNU extensions", > +LANGSTANDARD(gnucxx17, "gnu++17", > + CXX, "ISO C++ 2017 with amendments and GNU extensions", > LineComment | CPlusPlus | CPlusPlus11 | CPlusPlus14 | > CPlusPlus1z | > Digraphs | HexFloat | GNUMode) > +LANGSTANDARD_ALIAS_DEPR(gnucxx17, "gnu++1z") > > LANGSTANDARD(cxx2a, "c++2a", > CXX, "Working draft for ISO C++ 2020", > > Modified: cfe/trunk/test/Driver/unknown-std.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/unknown-std.cpp?rev=310516&r1=310515&r2=310516&view=diff > ============================================================================== > --- cfe/trunk/test/Driver/unknown-std.cpp (original) > +++ cfe/trunk/test/Driver/unknown-std.cpp Wed Aug 9 13:12:53 2017 > @@ -13,8 +13,8 @@ > // CHECK-NEXT: note: use 'gnu++11' for 'ISO C++ 2011 with amendments and GNU > extensions' standard > // CHECK-NEXT: note: use 'c++14' for 'ISO C++ 2014 with amendments' standard > // CHECK-NEXT: note: use 'gnu++14' for 'ISO C++ 2014 with amendments and GNU > extensions' standard > -// CHECK-NEXT: note: use 'c++1z' for 'Working draft for ISO C++ 2017' > standard > -// CHECK-NEXT: note: use 'gnu++1z' for 'Working draft for ISO C++ 2017 with > GNU extensions' standard > +// CHECK-NEXT: note: use 'c++17' for 'ISO C++ 2017 with amendments' standard > +// CHECK-NEXT: note: use 'gnu++17' for 'ISO C++ 2017 with amendments and GNU > extensions' standard > // CHECK-NEXT: note: use 'c++2a' for 'Working draft for ISO C++ 2020' > standard > // CHECK-NEXT: note: use 'gnu++2a' for 'Working draft for ISO C++ 2020 with > GNU extensions' standard > // CUDA-NEXT: note: use 'cuda' for 'NVIDIA CUDA(tm)' standard > > Modified: cfe/trunk/test/SemaCXX/cxx1z-init-statement.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/cxx1z-init-statement.cpp?rev=310516&r1=310515&r2=310516&view=diff > ============================================================================== > --- cfe/trunk/test/SemaCXX/cxx1z-init-statement.cpp (original) > +++ cfe/trunk/test/SemaCXX/cxx1z-init-statement.cpp Wed Aug 9 13:12:53 2017 > @@ -1,4 +1,5 @@ > // RUN: %clang_cc1 -std=c++1z -verify %s > +// RUN: %clang_cc1 -std=c++17 -verify %s > > void testIf() { > int x = 0; > > > _______________________________________________ > cfe-commits mailing list > cfe-commits@lists.llvm.org > http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
