diff options
Diffstat (limited to 'lldb/source/Plugins/Language/ObjC/Cocoa.cpp')
| -rw-r--r-- | lldb/source/Plugins/Language/ObjC/Cocoa.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lldb/source/Plugins/Language/ObjC/Cocoa.cpp b/lldb/source/Plugins/Language/ObjC/Cocoa.cpp index 0d7cd6791b04..14cd64fe4b5e 100644 --- a/lldb/source/Plugins/Language/ObjC/Cocoa.cpp +++ b/lldb/source/Plugins/Language/ObjC/Cocoa.cpp @@ -25,6 +25,7 @@ #include "lldb/Target/Target.h" #include "lldb/Utility/DataBufferHeap.h" #include "lldb/Utility/Endian.h" +#include "lldb/Utility/LLDBLog.h" #include "lldb/Utility/Status.h" #include "lldb/Utility/Stream.h" @@ -426,7 +427,7 @@ bool lldb_private::formatters::NSNumberSummaryProvider( if (!process_sp) return false; - Log *log = lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_DATAFORMATTERS); + Log *log = GetLog(LLDBLog::DataFormatters); ObjCLanguageRuntime *runtime = ObjCLanguageRuntime::Get(*process_sp); if (!runtime) @@ -918,8 +919,8 @@ bool lldb_private::formatters::NSDateSummaryProvider( ConstString class_name = descriptor->GetClassName(); static const ConstString g_NSDate("NSDate"); - static const ConstString g___NSDate("__NSDate"); - static const ConstString g___NSTaggedDate("__NSTaggedDate"); + static const ConstString g_dunder_NSDate("__NSDate"); + static const ConstString g_NSTaggedDate("__NSTaggedDate"); static const ConstString g_NSCalendarDate("NSCalendarDate"); static const ConstString g_NSConstantDate("NSConstantDate"); @@ -927,8 +928,8 @@ bool lldb_private::formatters::NSDateSummaryProvider( return false; uint64_t info_bits = 0, value_bits = 0; - if ((class_name == g_NSDate) || (class_name == g___NSDate) || - (class_name == g___NSTaggedDate) || (class_name == g_NSConstantDate)) { + if ((class_name == g_NSDate) || (class_name == g_dunder_NSDate) || + (class_name == g_NSTaggedDate) || (class_name == g_NSConstantDate)) { if (descriptor->GetTaggedPointerInfo(&info_bits, &value_bits)) { date_value_bits = ((value_bits << 8) | (info_bits << 4)); memcpy(&date_value, &date_value_bits, sizeof(date_value_bits)); @@ -966,7 +967,7 @@ bool lldb_private::formatters::NSDateSummaryProvider( } // Accomodate for the __NSTaggedDate format introduced in Foundation 1600. - if (class_name == g___NSTaggedDate) { + if (class_name == g_NSTaggedDate) { auto *runtime = llvm::dyn_cast_or_null<AppleObjCRuntime>( ObjCLanguageRuntime::Get(*process_sp)); if (runtime && runtime->GetFoundationVersion() >= 1600) |