RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2024-12-03 01:12:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "llvm-dwp: Keep ObjectFiles alive until object emission their contents can be referenced directly rather than copied"

Browse Source 
Accidentally committed.

This reverts commit r262389.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@262395 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Blaikie 2016-03-01 21:24:04 +00:00
parent e0accec873
commit c9b39e6bdd
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/llvm-dwp/llvm-dwp.cpp
View File

@ -358,17 +358,11 @@ static std::error_code write(MCStreamer &Out, ArrayRef<std::string> Inputs) {
uint32_t ContributionOffsets[8] = {};
SmallVector<OwningBinary<object::ObjectFile>, 128> Objects;
Objects.reserve(Inputs.size());
for (const auto &Input : Inputs) {
auto ErrOrObj = object::ObjectFile::createObjectFile(Input);
if (!ErrOrObj)
return ErrOrObj.getError();
Objects.push_back(std::move(*ErrOrObj));
auto &Obj = *Objects.back().getBinary();
UnitIndexEntry CurEntry = {};
StringRef CurStrSection;
@ -381,7 +375,7 @@ static std::error_code write(MCStreamer &Out, ArrayRef<std::string> Inputs) {
SmallVector<SmallString<32>, 4> UncompressedSections;
for (const auto &Section : Obj.sections()) {
for (const auto &Section : ErrOrObj->getBinary()->sections()) {
if (Section.isBSS())
continue;
if (Section.isVirtual())
@ -458,7 +452,8 @@ static std::error_code write(MCStreamer &Out, ArrayRef<std::string> Inputs) {
if (!CurCUIndexSection.empty()) {
DWARFUnitIndex CUIndex(DW_SECT_INFO);
DataExtractor CUIndexData(CurCUIndexSection, Obj.isLittleEndian(), 0);
DataExtractor CUIndexData(CurCUIndexSection,
ErrOrObj->getBinary()->isLittleEndian(), 0);
if (!CUIndex.parse(CUIndexData))
return make_error_code(std::errc::invalid_argument);
@ -496,7 +491,8 @@ static std::error_code write(MCStreamer &Out, ArrayRef<std::string> Inputs) {
if (CurTUIndexSection.empty())
return make_error_code(std::errc::invalid_argument);
DWARFUnitIndex TUIndex(DW_SECT_TYPES);
DataExtractor TUIndexData(CurTUIndexSection, Obj.isLittleEndian(), 0);
DataExtractor TUIndexData(CurTUIndexSection,
ErrOrObj->getBinary()->isLittleEndian(), 0);
if (!TUIndex.parse(TUIndexData))
return make_error_code(std::errc::invalid_argument);
addAllTypesFromDWP(Out, TypeIndexEntries, TUIndex, TypesSection,
@ -541,7 +537,7 @@ static std::error_code write(MCStreamer &Out, ArrayRef<std::string> Inputs) {
writeIndex(Out, MCOFI.getDwarfCUIndexSection(), ContributionOffsets,
IndexEntries);
Out.Finish();
return std::error_code();
}
@ -612,4 +608,6 @@ int main(int argc, char **argv) {
if (auto Err = write(*MS, InputFiles))
return error(Err.message(), "Writing DWP file");
MS->Finish();
}