Mark aligned allocation as done.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@283724 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Frontend/InitPreprocessor.cpp b/lib/Frontend/InitPreprocessor.cpp
index 1c3374f1f45b9143312b8ac0025785e8b2c7ed6e..5da547e2b54db9865b084d7a5a4d8c7c3cad4bc5 100644 (file)
--- a/lib/Frontend/InitPreprocessor.cpp
+++ b/lib/Frontend/InitPreprocessor.cpp
@@ -510,7 +510,6 @@ static void InitializeCPlusPlusFeatureTestMacros(const LangOptions &LangOpts,
   if (LangOpts.CPlusPlus1z) {
     Builder.defineMacro("__cpp_hex_float", "201603");
     Builder.defineMacro("__cpp_inline_variables", "201606");
-    //Builder.defineMacro("__cpp_aligned_new", "201606");
     //Builder.defineMacro("__cpp_noexcept_function_type", "201510");
     Builder.defineMacro("__cpp_capture_star_this", "201603");
     Builder.defineMacro("__cpp_if_constexpr", "201606");
@@ -522,6 +521,8 @@ static void InitializeCPlusPlusFeatureTestMacros(const LangOptions &LangOpts,
     Builder.defineMacro("__cpp_nontype_template_args", "201411");
     Builder.defineMacro("__cpp_fold_expressions", "201603");
   }
+  if (LangOpts.AlignedAllocation)
+    Builder.defineMacro("__cpp_aligned_new", "201606");
 
   // TS features.
   if (LangOpts.ConceptsTS)

diff --git a/test/Lexer/cxx-features.cpp b/test/Lexer/cxx-features.cpp
index 2f751acc81673387f69b324058b9026bb5fe6102..c25ade3ffe7bd3c1ff019d26399e75518619579f 100644 (file)
--- a/test/Lexer/cxx-features.cpp
+++ b/test/Lexer/cxx-features.cpp
@@ -30,8 +30,7 @@
 #error "wrong value for __cpp_inline_variables"
 #endif
 
-#if check(aligned_new, 0, 0, 0, 0) // FIXME: provisional name
-// FIXME: value shuld be 201606 for cxx1z once implemented
+#if check(aligned_new, 0, 0, 0, 201606) // FIXME: provisional name
 #error "wrong value for __cpp_aligned_new"
 #endif
 

diff --git a/www/cxx_status.html b/www/cxx_status.html
index 170fc6090ef47efdc06a8e3a5746c7a407a9691e..4f19c69714614f91db72404dfa18bb93d517f4f3 100644 (file)
--- a/www/cxx_status.html
+++ b/www/cxx_status.html
@@ -679,7 +679,7 @@ as the draft C++1z standard evolves.
     <tr>
       <td>Dynamic memory allocation for over-aligned data</td>
       <td><a href="http://wg21.link/p0035r4">P0035R4</a></td>
-      <td class="none" align="center">No</td>
+      <td class="svn" align="center">SVN</td>
     </tr>
     <tr>
       <td>Template argument deduction for class templates</td>