From 74a628f776edb588bff8f8f5cc16eac947c9d631 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sun, 16 Apr 2017 16:04:10 +0000 Subject: Vendor import of lldb trunk r300422: https://llvm.org/svn/llvm-project/lldb/trunk@300422 --- unittests/Process/minidump/MinidumpParserTest.cpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'unittests/Process/minidump/MinidumpParserTest.cpp') diff --git a/unittests/Process/minidump/MinidumpParserTest.cpp b/unittests/Process/minidump/MinidumpParserTest.cpp index 83225e88ee03c..755095f75918f 100644 --- a/unittests/Process/minidump/MinidumpParserTest.cpp +++ b/unittests/Process/minidump/MinidumpParserTest.cpp @@ -19,13 +19,15 @@ #include "gtest/gtest.h" #include "lldb/Core/ArchSpec.h" -#include "lldb/Core/DataExtractor.h" -#include "lldb/Host/FileSpec.h" #include "lldb/Target/MemoryRegionInfo.h" +#include "lldb/Utility/DataBufferLLVM.h" +#include "lldb/Utility/DataExtractor.h" +#include "lldb/Utility/FileSpec.h" #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/Optional.h" #include "llvm/Support/FileSystem.h" +#include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/Path.h" // C includes @@ -46,14 +48,15 @@ public: llvm::sys::path::append(inputs_folder, "Inputs"); } - void SetUpData(const char *minidump_filename, size_t load_size = SIZE_MAX) { + void SetUpData(const char *minidump_filename, + uint64_t load_size = UINT64_MAX) { llvm::SmallString<128> filename = inputs_folder; llvm::sys::path::append(filename, minidump_filename); - FileSpec minidump_file(filename.c_str(), false); - lldb::DataBufferSP data_sp( - minidump_file.MemoryMapFileContents(0, load_size)); + + auto BufferPtr = DataBufferLLVM::CreateSliceFromPath(filename, load_size, 0); + llvm::Optional optional_parser = - MinidumpParser::Create(data_sp); + MinidumpParser::Create(BufferPtr); ASSERT_TRUE(optional_parser.hasValue()); parser.reset(new MinidumpParser(optional_parser.getValue())); ASSERT_GT(parser->GetData().size(), 0UL); @@ -450,4 +453,4 @@ TEST_F(MinidumpParserTest, ConvertMinidumpContext_x86_32_wow64) { REG_VAL32(buf->GetBytes() + reg_info[reg_index].byte_offset)); } } -} \ No newline at end of file +} -- cgit v1.2.3