[libc++] Add missed <cstdalign> and <stdalign.h> headers

Author: frederick-vs-ja

libcxx/include/CMakeLists.txt

@@ -909,6 +909,7 @@ set(files
   coroutine
   csetjmp
   csignal
+  cstdalign
   cstdarg
   cstdbool
   cstddef
@@ -992,6 +993,7 @@ set(files
   span
   sstream
   stack
+  stdalign.h
   stdatomic.h
   stdbool.h
   stddef.h

libcxx/include/cstdalign

@@ -0,0 +1,35 @@
+// -*- C++ -*-
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef _LIBCPP_CSTDALIGN
+#define _LIBCPP_CSTDALIGN
+
+/*
+    cstdalign synopsis
+
+Macros:
+
+    __alignas_is_defined
+    __alignof_is_defined
+
+*/
+
+#include <__config>
+
+#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+#  pragma GCC system_header
+#endif
+
+#undef __alignas_is_defined
+#define __alignas_is_defined 1
+
+#undef __alignof_is_defined
+#define __alignof_is_defined 1
+
+#endif // _LIBCPP_CSTDALIGN

libcxx/include/module.modulemap

@@ -1103,6 +1103,11 @@ module std [system] {
     export *
   }
 
+  module cstdalign {
+    header "cstdalign"
+    export *
+  }
+
   module cstdarg {
     header "cstdarg"
     export *
@@ -2187,6 +2192,10 @@ module std_math_h [system] {
   header "math.h"
   export *
 }
+module std_stdalign_h [system] {
+  // <stdalign.h>'s __alignas_is_defined and __alignof_is_defined macros require textual inclusion.
+  textual header "stdalign.h"
+}
 module std_stdatomic_h [system] {
   header "stdatomic.h"
   export *

libcxx/include/stdalign.h

@@ -0,0 +1,42 @@
+// -*- C++ -*-
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef _LIBCPP_STDALIGN_H
+#define _LIBCPP_STDALIGN_H
+
+/*
+    stdalign.h synopsis
+
+Macros:
+
+    __alignas_is_defined
+    __alignof_is_defined
+
+*/
+
+#include <__config>
+
+#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+#  pragma GCC system_header
+#endif
+
+#if __has_include_next(<stdalign.h>)
+#  include_next <stdalign.h>
+#endif
+
+#ifdef __cplusplus
+#  undef alignas
+#  undef alignof
+#  undef __alignas_is_defined
+#  undef __alignof_is_defined
+#  define __alignas_is_defined 1
+#  define __alignof_is_defined 1
+#endif
+
+#endif // _LIBCPP_STDALIGN_H

libcxx/test/libcxx/include_as_c.sh.cpp

@@ -34,6 +34,7 @@
 #endif
 #include <math.h>
 #include <setjmp.h>
+#include <stdalign.h>
 #include <stdatomic.h>
 #include <stdbool.h>
 #include <stddef.h>

libcxx/test/std/depr/depr.c.headers/stdalign_h.compile.pass.cpp

@@ -0,0 +1,27 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+// test <stdalign.h>
+
+#include <stdalign.h>
+
+#ifndef __alignas_is_defined
+#  error __alignas_is_defined not defined
+#endif
+
+#ifndef __alignof_is_defined
+#  error __alignof_is_defined not defined
+#endif
+
+#ifdef alignas
+#  error alignas should not be defined
+#endif
+
+#ifdef alignof
+#  error alignof should not be defined
+#endif

libcxx/test/std/language.support/support.runtime/cstdalign.pass.cpp

@@ -0,0 +1,29 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+// test <cstdalign>
+
+#include <cstdalign>
+
+#ifndef __alignas_is_defined
+#  error __alignas_is_defined not defined
+#endif
+
+#ifndef __alignof_is_defined
+#  error __alignof_is_defined not defined
+#endif
+
+#ifdef alignas
+#  error alignas should not be defined
+#endif
+
+#ifdef alignof
+#  error alignof should not be defined
+#endif
+
+int main(int, char**) { return 0; }

libcxx/utils/libcxx/header_information.py

@@ -202,7 +202,7 @@ def is_modulemap_header(header):
     for header in toplevel_headers
     if not header.endswith(".h") and is_public_header(header)
     # These headers have been removed in C++20 so are never part of a module.
-    and not header in ["ccomplex", "ciso646", "cstdbool", "ctgmath"]
+    and not header in ["ccomplex", "ciso646", "cstdalign", "cstdbool", "ctgmath"]
 ]
 
 # The C headers used in the std and std.compat modules.

llvm/utils/gn/secondary/libcxx/include/BUILD.gn

@@ -981,6 +981,7 @@ if (current_toolchain == default_toolchain) {
       "coroutine",
       "csetjmp",
       "csignal",
+      "cstdalign",
       "cstdarg",
       "cstdbool",
       "cstddef",
@@ -1064,6 +1065,7 @@ if (current_toolchain == default_toolchain) {
       "span",
       "sstream",
       "stack",
+      "stdalign.h",
       "stdatomic.h",
       "stdbool.h",
       "stddef.h",