diff options
Diffstat (limited to 'contrib/llvm/tools/lldb/source/Symbol/GoASTContext.cpp')
| -rw-r--r-- | contrib/llvm/tools/lldb/source/Symbol/GoASTContext.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/contrib/llvm/tools/lldb/source/Symbol/GoASTContext.cpp b/contrib/llvm/tools/lldb/source/Symbol/GoASTContext.cpp index a28a6d756846..5ca173ae113c 100644 --- a/contrib/llvm/tools/lldb/source/Symbol/GoASTContext.cpp +++ b/contrib/llvm/tools/lldb/source/Symbol/GoASTContext.cpp @@ -11,12 +11,12 @@ #include <utility> #include <vector> +#include "lldb/Core/DumpDataExtractor.h" #include "lldb/Core/Module.h" #include "lldb/Core/PluginManager.h" #include "lldb/Core/StreamFile.h" #include "lldb/Core/UniqueCStringMap.h" #include "lldb/Core/ValueObject.h" -#include "lldb/DataFormatters/StringPrinter.h" #include "lldb/Symbol/CompilerType.h" #include "lldb/Symbol/GoASTContext.h" #include "lldb/Symbol/ObjectFile.h" @@ -25,6 +25,8 @@ #include "lldb/Target/ExecutionContext.h" #include "lldb/Target/Target.h" +#include "llvm/Support/Threading.h" + #include "Plugins/ExpressionParser/Go/GoUserExpression.h" #include "Plugins/SymbolFile/DWARF/DWARFASTParserGo.h" @@ -593,8 +595,8 @@ GoASTContext::GetBasicTypeEnumeration(lldb::opaque_compiler_type_t type) { if (name) { typedef UniqueCStringMap<lldb::BasicType> TypeNameToBasicTypeMap; static TypeNameToBasicTypeMap g_type_map; - static std::once_flag g_once_flag; - std::call_once(g_once_flag, []() { + static llvm::once_flag g_once_flag; + llvm::call_once(g_once_flag, []() { // "void" g_type_map.Append(ConstString("void").GetStringRef(), eBasicTypeVoid); // "int" @@ -1261,9 +1263,9 @@ bool GoASTContext::DumpTypeValue(lldb::opaque_compiler_type_t type, Stream *s, byte_size = 4; break; } - return data.Dump(s, byte_offset, format, byte_size, item_count, UINT32_MAX, - LLDB_INVALID_ADDRESS, bitfield_bit_size, - bitfield_bit_offset, exe_scope); + return DumpDataExtractor(data, s, byte_offset, format, byte_size, + item_count, UINT32_MAX, LLDB_INVALID_ADDRESS, + bitfield_bit_size, bitfield_bit_offset, exe_scope); } return 0; } |