Author: Fangrui Song Date: 2022-08-08T12:03:53-07:00 New Revision: cdeb50c3215593bffe9e5a46bdc9a9e34fd93dcc
URL: https://github.com/llvm/llvm-project/commit/cdeb50c3215593bffe9e5a46bdc9a9e34fd93dcc DIFF: https://github.com/llvm/llvm-project/commit/cdeb50c3215593bffe9e5a46bdc9a9e34fd93dcc.diff LOG: [lldb] Remove include/lldb/lldb-private.h The header from 62e0681afb478a4005efb6ba3598c24dc24866ee does something with LLVM_FALLTHROUGH. Now that llvm-project has switched to C++17 and LLVM_FALLTHROUGH uses have been migrated to [[fallthrough]], the header is unneeded. Reviewed By: JDevlieghere Differential Revision: https://reviews.llvm.org/D131422 Added: Modified: clang/docs/tools/clang-formatted-files.txt lldb/include/lldb/lldb-private.h lldb/include/lldb/module.modulemap Removed: lldb/include/lldb/lldb-private-defines.h ################################################################################ diff --git a/clang/docs/tools/clang-formatted-files.txt b/clang/docs/tools/clang-formatted-files.txt index 81d0e9522e604..f89e19ca7cd3a 100644 --- a/clang/docs/tools/clang-formatted-files.txt +++ b/clang/docs/tools/clang-formatted-files.txt @@ -3591,7 +3591,6 @@ lldb/examples/plugins/commands/fooplugin.cpp lldb/examples/synthetic/bitfield/program.cpp lldb/include/lldb/lldb-defines.h lldb/include/lldb/lldb-forward.h -lldb/include/lldb/lldb-private-defines.h lldb/include/lldb/lldb-private.h lldb/include/lldb/lldb-public.h lldb/include/lldb/lldb-versioning.h diff --git a/lldb/include/lldb/lldb-private-defines.h b/lldb/include/lldb/lldb-private-defines.h deleted file mode 100644 index d66e6ef1518d7..0000000000000 --- a/lldb/include/lldb/lldb-private-defines.h +++ /dev/null @@ -1,36 +0,0 @@ -//===-- lldb-private-defines.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 LLDB_LLDB_PRIVATE_DEFINES_H -#define LLDB_LLDB_PRIVATE_DEFINES_H - -#if defined(__cplusplus) - -// Include Compiler.h here so we don't define LLVM_FALLTHROUGH and then -// Compiler.h later tries to redefine it. -#include "llvm/Support/Compiler.h" - -#ifndef LLVM_FALLTHROUGH - -#ifndef __has_cpp_attribute -#define __has_cpp_attribute(x) 0 -#endif - -/// \macro LLVM_FALLTHROUGH -/// Marks an empty statement preceding a deliberate switch fallthrough. -#if __has_cpp_attribute(clang::fallthrough) -#define LLVM_FALLTHROUGH [[clang::fallthrough]] -#else -#define LLVM_FALLTHROUGH -#endif - -#endif // ifndef LLVM_FALLTHROUGH - -#endif // #if defined(__cplusplus) - -#endif // LLDB_LLDB_PRIVATE_DEFINES_H diff --git a/lldb/include/lldb/lldb-private.h b/lldb/include/lldb/lldb-private.h index ac07047fb4edb..f56af06ec5973 100644 --- a/lldb/include/lldb/lldb-private.h +++ b/lldb/include/lldb/lldb-private.h @@ -11,7 +11,6 @@ #if defined(__cplusplus) -#include "lldb/lldb-private-defines.h" #include "lldb/lldb-private-enumerations.h" #include "lldb/lldb-private-interfaces.h" #include "lldb/lldb-private-types.h" diff --git a/lldb/include/lldb/module.modulemap b/lldb/include/lldb/module.modulemap index 303d6b15e808c..c06e026076f49 100644 --- a/lldb/include/lldb/module.modulemap +++ b/lldb/include/lldb/module.modulemap @@ -134,7 +134,6 @@ module lldb_Utility { module lldb_enumerations { header "lldb-enumerations.h" export * } module lldb_forward { header "lldb-forward.h" export * } module lldb_private_enumerations { header "lldb-private-enumerations.h" export * } - module lldb_private_defines { header "lldb-private-defines.h" export * } module lldb_private_forward { header "lldb-private-forward.h" export * } module lldb_private { header "lldb-private.h" export * } module lldb_private_interfaces { header "lldb-private-interfaces.h" export * } _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
