summaryrefslogtreecommitdiffstats
path: root/lldb/source/Plugins/ObjectContainer
diff options
context:
space:
mode:
authorDavide Italiano <davide@freebsd.org>2018-11-12 19:08:19 +0000
committerDavide Italiano <davide@freebsd.org>2018-11-12 19:08:19 +0000
commit9a89d93d62525518faa518766b6fae4d14b26140 (patch)
treea65e0babe3bc9b0b1b0861aa2116784000b7a7c2 /lldb/source/Plugins/ObjectContainer
parent163107885339985f576afef02c76978d6b2a2401 (diff)
downloadbcm5719-llvm-9a89d93d62525518faa518766b6fae4d14b26140.tar.gz
bcm5719-llvm-9a89d93d62525518faa518766b6fae4d14b26140.zip
Revert "Extract construction of DataBufferLLVM into FileSystem"
It broke the lldb sanitizer bots. llvm-svn: 346694
Diffstat (limited to 'lldb/source/Plugins/ObjectContainer')
-rw-r--r--lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp b/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
index ae7409352c5..347870ec231 100644
--- a/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
+++ b/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
@@ -33,6 +33,7 @@ typedef struct ar_hdr {
#include "lldb/Host/FileSystem.h"
#include "lldb/Symbol/ObjectFile.h"
#include "lldb/Utility/ArchSpec.h"
+#include "lldb/Utility/DataBufferLLVM.h"
#include "lldb/Utility/Stream.h"
#include "lldb/Utility/Timer.h"
@@ -312,7 +313,7 @@ ObjectContainer *ObjectContainerBSDArchive::CreateInstance(
// file gets updated by a new build while this .a file is being used for
// debugging
DataBufferSP archive_data_sp =
- FileSystem::Instance().CreateDataBuffer(*file, length, file_offset);
+ DataBufferLLVM::CreateSliceFromPath(file->GetPath(), length, file_offset);
if (!archive_data_sp)
return nullptr;
@@ -467,7 +468,7 @@ size_t ObjectContainerBSDArchive::GetModuleSpecifications(
if (!archive_sp) {
set_archive_arch = true;
data_sp =
- FileSystem::Instance().CreateDataBuffer(file, file_size, file_offset);
+ DataBufferLLVM::CreateSliceFromPath(file.GetPath(), file_size, file_offset);
if (data_sp) {
data.SetData(data_sp, 0, data_sp->GetByteSize());
archive_sp = Archive::ParseAndCacheArchiveForFile(
OpenPOWER on IntegriCloud