From d4044aad66a0a9a8104843875df8da23c61de265 Mon Sep 17 00:00:00 2001 From: Jonas Devlieghere Date: Fri, 26 Jul 2019 20:55:07 +0000 Subject: [PATCH] [TableGen] Fix stale include paths This worked locally because the include files were not regenerated, but fails when performing a clean build. llvm-svn: 367152 --- lldb/source/Core/Debugger.cpp | 4 ++-- lldb/source/Core/ModuleList.cpp | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lldb/source/Core/Debugger.cpp b/lldb/source/Core/Debugger.cpp index 723b79a..51b9d4f 100644 --- a/lldb/source/Core/Debugger.cpp +++ b/lldb/source/Core/Debugger.cpp @@ -204,12 +204,12 @@ static constexpr OptionEnumValueElement s_stop_show_column_values[] = { static constexpr PropertyDefinition g_properties[] = { #define LLDB_PROPERTIES_debugger -#include "lldb/Core/Properties.inc" +#include "Properties.inc" }; enum { #define LLDB_PROPERTIES_debugger -#include "lldb/Core/PropertiesEnum.inc" +#include "PropertiesEnum.inc" }; LoadPluginCallbackType Debugger::g_load_plugin_callback = nullptr; diff --git a/lldb/source/Core/ModuleList.cpp b/lldb/source/Core/ModuleList.cpp index 7136843..8624e47 100644 --- a/lldb/source/Core/ModuleList.cpp +++ b/lldb/source/Core/ModuleList.cpp @@ -67,12 +67,12 @@ namespace { static constexpr PropertyDefinition g_properties[] = { #define LLDB_PROPERTIES_modulelist -#include "lldb/Core/Properties.inc" +#include "Properties.inc" }; enum { #define LLDB_PROPERTIES_modulelist -#include "lldb/Core/PropertiesEnum.inc" +#include "PropertiesEnum.inc" }; } // namespace @@ -126,9 +126,9 @@ ModuleList::ModuleList(ModuleList::Notifier *notifier) const ModuleList &ModuleList::operator=(const ModuleList &rhs) { if (this != &rhs) { std::lock(m_modules_mutex, rhs.m_modules_mutex); - std::lock_guard lhs_guard(m_modules_mutex, + std::lock_guard lhs_guard(m_modules_mutex, std::adopt_lock); - std::lock_guard rhs_guard(rhs.m_modules_mutex, + std::lock_guard rhs_guard(rhs.m_modules_mutex, std::adopt_lock); m_modules = rhs.m_modules; } @@ -146,8 +146,8 @@ void ModuleList::AppendImpl(const ModuleSP &module_sp, bool use_notifier) { } } -void ModuleList::Append(const ModuleSP &module_sp, bool notify) { - AppendImpl(module_sp, notify); +void ModuleList::Append(const ModuleSP &module_sp, bool notify) { + AppendImpl(module_sp, notify); } void ModuleList::ReplaceEquivalent(const ModuleSP &module_sp) { -- 2.7.4