Importing rustc-1.47.0 Bug: 171280890 Change-Id: Iac01e5c09a6ae8e508762cd96c2a88d191af4f0e
diff --git a/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetItemInfoHandler.cpp b/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetItemInfoHandler.cpp index 571e1d8..7dfa759 100644 --- a/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetItemInfoHandler.cpp +++ b/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetItemInfoHandler.cpp
@@ -1,5 +1,4 @@ -//===-- AppleGetItemInfoHandler.cpp -------------------------------*- C++ -//-*-===// +//===-- AppleGetItemInfoHandler.cpp ---------------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -9,13 +8,12 @@ #include "AppleGetItemInfoHandler.h" - +#include "Plugins/TypeSystem/Clang/TypeSystemClang.h" #include "lldb/Core/Module.h" #include "lldb/Core/Value.h" #include "lldb/Expression/DiagnosticManager.h" #include "lldb/Expression/FunctionCaller.h" #include "lldb/Expression/UtilityFunction.h" -#include "lldb/Symbol/ClangASTContext.h" #include "lldb/Symbol/Symbol.h" #include "lldb/Target/ExecutionContext.h" #include "lldb/Target/Process.h" @@ -108,7 +106,7 @@ m_get_item_info_return_buffer_addr != LLDB_INVALID_ADDRESS) { std::unique_lock<std::mutex> lock(m_get_item_info_retbuffer_mutex, std::defer_lock); - lock.try_lock(); // Even if we don't get the lock, deallocate the buffer + (void)lock.try_lock(); // Even if we don't get the lock, deallocate the buffer m_process->DeallocateMemory(m_get_item_info_return_buffer_addr); } } @@ -229,7 +227,7 @@ lldb::StackFrameSP thread_cur_frame = thread.GetStackFrameAtIndex(0); ProcessSP process_sp(thread.CalculateProcess()); TargetSP target_sp(thread.CalculateTarget()); - ClangASTContext *clang_ast_context = ClangASTContext::GetScratch(*target_sp); + TypeSystemClang *clang_ast_context = TypeSystemClang::GetScratch(*target_sp); Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_SYSTEM_RUNTIME)); GetItemInfoReturnInfo return_value;
diff --git a/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetItemInfoHandler.h b/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetItemInfoHandler.h index 318d674..f1119a9 100644 --- a/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetItemInfoHandler.h +++ b/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetItemInfoHandler.h
@@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef lldb_AppleGetItemInfoHandler_h_ -#define lldb_AppleGetItemInfoHandler_h_ +#ifndef LLDB_SOURCE_PLUGINS_SYSTEMRUNTIME_MACOSX_APPLEGETITEMINFOHANDLER_H +#define LLDB_SOURCE_PLUGINS_SYSTEMRUNTIME_MACOSX_APPLEGETITEMINFOHANDLER_H #include <map> #include <mutex> @@ -109,4 +109,4 @@ } // using namespace lldb_private -#endif // lldb_AppleGetItemInfoHandler_h_ +#endif // LLDB_SOURCE_PLUGINS_SYSTEMRUNTIME_MACOSX_APPLEGETITEMINFOHANDLER_H
diff --git a/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetPendingItemsHandler.cpp b/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetPendingItemsHandler.cpp index be1b100..ff57aa2 100644 --- a/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetPendingItemsHandler.cpp +++ b/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetPendingItemsHandler.cpp
@@ -1,5 +1,4 @@ -//===-- AppleGetPendingItemsHandler.cpp -------------------------------*- C++ -//-*-===// +//===-- AppleGetPendingItemsHandler.cpp -----------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -9,13 +8,12 @@ #include "AppleGetPendingItemsHandler.h" - +#include "Plugins/TypeSystem/Clang/TypeSystemClang.h" #include "lldb/Core/Module.h" #include "lldb/Core/Value.h" #include "lldb/Expression/DiagnosticManager.h" #include "lldb/Expression/FunctionCaller.h" #include "lldb/Expression/UtilityFunction.h" -#include "lldb/Symbol/ClangASTContext.h" #include "lldb/Symbol/Symbol.h" #include "lldb/Target/ExecutionContext.h" #include "lldb/Target/Process.h" @@ -111,7 +109,7 @@ m_get_pending_items_return_buffer_addr != LLDB_INVALID_ADDRESS) { std::unique_lock<std::mutex> lock(m_get_pending_items_retbuffer_mutex, std::defer_lock); - lock.try_lock(); // Even if we don't get the lock, deallocate the buffer + (void)lock.try_lock(); // Even if we don't get the lock, deallocate the buffer m_process->DeallocateMemory(m_get_pending_items_return_buffer_addr); } } @@ -176,8 +174,8 @@ // Next make the runner function for our implementation utility function. Status error; - ClangASTContext *clang_ast_context = - ClangASTContext::GetScratch(thread.GetProcess()->GetTarget()); + TypeSystemClang *clang_ast_context = + TypeSystemClang::GetScratch(thread.GetProcess()->GetTarget()); CompilerType get_pending_items_return_type = clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType(); get_pending_items_caller = @@ -228,7 +226,7 @@ lldb::StackFrameSP thread_cur_frame = thread.GetStackFrameAtIndex(0); ProcessSP process_sp(thread.CalculateProcess()); TargetSP target_sp(thread.CalculateTarget()); - ClangASTContext *clang_ast_context = ClangASTContext::GetScratch(*target_sp); + TypeSystemClang *clang_ast_context = TypeSystemClang::GetScratch(*target_sp); Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_SYSTEM_RUNTIME)); GetPendingItemsReturnInfo return_value;
diff --git a/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetPendingItemsHandler.h b/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetPendingItemsHandler.h index 0780e3c..20895ca 100644 --- a/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetPendingItemsHandler.h +++ b/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetPendingItemsHandler.h
@@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef lldb_AppleGetPendingItemsHandler_h_ -#define lldb_AppleGetPendingItemsHandler_h_ +#ifndef LLDB_SOURCE_PLUGINS_SYSTEMRUNTIME_MACOSX_APPLEGETPENDINGITEMSHANDLER_H +#define LLDB_SOURCE_PLUGINS_SYSTEMRUNTIME_MACOSX_APPLEGETPENDINGITEMSHANDLER_H #include <map> #include <mutex> @@ -114,4 +114,4 @@ } // using namespace lldb_private -#endif // lldb_AppleGetPendingItemsHandler_h_ +#endif // LLDB_SOURCE_PLUGINS_SYSTEMRUNTIME_MACOSX_APPLEGETPENDINGITEMSHANDLER_H
diff --git a/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.cpp b/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.cpp index 338d63d..632f18d 100644 --- a/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.cpp +++ b/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.cpp
@@ -1,4 +1,4 @@ -//===-- AppleGetQueuesHandler.cpp -------------------------------*- C++ -*-===// +//===-- AppleGetQueuesHandler.cpp -----------------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -8,12 +8,12 @@ #include "AppleGetQueuesHandler.h" +#include "Plugins/TypeSystem/Clang/TypeSystemClang.h" #include "lldb/Core/Module.h" #include "lldb/Core/Value.h" #include "lldb/Expression/DiagnosticManager.h" #include "lldb/Expression/FunctionCaller.h" #include "lldb/Expression/UtilityFunction.h" -#include "lldb/Symbol/ClangASTContext.h" #include "lldb/Symbol/Symbol.h" #include "lldb/Target/ExecutionContext.h" #include "lldb/Target/Process.h" @@ -107,7 +107,7 @@ m_get_queues_return_buffer_addr != LLDB_INVALID_ADDRESS) { std::unique_lock<std::mutex> lock(m_get_queues_retbuffer_mutex, std::defer_lock); - lock.try_lock(); // Even if we don't get the lock, deallocate the buffer + (void)lock.try_lock(); // Even if we don't get the lock, deallocate the buffer m_process->DeallocateMemory(m_get_queues_return_buffer_addr); } } @@ -190,8 +190,8 @@ } // Next make the runner function for our implementation utility function. - ClangASTContext *clang_ast_context = - ClangASTContext::GetScratch(thread.GetProcess()->GetTarget()); + TypeSystemClang *clang_ast_context = + TypeSystemClang::GetScratch(thread.GetProcess()->GetTarget()); CompilerType get_queues_return_type = clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType(); Status error; @@ -231,7 +231,7 @@ lldb::StackFrameSP thread_cur_frame = thread.GetStackFrameAtIndex(0); ProcessSP process_sp(thread.CalculateProcess()); TargetSP target_sp(thread.CalculateTarget()); - ClangASTContext *clang_ast_context = ClangASTContext::GetScratch(*target_sp); + TypeSystemClang *clang_ast_context = TypeSystemClang::GetScratch(*target_sp); Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_SYSTEM_RUNTIME)); GetQueuesReturnInfo return_value;
diff --git a/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.h b/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.h index bd314f9..0c828d7 100644 --- a/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.h +++ b/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.h
@@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef lldb_AppleGetQueuesHandler_h_ -#define lldb_AppleGetQueuesHandler_h_ +#ifndef LLDB_SOURCE_PLUGINS_SYSTEMRUNTIME_MACOSX_APPLEGETQUEUESHANDLER_H +#define LLDB_SOURCE_PLUGINS_SYSTEMRUNTIME_MACOSX_APPLEGETQUEUESHANDLER_H #include <map> #include <mutex> @@ -106,4 +106,4 @@ } // using namespace lldb_private -#endif // lldb_AppleGetQueuesHandler_h_ +#endif // LLDB_SOURCE_PLUGINS_SYSTEMRUNTIME_MACOSX_APPLEGETQUEUESHANDLER_H
diff --git a/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetThreadItemInfoHandler.cpp b/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetThreadItemInfoHandler.cpp index 22beda8..6bfdbac 100644 --- a/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetThreadItemInfoHandler.cpp +++ b/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetThreadItemInfoHandler.cpp
@@ -1,5 +1,4 @@ -//===-- AppleGetThreadItemInfoHandler.cpp -------------------------------*- C++ -//-*-===// +//===-- AppleGetThreadItemInfoHandler.cpp ---------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -9,14 +8,13 @@ #include "AppleGetThreadItemInfoHandler.h" - +#include "Plugins/TypeSystem/Clang/TypeSystemClang.h" #include "lldb/Core/Module.h" #include "lldb/Core/Value.h" #include "lldb/Expression/DiagnosticManager.h" #include "lldb/Expression/Expression.h" #include "lldb/Expression/FunctionCaller.h" #include "lldb/Expression/UtilityFunction.h" -#include "lldb/Symbol/ClangASTContext.h" #include "lldb/Symbol/Symbol.h" #include "lldb/Target/ExecutionContext.h" #include "lldb/Target/Process.h" @@ -117,7 +115,7 @@ m_get_thread_item_info_return_buffer_addr != LLDB_INVALID_ADDRESS) { std::unique_lock<std::mutex> lock(m_get_thread_item_info_retbuffer_mutex, std::defer_lock); - lock.try_lock(); // Even if we don't get the lock, deallocate the buffer + (void)lock.try_lock(); // Even if we don't get the lock, deallocate the buffer m_process->DeallocateMemory(m_get_thread_item_info_return_buffer_addr); } } @@ -185,8 +183,8 @@ // Also make the FunctionCaller for this UtilityFunction: - ClangASTContext *clang_ast_context = - ClangASTContext::GetScratch(thread.GetProcess()->GetTarget()); + TypeSystemClang *clang_ast_context = + TypeSystemClang::GetScratch(thread.GetProcess()->GetTarget()); CompilerType get_thread_item_info_return_type = clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType(); @@ -237,7 +235,7 @@ lldb::StackFrameSP thread_cur_frame = thread.GetStackFrameAtIndex(0); ProcessSP process_sp(thread.CalculateProcess()); TargetSP target_sp(thread.CalculateTarget()); - ClangASTContext *clang_ast_context = ClangASTContext::GetScratch(*target_sp); + TypeSystemClang *clang_ast_context = TypeSystemClang::GetScratch(*target_sp); Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_SYSTEM_RUNTIME)); GetThreadItemInfoReturnInfo return_value;
diff --git a/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetThreadItemInfoHandler.h b/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetThreadItemInfoHandler.h index b45314d..0f7201a 100644 --- a/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetThreadItemInfoHandler.h +++ b/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetThreadItemInfoHandler.h
@@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef lldb_AppleGetThreadItemInfoHandler_h_ -#define lldb_AppleGetThreadItemInfoHandler_h_ +#ifndef LLDB_SOURCE_PLUGINS_SYSTEMRUNTIME_MACOSX_APPLEGETTHREADITEMINFOHANDLER_H +#define LLDB_SOURCE_PLUGINS_SYSTEMRUNTIME_MACOSX_APPLEGETTHREADITEMINFOHANDLER_H #include <map> #include <mutex> @@ -108,4 +108,4 @@ } // using namespace lldb_private -#endif // lldb_AppleGetThreadItemInfoHandler_h_ +#endif // LLDB_SOURCE_PLUGINS_SYSTEMRUNTIME_MACOSX_APPLEGETTHREADITEMINFOHANDLER_H
diff --git a/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/CMakeLists.txt b/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/CMakeLists.txt index ac5781b..04d30652 100644 --- a/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/CMakeLists.txt +++ b/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/CMakeLists.txt
@@ -14,4 +14,5 @@ lldbTarget lldbUtility lldbPluginProcessUtility + lldbPluginTypeSystemClang )
diff --git a/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.cpp b/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.cpp index 69a4470..33b1ed1 100644 --- a/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.cpp +++ b/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.cpp
@@ -1,4 +1,4 @@ -//===-- SystemRuntimeMacOSX.cpp ---------------------------------*- C++ -*-===// +//===-- SystemRuntimeMacOSX.cpp -------------------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -7,12 +7,12 @@ //===----------------------------------------------------------------------===// #include "Plugins/Process/Utility/HistoryThread.h" +#include "Plugins/TypeSystem/Clang/TypeSystemClang.h" #include "lldb/Breakpoint/StoppointCallbackContext.h" #include "lldb/Core/Module.h" #include "lldb/Core/ModuleSpec.h" #include "lldb/Core/PluginManager.h" #include "lldb/Core/Section.h" -#include "lldb/Symbol/ClangASTContext.h" #include "lldb/Symbol/ObjectFile.h" #include "lldb/Symbol/SymbolContext.h" #include "lldb/Target/Process.h" @@ -34,6 +34,8 @@ using namespace lldb; using namespace lldb_private; +LLDB_PLUGIN_DEFINE(SystemRuntimeMacOSX) + // Create an instance of this class. This function is filled into the plugin // info class that gets handed out by the plugin factory and allows the lldb to // instantiate an instance of this class. @@ -411,29 +413,30 @@ } #endif - ClangASTContext *ast_ctx = - ClangASTContext::GetScratch(m_process->GetTarget()); + TypeSystemClang *ast_ctx = + TypeSystemClang::GetScratch(m_process->GetTarget()); if (m_dispatch_tsd_indexes_addr != LLDB_INVALID_ADDRESS) { CompilerType uint16 = ast_ctx->GetBuiltinTypeForEncodingAndBitSize(eEncodingUint, 16); CompilerType dispatch_tsd_indexes_s = ast_ctx->CreateRecordType( - nullptr, lldb::eAccessPublic, "__lldb_dispatch_tsd_indexes_s", - clang::TTK_Struct, lldb::eLanguageTypeC); + nullptr, OptionalClangModuleID(), lldb::eAccessPublic, + "__lldb_dispatch_tsd_indexes_s", clang::TTK_Struct, + lldb::eLanguageTypeC); - ClangASTContext::StartTagDeclarationDefinition(dispatch_tsd_indexes_s); - ClangASTContext::AddFieldToRecordType(dispatch_tsd_indexes_s, + TypeSystemClang::StartTagDeclarationDefinition(dispatch_tsd_indexes_s); + TypeSystemClang::AddFieldToRecordType(dispatch_tsd_indexes_s, "dti_version", uint16, lldb::eAccessPublic, 0); - ClangASTContext::AddFieldToRecordType(dispatch_tsd_indexes_s, + TypeSystemClang::AddFieldToRecordType(dispatch_tsd_indexes_s, "dti_queue_index", uint16, lldb::eAccessPublic, 0); - ClangASTContext::AddFieldToRecordType(dispatch_tsd_indexes_s, + TypeSystemClang::AddFieldToRecordType(dispatch_tsd_indexes_s, "dti_voucher_index", uint16, lldb::eAccessPublic, 0); - ClangASTContext::AddFieldToRecordType(dispatch_tsd_indexes_s, + TypeSystemClang::AddFieldToRecordType(dispatch_tsd_indexes_s, "dti_qos_class_index", uint16, lldb::eAccessPublic, 0); - ClangASTContext::CompleteTagDeclarationDefinition(dispatch_tsd_indexes_s); + TypeSystemClang::CompleteTagDeclarationDefinition(dispatch_tsd_indexes_s); ProcessStructReader struct_reader(m_process, m_dispatch_tsd_indexes_addr, dispatch_tsd_indexes_s); @@ -793,8 +796,8 @@ static_cast<size_t>(i) < pending_items_pointer.count) { offset = start_of_array_offset + (i * item_size); ItemRefAndCodeAddress item; - item.item_ref = extractor.GetPointer(&offset); - item.code_address = extractor.GetPointer(&offset); + item.item_ref = extractor.GetAddress(&offset); + item.code_address = extractor.GetAddress(&offset); pending_item_refs.item_refs_and_code_addresses.push_back(item); i++; } @@ -804,7 +807,7 @@ while (offset < pending_items_pointer.items_buffer_size && static_cast<size_t>(i) < pending_items_pointer.count) { ItemRefAndCodeAddress item; - item.item_ref = extractor.GetPointer(&offset); + item.item_ref = extractor.GetAddress(&offset); item.code_address = LLDB_INVALID_ADDRESS; pending_item_refs.item_refs_and_code_addresses.push_back(item); i++; @@ -911,7 +914,7 @@ uint32_t offset_to_next = extractor.GetU32(&offset); offset += 4; // Skip over the 4 bytes of reserved space - addr_t queue = extractor.GetPointer(&offset); + addr_t queue = extractor.GetAddress(&offset); uint64_t serialnum = extractor.GetU64(&offset); uint32_t running_work_items_count = extractor.GetU32(&offset); uint32_t pending_work_items_count = extractor.GetU32(&offset); @@ -952,8 +955,8 @@ offset_t offset = 0; - item.item_that_enqueued_this = extractor.GetPointer(&offset); - item.function_or_block = extractor.GetPointer(&offset); + item.item_that_enqueued_this = extractor.GetAddress(&offset); + item.function_or_block = extractor.GetAddress(&offset); item.enqueuing_thread_id = extractor.GetU64(&offset); item.enqueuing_queue_serialnum = extractor.GetU64(&offset); item.target_queue_serialnum = extractor.GetU64(&offset); @@ -963,7 +966,7 @@ offset = m_lib_backtrace_recording_info.item_info_data_offset; for (uint32_t i = 0; i < item.enqueuing_callstack_frame_count; i++) { - item.enqueuing_callstack.push_back(extractor.GetPointer(&offset)); + item.enqueuing_callstack.push_back(extractor.GetAddress(&offset)); } item.enqueuing_thread_label = extractor.GetCStr(&offset); item.enqueuing_queue_label = extractor.GetCStr(&offset);
diff --git a/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.h b/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.h index d6a18e2..844682e 100644 --- a/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.h +++ b/src/llvm-project/lldb/source/Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.h
@@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef liblldb_SystemRuntimeMacOSX_h_ -#define liblldb_SystemRuntimeMacOSX_h_ +#ifndef LLDB_SOURCE_PLUGINS_SYSTEMRUNTIME_MACOSX_SYSTEMRUNTIMEMACOSX_H +#define LLDB_SOURCE_PLUGINS_SYSTEMRUNTIME_MACOSX_SYSTEMRUNTIMEMACOSX_H #include <mutex> #include <string> @@ -286,7 +286,8 @@ lldb::addr_t m_dispatch_voucher_offsets_addr; struct LibdispatchVoucherOffsets m_libdispatch_voucher_offsets; - DISALLOW_COPY_AND_ASSIGN(SystemRuntimeMacOSX); + SystemRuntimeMacOSX(const SystemRuntimeMacOSX &) = delete; + const SystemRuntimeMacOSX &operator=(const SystemRuntimeMacOSX &) = delete; }; -#endif // liblldb_SystemRuntimeMacOSX_h_ +#endif // LLDB_SOURCE_PLUGINS_SYSTEMRUNTIME_MACOSX_SYSTEMRUNTIMEMACOSX_H