replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[lldb] Qualify includes of Properties[Enum].inc files. NFC 

Summary:
This is a bit more explicit, and makes it possible to build LLDB without
varying the -I lines per-directory.
(The latter is useful because many build systems only allow this to be
configured per-library, and LLDB is insufficiently layered to be split into
multiple libraries on stricter build systems).

(My comment on D65185 has some more context)

Reviewers: JDevlieghere, labath, chandlerc, jdoerfert

Reviewed By: labath

Subscribers: mgorny, lldb-commits

Tags: #lldb

Differential Revision: https://reviews.llvm.org/D65397

Patch by Sam McCall!

llvm-svn: 367241
This commit is contained in:
Jordan Rupprecht 2019-07-29 17:22:10 +00:00
parent 962c03fac4
commit 6a253d378b
34 changed files with 71 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lldb/source/Core/CMakeLists.txt
View File

@ -1,9 +1,9 @@
lldb_tablegen(Properties.inc -gen-lldb-property-defs lldb_tablegen(CoreProperties.inc -gen-lldb-property-defs
SOURCE Properties.td SOURCE CoreProperties.td
TARGET LLDBCorePropertiesGen) TARGET LLDBCorePropertiesGen)
lldb_tablegen(PropertiesEnum.inc -gen-lldb-property-enum-defs lldb_tablegen(CorePropertiesEnum.inc -gen-lldb-property-enum-defs
SOURCE Properties.td SOURCE CoreProperties.td
TARGET LLDBCorePropertiesEnumGen) TARGET LLDBCorePropertiesEnumGen)
set(LLDB_CURSES_LIBS) set(LLDB_CURSES_LIBS)

0
lldb/source/Core/Properties.td → lldb/source/Core/CoreProperties.td
View File

4
lldb/source/Core/Debugger.cpp
View File

@ -203,11 +203,11 @@ static constexpr OptionEnumValueElement s_stop_show_column_values[] = {
{eStopShowColumnNone, "none", "Do not highlight the stop column."}}; {eStopShowColumnNone, "none", "Do not highlight the stop column."}};
#define LLDB_PROPERTIES_debugger #define LLDB_PROPERTIES_debugger
#include "Properties.inc" #include "CoreProperties.inc"
enum { enum {
#define LLDB_PROPERTIES_debugger #define LLDB_PROPERTIES_debugger
#include "PropertiesEnum.inc" #include "CorePropertiesEnum.inc"
}; };
LoadPluginCallbackType Debugger::g_load_plugin_callback = nullptr; LoadPluginCallbackType Debugger::g_load_plugin_callback = nullptr;

4
lldb/source/Core/ModuleList.cpp
View File

@ -66,11 +66,11 @@ using namespace lldb_private;
namespace { namespace {
#define LLDB_PROPERTIES_modulelist #define LLDB_PROPERTIES_modulelist
#include "Properties.inc" #include "CoreProperties.inc"
enum { enum {
#define LLDB_PROPERTIES_modulelist #define LLDB_PROPERTIES_modulelist
#include "PropertiesEnum.inc" #include "CorePropertiesEnum.inc"
}; };
} // namespace } // namespace

10
lldb/source/Interpreter/CMakeLists.txt
View File

@ -1,9 +1,9 @@
lldb_tablegen(Properties.inc -gen-lldb-property-defs lldb_tablegen(InterpreterProperties.inc -gen-lldb-property-defs
SOURCE Properties.td SOURCE InterpreterProperties.td
TARGET LLDBInterpreterPropertiesGen) TARGET LLDBInterpreterPropertiesGen)
lldb_tablegen(PropertiesEnum.inc -gen-lldb-property-enum-defs lldb_tablegen(InterpreterPropertiesEnum.inc -gen-lldb-property-enum-defs
SOURCE Properties.td SOURCE InterpreterProperties.td
TARGET LLDBInterpreterPropertiesEnumGen) TARGET LLDBInterpreterPropertiesEnumGen)
add_lldb_library(lldbInterpreter add_lldb_library(lldbInterpreter
@ -70,4 +70,4 @@ add_dependencies(lldbInterpreter
if (NOT LLDB_DISABLE_LIBEDIT) if (NOT LLDB_DISABLE_LIBEDIT)
target_include_directories(lldbInterpreter PRIVATE ${libedit_INCLUDE_DIRS}) target_include_directories(lldbInterpreter PRIVATE ${libedit_INCLUDE_DIRS})
endif() endif()

4
lldb/source/Interpreter/CommandInterpreter.cpp
View File

@ -90,11 +90,11 @@ static constexpr const char *InitFileWarning =
"accept the security risk."; "accept the security risk.";
#define LLDB_PROPERTIES_interpreter #define LLDB_PROPERTIES_interpreter
#include "Properties.inc" #include "InterpreterProperties.inc"
enum { enum {
#define LLDB_PROPERTIES_interpreter #define LLDB_PROPERTIES_interpreter
#include "PropertiesEnum.inc" #include "InterpreterPropertiesEnum.inc"
}; };
ConstString &CommandInterpreter::GetStaticBroadcasterClass() { ConstString &CommandInterpreter::GetStaticBroadcasterClass() {

0
lldb/source/Interpreter/Properties.td → lldb/source/Interpreter/InterpreterProperties.td
View File

8
lldb/source/Plugins/DynamicLoader/Darwin-Kernel/CMakeLists.txt
View File

@ -1,9 +1,9 @@
lldb_tablegen(Properties.inc -gen-lldb-property-defs lldb_tablegen(DynamicLoaderDarwinKernelProperties.inc -gen-lldb-property-defs
SOURCE Properties.td SOURCE DynamicLoaderDarwinKernelProperties.td
TARGET LLDBPluginDynamicLoaderDarwinKernelPropertiesGen) TARGET LLDBPluginDynamicLoaderDarwinKernelPropertiesGen)
lldb_tablegen(PropertiesEnum.inc -gen-lldb-property-enum-defs lldb_tablegen(DynamicLoaderDarwinKernelPropertiesEnum.inc -gen-lldb-property-enum-defs
SOURCE Properties.td SOURCE DynamicLoaderDarwinKernelProperties.td
TARGET LLDBPluginDynamicLoaderDarwinKernelPropertiesEnumGen) TARGET LLDBPluginDynamicLoaderDarwinKernelPropertiesEnumGen)
add_lldb_library(lldbPluginDynamicLoaderDarwinKernel PLUGIN add_lldb_library(lldbPluginDynamicLoaderDarwinKernel PLUGIN

4
lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp
View File

@ -73,11 +73,11 @@ static constexpr OptionEnumValueElement g_kaslr_kernel_scan_enum_values[] = {
"on 32-bit targets)."}}; "on 32-bit targets)."}};
#define LLDB_PROPERTIES_dynamicloaderdarwinkernel #define LLDB_PROPERTIES_dynamicloaderdarwinkernel
#include "Properties.inc" #include "DynamicLoaderDarwinKernelProperties.inc"
enum { enum {
#define LLDB_PROPERTIES_dynamicloaderdarwinkernel #define LLDB_PROPERTIES_dynamicloaderdarwinkernel
#include "PropertiesEnum.inc" #include "DynamicLoaderDarwinKernelPropertiesEnum.inc"
}; };
class DynamicLoaderDarwinKernelProperties : public Properties { class DynamicLoaderDarwinKernelProperties : public Properties {

0
lldb/source/Plugins/DynamicLoader/Darwin-Kernel/Properties.td → lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernelProperties.td
View File

8
lldb/source/Plugins/JITLoader/GDB/CMakeLists.txt
View File

@ -1,9 +1,9 @@
lldb_tablegen(Properties.inc -gen-lldb-property-defs lldb_tablegen(JITLoaderGDBProperties.inc -gen-lldb-property-defs
SOURCE Properties.td SOURCE JITLoaderGDBProperties.td
TARGET LLDBPluginJITLoaderGDBPropertiesGen) TARGET LLDBPluginJITLoaderGDBPropertiesGen)
lldb_tablegen(PropertiesEnum.inc -gen-lldb-property-enum-defs lldb_tablegen(JITLoaderGDBPropertiesEnum.inc -gen-lldb-property-enum-defs
SOURCE Properties.td SOURCE JITLoaderGDBProperties.td
TARGET LLDBPluginJITLoaderGDBPropertiesEnumGen) TARGET LLDBPluginJITLoaderGDBPropertiesEnumGen)
add_lldb_library(lldbPluginJITLoaderGDB PLUGIN add_lldb_library(lldbPluginJITLoaderGDB PLUGIN

4
lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.cpp
View File

@ -67,11 +67,11 @@ static constexpr OptionEnumValueElement g_enable_jit_loader_gdb_enumerators[] =
}; };
#define LLDB_PROPERTIES_jitloadergdb #define LLDB_PROPERTIES_jitloadergdb
#include "Properties.inc" #include "JITLoaderGDBProperties.inc"
enum { enum {
#define LLDB_PROPERTIES_jitloadergdb #define LLDB_PROPERTIES_jitloadergdb
#include "PropertiesEnum.inc" #include "JITLoaderGDBPropertiesEnum.inc"
ePropertyEnableJITBreakpoint ePropertyEnableJITBreakpoint
}; };

0
lldb/source/Plugins/JITLoader/GDB/Properties.td → lldb/source/Plugins/JITLoader/GDB/JITLoaderGDBProperties.td
View File

8
lldb/source/Plugins/Platform/MacOSX/CMakeLists.txt
View File

@ -1,9 +1,9 @@
lldb_tablegen(Properties.inc -gen-lldb-property-defs lldb_tablegen(PlatformMacOSXProperties.inc -gen-lldb-property-defs
SOURCE Properties.td SOURCE PlatformMacOSXProperties.td
TARGET LLDBPluginPlatformMacOSXPropertiesGen) TARGET LLDBPluginPlatformMacOSXPropertiesGen)
lldb_tablegen(PropertiesEnum.inc -gen-lldb-property-enum-defs lldb_tablegen(PlatformMacOSXPropertiesEnum.inc -gen-lldb-property-enum-defs
SOURCE Properties.td SOURCE PlatformMacOSXProperties.td
TARGET LLDBPluginPlatformMacOSXPropertiesEnumGen) TARGET LLDBPluginPlatformMacOSXPropertiesEnumGen)
list(APPEND PLUGIN_PLATFORM_MACOSX_SOURCES list(APPEND PLUGIN_PLATFORM_MACOSX_SOURCES

4
lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp
View File

@ -178,11 +178,11 @@ const char *PlatformDarwinKernel::GetDescriptionStatic() {
/// Code to handle the PlatformDarwinKernel settings /// Code to handle the PlatformDarwinKernel settings
#define LLDB_PROPERTIES_platformdarwinkernel #define LLDB_PROPERTIES_platformdarwinkernel
#include "Properties.inc" #include "PlatformMacOSXProperties.inc"
enum { enum {
#define LLDB_PROPERTIES_platformdarwinkernel #define LLDB_PROPERTIES_platformdarwinkernel
#include "PropertiesEnum.inc" #include "PlatformMacOSXPropertiesEnum.inc"
}; };
class PlatformDarwinKernelProperties : public Properties { class PlatformDarwinKernelProperties : public Properties {

0
lldb/source/Plugins/Platform/MacOSX/Properties.td → lldb/source/Plugins/Platform/MacOSX/PlatformMacOSXProperties.td
View File

8
lldb/source/Plugins/Process/MacOSX-Kernel/CMakeLists.txt
View File

@ -1,9 +1,9 @@
lldb_tablegen(Properties.inc -gen-lldb-property-defs lldb_tablegen(ProcessKDPProperties.inc -gen-lldb-property-defs
SOURCE Properties.td SOURCE ProcessKDPProperties.td
TARGET LLDBPluginProcessMacOSXKernelPropertiesGen) TARGET LLDBPluginProcessMacOSXKernelPropertiesGen)
lldb_tablegen(PropertiesEnum.inc -gen-lldb-property-enum-defs lldb_tablegen(ProcessKDPPropertiesEnum.inc -gen-lldb-property-enum-defs
SOURCE Properties.td SOURCE ProcessKDPProperties.td
TARGET LLDBPluginProcessMacOSXKernelPropertiesEnumGen) TARGET LLDBPluginProcessMacOSXKernelPropertiesEnumGen)
add_lldb_library(lldbPluginProcessMacOSXKernel PLUGIN add_lldb_library(lldbPluginProcessMacOSXKernel PLUGIN

4
lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp
View File

@ -53,11 +53,11 @@ using namespace lldb_private;
namespace { namespace {
#define LLDB_PROPERTIES_processkdp #define LLDB_PROPERTIES_processkdp
#include "Properties.inc" #include "ProcessKDPProperties.inc"
enum { enum {
#define LLDB_PROPERTIES_processkdp #define LLDB_PROPERTIES_processkdp
#include "PropertiesEnum.inc" #include "ProcessKDPPropertiesEnum.inc"
}; };
class PluginProperties : public Properties { class PluginProperties : public Properties {

0
lldb/source/Plugins/Process/MacOSX-Kernel/Properties.td → lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDPProperties.td
View File

8
lldb/source/Plugins/Process/gdb-remote/CMakeLists.txt
View File

@ -1,9 +1,9 @@
lldb_tablegen(Properties.inc -gen-lldb-property-defs lldb_tablegen(ProcessGDBRemoteProperties.inc -gen-lldb-property-defs
SOURCE Properties.td SOURCE ProcessGDBRemoteProperties.td
TARGET LLDBPluginProcessGDBRemotePropertiesGen) TARGET LLDBPluginProcessGDBRemotePropertiesGen)
lldb_tablegen(PropertiesEnum.inc -gen-lldb-property-enum-defs lldb_tablegen(ProcessGDBRemotePropertiesEnum.inc -gen-lldb-property-enum-defs
SOURCE Properties.td SOURCE ProcessGDBRemoteProperties.td
TARGET LLDBPluginProcessGDBRemotePropertiesEnumGen) TARGET LLDBPluginProcessGDBRemotePropertiesEnumGen)
if (CMAKE_SYSTEM_NAME MATCHES "Darwin") if (CMAKE_SYSTEM_NAME MATCHES "Darwin")

4
lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
View File

@ -111,11 +111,11 @@ void DumpProcessGDBRemotePacketHistory(void *p, const char *path) {
namespace { namespace {
#define LLDB_PROPERTIES_processgdbremote #define LLDB_PROPERTIES_processgdbremote
#include "Properties.inc" #include "ProcessGDBRemoteProperties.inc"
enum { enum {
#define LLDB_PROPERTIES_processgdbremote #define LLDB_PROPERTIES_processgdbremote
#include "PropertiesEnum.inc" #include "ProcessGDBRemotePropertiesEnum.inc"
}; };
class PluginProperties : public Properties { class PluginProperties : public Properties {

0
lldb/source/Plugins/Process/gdb-remote/Properties.td → lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemoteProperties.td
View File

8
lldb/source/Plugins/StructuredData/DarwinLog/CMakeLists.txt
View File

@ -1,9 +1,9 @@
lldb_tablegen(Properties.inc -gen-lldb-property-defs lldb_tablegen(StructuredDataDarwinLogProperties.inc -gen-lldb-property-defs
SOURCE Properties.td SOURCE StructuredDataDarwinLogProperties.td
TARGET LLDBPluginStructuredDataDarwinLogPropertiesGen) TARGET LLDBPluginStructuredDataDarwinLogPropertiesGen)
lldb_tablegen(PropertiesEnum.inc -gen-lldb-property-enum-defs lldb_tablegen(StructuredDataDarwinLogPropertiesEnum.inc -gen-lldb-property-enum-defs
SOURCE Properties.td SOURCE StructuredDataDarwinLogProperties.td
TARGET LLDBPluginStructuredDataDarwinLogPropertiesEnumGen) TARGET LLDBPluginStructuredDataDarwinLogPropertiesEnumGen)
add_lldb_library(lldbPluginStructuredDataDarwinLog PLUGIN add_lldb_library(lldbPluginStructuredDataDarwinLog PLUGIN

4
lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.cpp
View File

@ -105,11 +105,11 @@ void SetGlobalEnableOptions(const DebuggerSP &debugger_sp,
/// Code to handle the StructuredDataDarwinLog settings /// Code to handle the StructuredDataDarwinLog settings
#define LLDB_PROPERTIES_darwinlog #define LLDB_PROPERTIES_darwinlog
#include "Properties.inc" #include "StructuredDataDarwinLogProperties.inc"
enum { enum {
#define LLDB_PROPERTIES_darwinlog #define LLDB_PROPERTIES_darwinlog
#include "PropertiesEnum.inc" #include "StructuredDataDarwinLogPropertiesEnum.inc"
}; };
class StructuredDataDarwinLogProperties : public Properties { class StructuredDataDarwinLogProperties : public Properties {

0
lldb/source/Plugins/StructuredData/DarwinLog/Properties.td → lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLogProperties.td
View File

8
lldb/source/Plugins/SymbolFile/DWARF/CMakeLists.txt
View File

@ -1,9 +1,9 @@
lldb_tablegen(Properties.inc -gen-lldb-property-defs lldb_tablegen(SymbolFileDWARFProperties.inc -gen-lldb-property-defs
SOURCE Properties.td SOURCE SymbolFileDWARFProperties.td
TARGET LLDBPluginSymbolFileDWARFPropertiesGen) TARGET LLDBPluginSymbolFileDWARFPropertiesGen)
lldb_tablegen(PropertiesEnum.inc -gen-lldb-property-enum-defs lldb_tablegen(SymbolFileDWARFPropertiesEnum.inc -gen-lldb-property-enum-defs
SOURCE Properties.td SOURCE SymbolFileDWARFProperties.td
TARGET LLDBPluginSymbolFileDWARFPropertiesEnumGen) TARGET LLDBPluginSymbolFileDWARFPropertiesEnumGen)
add_lldb_library(lldbPluginSymbolFileDWARF PLUGIN add_lldb_library(lldbPluginSymbolFileDWARF PLUGIN

4
lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
View File

@ -114,11 +114,11 @@ using namespace lldb_private;
namespace { namespace {
#define LLDB_PROPERTIES_symbolfiledwarf #define LLDB_PROPERTIES_symbolfiledwarf
#include "Properties.inc" #include "SymbolFileDWARFProperties.inc"
enum { enum {
#define LLDB_PROPERTIES_symbolfiledwarf #define LLDB_PROPERTIES_symbolfiledwarf
#include "PropertiesEnum.inc" #include "SymbolFileDWARFPropertiesEnum.inc"
}; };
class PluginProperties : public Properties { class PluginProperties : public Properties {

0
lldb/source/Plugins/SymbolFile/DWARF/Properties.td → lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFProperties.td
View File

8
lldb/source/Target/CMakeLists.txt
View File

@ -1,9 +1,9 @@
lldb_tablegen(Properties.inc -gen-lldb-property-defs lldb_tablegen(TargetProperties.inc -gen-lldb-property-defs
SOURCE Properties.td SOURCE TargetProperties.td
TARGET LLDBTargetPropertiesGen) TARGET LLDBTargetPropertiesGen)
lldb_tablegen(PropertiesEnum.inc -gen-lldb-property-enum-defs lldb_tablegen(TargetPropertiesEnum.inc -gen-lldb-property-enum-defs
SOURCE Properties.td SOURCE TargetProperties.td
TARGET LLDBTargetPropertiesEnumGen) TARGET LLDBTargetPropertiesEnumGen)
add_lldb_library(lldbTarget add_lldb_library(lldbTarget

4
lldb/source/Target/Platform.cpp
View File

@ -64,11 +64,11 @@ const char *Platform::GetHostPlatformName() { return "host"; }
namespace { namespace {
#define LLDB_PROPERTIES_platform #define LLDB_PROPERTIES_platform
#include "Properties.inc" #include "TargetProperties.inc"
enum { enum {
#define LLDB_PROPERTIES_platform #define LLDB_PROPERTIES_platform
#include "PropertiesEnum.inc" #include "TargetPropertiesEnum.inc"
}; };
} // namespace } // namespace

4
lldb/source/Target/Process.cpp
View File

@ -113,11 +113,11 @@ public:
}; };
#define LLDB_PROPERTIES_process #define LLDB_PROPERTIES_process
#include "Properties.inc" #include "TargetProperties.inc"
enum { enum {
#define LLDB_PROPERTIES_process #define LLDB_PROPERTIES_process
#include "PropertiesEnum.inc" #include "TargetPropertiesEnum.inc"
}; };
ProcessProperties::ProcessProperties(lldb_private::Process *process) ProcessProperties::ProcessProperties(lldb_private::Process *process)

8
lldb/source/Target/Target.cpp
View File

@ -3274,11 +3274,11 @@ static constexpr OptionEnumValueElement g_memory_module_load_level_values[] = {
"this setting loads sections and all symbols."} }; "this setting loads sections and all symbols."} };
#define LLDB_PROPERTIES_target #define LLDB_PROPERTIES_target
#include "Properties.inc" #include "TargetProperties.inc"
enum { enum {
#define LLDB_PROPERTIES_target #define LLDB_PROPERTIES_target
#include "PropertiesEnum.inc" #include "TargetPropertiesEnum.inc"
ePropertyExperimental, ePropertyExperimental,
}; };
@ -3355,11 +3355,11 @@ protected:
// TargetProperties // TargetProperties
#define LLDB_PROPERTIES_experimental #define LLDB_PROPERTIES_experimental
#include "Properties.inc" #include "TargetProperties.inc"
enum { enum {
#define LLDB_PROPERTIES_experimental #define LLDB_PROPERTIES_experimental
#include "PropertiesEnum.inc" #include "TargetPropertiesEnum.inc"
}; };
class TargetExperimentalOptionValueProperties : public OptionValueProperties { class TargetExperimentalOptionValueProperties : public OptionValueProperties {

0
lldb/source/Target/Properties.td → lldb/source/Target/TargetProperties.td
View File

4
lldb/source/Target/Thread.cpp
View File

@ -64,11 +64,11 @@ const ThreadPropertiesSP &Thread::GetGlobalProperties() {
} }
#define LLDB_PROPERTIES_thread #define LLDB_PROPERTIES_thread
#include "Properties.inc" #include "TargetProperties.inc"
enum { enum {
#define LLDB_PROPERTIES_thread #define LLDB_PROPERTIES_thread
#include "PropertiesEnum.inc" #include "TargetPropertiesEnum.inc"
}; };
class ThreadOptionValueProperties : public OptionValueProperties { class ThreadOptionValueProperties : public OptionValueProperties {