maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Make YAML files own MemoryBuffer. 

YAML files have references such as StringRef to the underlying
MemoryBuffer, so we shouldn't deallocate the buffer.

llvm-svn: 224191
This commit is contained in:
Rui Ueyama 2014-12-13 08:59:50 +00:00
parent ecf28e25de
commit a60a75e566
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp
View File

@ -1327,11 +1327,6 @@ public:
std::error_code
parseFile(std::unique_ptr<MemoryBuffer> mb, const class Registry &,
std::vector<std::unique_ptr<File>> &result) const override {
// Note: we do not store the unique pointer to the MemoryBuffer,
// so the buffer will be deallocated at end of this function.
// That's OK since the YAML file contents are parsed and consumed
// in this function.
// Create YAML Input Reader.
YamlContext yamlContext;
yamlContext._registry = &_registry;
@ -1346,10 +1341,12 @@ public:
if (yin.error())
return make_error_code(lld::YamlReaderError::illegal_value);
std::shared_ptr<MemoryBuffer> smb(mb.release());
for (const File *file : createdFiles) {
// Note: parseFile() should return vector of *const* File
File *f = const_cast<File *>(file);
f->setLastError(std::error_code());
f->setSharedMemoryBuffer(smb);
result.emplace_back(f);
}
return make_error_code(lld::YamlReaderError::success);