[libc][NFC] Make all top of file comments consistent.

[PaulkaToast]

Summary

Made all header files consistent based of this documentation: https://llvm.org/docs/CodingStandards.html#file-headers.
And did the same for all source files top of file comments.

[PaulkaToast]

Added header guards where they were missing.

[abrachet]

libc/include/__llvm-libc-common.h

1

Looks like there is a - --- which we should make ---. Also should these have -*- C++ -*-?

libc/include/__posix-types.h

1

Same for the C++ tag here.

libc/include/ctype.h

1

Here as well, or at least we should remove the *

libc/utils/CPP/StringRef.h

9–11

We shouldn't remove the include

22–23

Newline

[abrachet]

Also, although we only want header files to have the C++ tag, shouldn't we also left justify the text in our .cpp files too?

[sivachandra]

libc/include/__llvm-libc-common.h

1

We shouldn't have C++ here as these are public C headers. The rest of the comment is valid.

libc/include/__posix-types.h

1

Same with C++ here.

libc/include/ctype.h

1

I noticed this as well :)
But really this header should be removed in a separate CL.

libc/utils/CPP/StringRef.h

9–11

Thanks for catching this.

[sivachandra]

In D77533#1964606, @abrachet wrote:

Also, although we only want header files to have the C++ tag, shouldn't we also left justify the text in our .cpp files too?

Yes, at least for consistency.

For future integrity, are there are any clang-format/clang-tidy rules which can warn us about such misses? For bad/missing headers guards, there are clang-tidy rules available for LLVM.

[PaulkaToast]

In D77533#1964684, @sivachandra wrote:

In D77533#1964606, @abrachet wrote:

Also, although we only want header files to have the C++ tag, shouldn't we also left justify the text in our .cpp files too?

Yes, at least for consistency.

For future integrity, are there are any clang-format/clang-tidy rules which can warn us about such misses? For bad/missing headers guards, there are clang-tidy rules available for LLVM.

I'll look into this, I'm sure a check exists or we can make one.

libc/utils/CPP/StringRef.h

9–11

oops! thank you for catching this!

[sivachandra]

I continue to accept this. But, I missed some obvious things previously so, wait for @abrachet to take a look as well.
One thing though, this change is now wider than the original description. So, update the description here (and also in your local git repo if you use git llvm push.)

[abrachet]

Just some nits inline.

One thing though, this change is now wider than the original description. So, update the description here (and also in your local git repo if you use git llvm push.)

It might also be useful to add [NFC] to the name while you're at it.

In D77533#1964874, @PaulkaToast wrote:

In D77533#1964684, @sivachandra wrote:

In D77533#1964606, @abrachet wrote:

Also, although we only want header files to have the C++ tag, shouldn't we also left justify the text in our .cpp files too?

Yes, at least for consistency.

For future integrity, are there are any clang-format/clang-tidy rules which can warn us about such misses? For bad/missing headers guards, there are clang-tidy rules available for LLVM.

I'll look into this, I'm sure a check exists or we can make one.

My guess although I'm not sure is it would be difficult to get this into clang-format because it's very LLVM specific. I also don't know if it would work in clang-tidy, I'm not sure if comments are expressed in the AST but @PaulkaToast would know more than me :) It would be very useful for one of these tools to do this for us for sure.

libc/config/linux/errno.h.in

1 ↗

(On Diff #255432)

This has 3 leading -

libc/include/__llvm-libc-common.h

1

You're right we shouldn't have them in the public headers. libcxx does this but they also have no extension at all not just .h, also most of headers are generated so its very little use to us.

libc/src/threads/linux/thread_start_args.h.def

1 ↗

(On Diff #255432)

Add an extra - at the end, the * is right next to the =

libc/utils/CPP/StringRef.h

1

Looks like two spaces between type and -

libc/utils/HdrGen/PublicAPICommand.cpp

1 ↗

(On Diff #255432)

There is a * here

libc/utils/benchmarks/LibcMemoryBenchmarkMain.cpp

1 ↗

(On Diff #255432)

Two trailing spaces here

libc/utils/benchmarks/LibcMemoryBenchmarkTest.cpp

1 ↗

(On Diff #255432)

No space between - and `

libc/utils/testutils/ExecuteFunction.h

1

Three leading -

[PaulkaToast]

Thanks Alex!

libc/include/__llvm-libc-common.h

-//===------- Common definitions for LLVM-libc public header files- --------===//
+//===-- Common definitions for LLVM-libc public header files- -------------===//
 //
 // 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 LLVM_LIBC___COMMON_H

libc/include/__posix-types.h

-//===----------------- Definitions of common POSIX types ------------------===//
+//===-- Definitions of common POSIX types ---------------------------------===//
 //
 // 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
 //
 //===----------------------------------------------------------------------===//
 
 // This header file does not have a header guard. It is internal to LLVM libc
 // and intended to be used to pick specific definitions without polluting the
 // public headers with unnecessary definitions.
 
 #if defined(__need_off_t) && !defined(__llvm_libc_off_t_defined)
 typedef __INT64_TYPE__ off_t;
 #define __llvm_libc_off_t_defined
 #endif // __need_off_t

libc/include/ctype.h

-//===---------------- C standard library header ctype.h -----------------*-===//
+//===-- C standard library header ctype.h -------------------------------*-===//
 //
 // 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 LLVM_LIBC_CTYPE_H

libc/src/assert/assert.h

-//===-------------------- Internal header for assert ----------*- C++ -*---===//
+//===-- Internal header for assert ------------------------------*- 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 LLVM_LIBC_SRC_ASSERT_ASSERT_H

libc/src/errno/llvmlibc_errno.h

-//===------------------ Implementation header for errno -------------------===//
+//===-- Implementation header for errno -------------------------*- 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 LLVM_LIBC_SRC_ERRNO_LLVMLIBC_ERRNO_H

libc/src/math/round.h

-//===------------------ Implementation header for round -------------------===//
+//===-- Implementation header for round -------------------------*- 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 LLVM_LIBC_SRC_MATH_ROUND_H

libc/src/signal/linux/signal.h

-//===----------------- Internal header for Linux signals ------------------===//
+//===-- Internal header for Linux signals -----------------------*- 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 LLVM_LIBC_SRC_SIGNAL_LINUX_SIGNAL_H

libc/src/signal/raise.h

-//===------------- Implementation header for raise function ------ *-C++-* ===//
+//===-- Implementation header for raise function ----------------*- 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 LLVM_LIBC_SRC_SIGNAL_RAISE_H

libc/src/signal/sigaction.h

-//===------------ Implementation header for sigaction --------*- C++ -*--===//
+//===-- Implementation header for sigaction ---------------------*- 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 LLVM_LIBC_SRC_SIGNAL_SIGACTION_H

libc/src/signal/sigaddset.h

-//===------------- Implementation header for sigaddset ---------*- C++ -*--===//
+//===-- Implementation header for sigaddset ---------------------*- 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 LLVM_LIBC_SRC_SIGNAL_SIGEADDSET_H

libc/src/signal/sigdelset.h

-//===------------- Implementation header for sigdelset ---------*- C++ -*--===//
+//===-- Implementation header for sigdelset ---------------------*- 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 LLVM_LIBC_SRC_SIGNAL_SIGDELSET_H

libc/src/signal/sigemptyset.h

-//===------------ Implementation header for sigemptyset --------*- C++ -*--===//
+//===-- Implementation header for sigemptyset -------------------*- 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 LLVM_LIBC_SRC_SIGNAL_SIGEMPTYSET_H

libc/src/signal/sigfillset.h

-//===------------- Implementation header for sigfillset --------*- C++ -*--===//
+//===-- Implementation header for sigfillset --------------------*- 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 LLVM_LIBC_SRC_SIGNAL_SIGFILLSET_H

libc/src/signal/signal.h

-//===------------- Implementation header for signal ------------*- C++ -*--===//
+//===-- Implementation header for signal ------------------------*- 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 LLVM_LIBC_SRC_SIGNAL_SIGNAL_H

libc/src/signal/sigprocmask.h

-//===------------ Implementation header for sigprocmask --------*- C++ -*--===//
+//===-- Implementation header for sigprocmask -------------------*- 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 LLVM_LIBC_SRC_SIGNAL_SIGPROCMASK_H

libc/src/stdlib/_Exit.h

-//===----------------- Implementation header for _Exit ---------*- C++ -*--===//
+//===-- Implementation header for _Exit -------------------------*- 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 LLVM_LIBC_SRC__EXIT_H

libc/src/stdlib/abort.h

-//===----------------- Implementation header for abort ---------*- C++ -*--===//
+//===-- Implementation header for abort -------------------------*- 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 LLVM_LIBC_SRC_ABORT_H

libc/src/string/memcpy.h

-//===----------------- Implementation header for memcpy -------------------===//
+//===-- Implementation header for memcpy ------------------------*- 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 LLVM_LIBC_SRC_STRING_MEMCPY_H

libc/src/string/memory_utils/memcpy_utils.h

-//===---------------------------- Memcpy utils ----------------------------===//
+//===-- Memcpy utils --------------------------------------------*- 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 LLVM_LIBC_SRC_MEMORY_UTILS_MEMCPY_UTILS_H

libc/src/string/memory_utils/utils.h

-//===---------------------------- Memory utils ----------------------------===//
+//===-- Memory utils --------------------------------------------*- 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 LLVM_LIBC_SRC_MEMORY_UTILS_H

libc/src/string/strcat.h

-//===----------------- Implementation header for strcat -------------------===//
+//===-- Implementation header for strcat ------------------------*- 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 LLVM_LIBC_SRC_STRING_STRCAT_H

libc/src/string/strcpy.h

-//===----------------- Implementation header for strcpy -------------------===//
+//===-- Implementation header for strcpy ------------------------*- 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 LLVM_LIBC_SRC_STRING_STRCPY_H

libc/src/string/strlen.h

-//===----------------- Implementation header for strlen -------------------===//
+//===-- Implementation header for strlen ------------------------*- 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 LLVM_LIBC_SRC_STRING_STRLEN_H

libc/src/sys/mman/mmap.h

-//===-------------- Implementation header for mmap function ------ *-C++-* ===//
+//===-- Implementation header for mmap function -----------------*- 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 LLVM_LIBC_SRC_SYS_MMAN_MMAP_H

libc/src/sys/mman/munmap.h

-//===-------------- Implementation header for mumap function ----- *-C++-* ===//
+//===-- Implementation header for mumap function ----------------*- 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 LLVM_LIBC_SRC_SYS_MMAN_MUNMAP_H

libc/src/threads/mtx_init.h

-//===---------- Implementation header for mtx_init function ------ *-C++-* ===//
+//===-- Implementation header for mtx_init function -------------*- 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 LLVM_LIBC_SRC_THREADS_LINUX_MTX_INIT_H

libc/src/threads/mtx_lock.h

-//===---------- Implementation header for mtx_lock function ------ *-C++-* ===//
+//===-- Implementation header for mtx_lock function -------------*- 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 LLVM_LIBC_SRC_THREADS_LINUX_MTX_LOCK_H

libc/src/threads/mtx_unlock.h

-//===-------- Implementation header for mtx_unlock function ------ *-C++-* ===//
+//===-- Implementation header for mtx_unlock function -----------*- 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 LLVM_LIBC_SRC_THREADS_LINUX_MTX_UNLOCK_H

libc/src/threads/thrd_create.h

-//===------- Implementation header for thrd_create function ------ *-C++-* ===//
+//===-- Implementation header for thrd_create function ----------*- 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 LLVM_LIBC_SRC_THREADS_LINUX_THRD_CREATE_H

libc/src/threads/thrd_join.h

-//===-------- Implementation header for thrd_join function ------- *-C++-* ===//
+//===-- Implementation header for thrd_join function ------------*- 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 LLVM_LIBC_SRC_THREADS_LINUX_THRD_JOIN_H

libc/utils/CPP/Array.h

-//===--------- A self contained equivalent of std::array --------*- C++ -*-===//
+//===-- A self contained equivalent of std::array ---------------*- 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 LLVM_LIBC_UTILS_CPP_ARRAY_H
+#define LLVM_LIBC_UTILS_CPP_ARRAY_H
+
 #include <stddef.h> // For size_t.
 
 namespace __llvm_libc {
 namespace cpp {
 
 template <class T, size_t N> struct Array {
   static_assert(N != 0, "Cannot create a __llvm_libc::cpp::Array of size 0.");
 
template <class T, size_t N> struct Array {
   constexpr const_iterator begin() const { return Data; }
 
   constexpr iterator end() { return Data + N; }
   const_iterator end() const { return Data + N; }
 };
 
 } // namespace cpp
 } // namespace __llvm_libc
+
+#endif // LLVM_LIBC_UTILS_CPP_ARRAY_H

libc/utils/CPP/ArrayRef.h

-//===----------------- Self contained ArrayRef type -------------*- C++ -*-===//
+//===-- Self contained ArrayRef type ----------------------------*- 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 LLVM_LIBC_UTILS_CPP_ARRAYREF_H
+#define LLVM_LIBC_UTILS_CPP_ARRAYREF_H
+
 #include "Array.h"
 
 #include <stddef.h> // For size_t.
 
 namespace __llvm_libc {
 namespace cpp {
 
 // The implementations of ArrayRef and MutualArrayRef in this file are based
public:
   iterator begin() const { return data(); }
   iterator end() const { return data() + this->size(); }
 
   T &operator[](size_t Index) const { return data()[Index]; }
 };
 
 } // namespace cpp
 } // namespace __llvm_libc
+
+#endif // LLVM_LIBC_UTILS_CPP_ARRAYREF_H

libc/utils/CPP/StringRef.h

-//===----------------- A standalone StringRef type  -------------*- C++ -*-===//
+//===-- A standalone StringRef type  ----------------------------*- 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
 //
 //===----------------------------------------------------------------------===//
 
-#include "ArrayRef.h"
+#ifndef LLVM_LIBC_UTILS_CPP_STRINGREF_H
+#define LLVM_LIBC_UTILS_CPP_STRINGREF_H
 
 namespace __llvm_libc {
 namespace cpp {
 
 class StringRef : public ArrayRef<char> {
   // More methods like those in llvm::StringRef can be added as needed.
 };
 
 } // namespace cpp
 } // namespace __llvm_libc
+
+#endif // LLVM_LIBC_UTILS_CPP_STRINGREF_H
 No newline at end of file

libc/utils/CPP/TypeTraits.h

-//===----------------- Self contained C++ type traits -----------*- C++ -*-===//
+//===-- Self contained C++ type traits --------------------------*- 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 LLVM_LIBC_UTILS_CPP_TYPETRAITS_H
+#define LLVM_LIBC_UTILS_CPP_TYPETRAITS_H
+
 namespace __llvm_libc {
 namespace cpp {
 
 template <bool B, typename T> struct EnableIf;
 template <typename T> struct EnableIf<true, T> { typedef T Type; };
 
 template <bool B, typename T>
 using EnableIfType = typename EnableIf<B, T>::Type;

 template <typename T> struct IsPointerType : public FalseValue {};
 template <typename T> struct IsPointerType<T *> : public TrueValue {};
 
 template <typename T1, typename T2> struct IsSame : public FalseValue {};
 template <typename T> struct IsSame<T, T> : public TrueValue {};
 
 } // namespace cpp
 } // namespace __llvm_libc
+
+#endif // LLVM_LIBC_UTILS_CPP_TYPETRAITS_H

libc/utils/HdrGen/Command.h

-//===-------- Base class for header generation commands ---------*- C++ -*-===//
+//===-- Base class for header generation commands ---------------*- 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 LLVM_LIBC_UTILS_HDRGEN_COMMAND_H

libc/utils/HdrGen/Generator.h

-//===------------- - The main header generation class -----------*- C++ -*-===//
+//===-- The main header generation class ------------------------*- 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 LLVM_LIBC_UTILS_HDRGEN_GENERATOR_H

libc/utils/HdrGen/IncludeFileCommand.h

-//===-------- Class which implements the %%include_file command -*- C++ -*-===//
+//===-- Class which implements the %%include_file command -------*- 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 LLVM_LIBC_UTILS_HDRGEN_INCLUDE_COMMAND_H

libc/utils/HdrGen/PublicAPICommand.h

-//===---------- Implementation of PublicAPICommand --------------*- C++ -*-===//
+//===-- Implementation of PublicAPICommand ----------------------*- 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 LLVM_LIBC_UTILS_HDRGEN_PUBLICAPICOMMAND_H
+#define LLVM_LIBC_UTILS_HDRGEN_PUBLICAPICOMMAND_H
+
 #include "Command.h"
 
 #include "llvm/ADT/StringRef.h"
 
 #include <string>
 #include <unordered_map>
 #include <unordered_set>
 
public:
   static const char Name[];
 
   void run(llvm::raw_ostream &OS, const ArgVector &Args,
            llvm::StringRef StdHeader, llvm::RecordKeeper &Records,
            const Command::ErrorReporter &Reporter) const override;
 };
 
 } // namespace llvm_libc
+
+#endif // LLVM_LIBC_UTILS_HDRGEN_PUBLICAPICOMMAND_H

libc/utils/UnitTest/ErrnoSetterMatcher.h

-//===--------------------- ErrnoSetterMatcher.h -----------------*- C++ -*-===//
+//===-- ErrnoSetterMatcher.h ------------------------------------*- 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 LLVM_LIBC_UTILS_UNITTEST_ERRNOSETTERMATCHER_H

libc/utils/UnitTest/Test.h

-//===------------------ Base class for libc unittests -----------*- C++ -*-===//
+//===-- Base class for libc unittests ---------------------------*- 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 LLVM_LIBC_UTILS_UNITTEST_H

libc/utils/benchmarks/JSON.h

-//===-------- JSON serialization routines -----------------------*- C++ -*-===//
+//===-- JSON serialization routines -----------------------------*- 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 LLVM_LIBC_UTILS_BENCHMARK_JSON_H

libc/utils/benchmarks/LibcMemoryBenchmark.h

-//===-------- Benchmark memory specific tools -------------------*- C++ -*-===//
+//===-- Benchmark memory specific tools -------------------------*- 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
 //
 //===----------------------------------------------------------------------===//
 
 // This file complements the `benchmark` header with memory specific tools and

libc/utils/benchmarks/LibcMemoryBenchmarkMain.h

-//===-------- BenchmarkRunner interface -------------------------*- C++ -*-===//
+//===-- BenchmarkRunner interface -------------------------------*- 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 LLVM_LIBC_UTILS_BENCHMARK_MEMORY_BENCHMARK_MAIN_H

libc/utils/testutils/ExecuteFunction.h

-//===---------------------- ExecuteFunction.h -------------------*- C++ -*-===//
+//===--- ExecuteFunction.h --------------------------------------*- 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 LLVM_LIBC_UTILS_TESTUTILS_EXECUTEFUNCTION_H

libc/utils/testutils/StreamWrapper.h

-//===------------------------ StreamWrapper.h -------------------*- C++ -*-===//
+//===-- StreamWrapper.h -----------------------------------------*- 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 LLVM_LIBC_UTILS_TESTUTILS_STREAMWRAPPER_H