This is an archive of the discontinued LLVM Phabricator instance.

Differential D18666

Object: Correctly read thin archives containing absolute paths.
ClosedPublic

Authored by pcc on Mar 31 2016, 12:47 PM.

Details

Reviewers
• rafael
Commits
rGf84646cd9585: Object: Correctly read thin archives containing absolute paths.
rL265065: Object: Correctly read thin archives containing absolute paths.

Diff Detail

Event Timeline

pcc updated this revision to Diff 52263.Mar 31 2016, 12:47 PM
pcc retitled this revision from to Object: Correctly read thin archives containing absolute paths..
pcc updated this object.
pcc added a reviewer: • rafael.
pcc added a subscriber: llvm-commits.
pcc added a child revision: D18669: ELF: Correctly handle --whole-archive for thin archives..Mar 31 2016, 2:16 PM
• rafael accepted this revision.Mar 31 2016, 2:42 PM
• rafael edited edge metadata.

LGTM

This revision is now accepted and ready to land.Mar 31 2016, 2:42 PM
Closed by commit rL265065: Object: Correctly read thin archives containing absolute paths. (authored by pcc). · Explain WhyMar 31 2016, 3:14 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
Object/
11 lines
test/
Object/
5 lines

Diff 52263

lib/Object/Archive.cpp

Show First 20 Lines • Show All 140 Lines • ▼ Show 20 Lines if (!isThinMember()) {
ErrorOr<uint32_t> Size = getSize(); ErrorOr<uint32_t> Size = getSize();
if (std::error_code EC = Size.getError()) if (std::error_code EC = Size.getError())
return EC; return EC;
return StringRef(Data.data() + StartOfFile, Size.get()); return StringRef(Data.data() + StartOfFile, Size.get());
} }
ErrorOr<StringRef> Name = getName(); ErrorOr<StringRef> Name = getName();
if (std::error_code EC = Name.getError()) if (std::error_code EC = Name.getError())
return EC; return EC;
SmallString<128> FullName = sys::path::parent_path( SmallString<128> FullName;
if (sys::path::is_absolute(*Name))
FullName = *Name;
else {
FullName = sys::path::parent_path(
Parent->getMemoryBufferRef().getBufferIdentifier()); Parent->getMemoryBufferRef().getBufferIdentifier());
sys::path::append(FullName, *Name); sys::path::append(FullName, *Name);
}
ErrorOr<std::unique_ptr<MemoryBuffer>> Buf = MemoryBuffer::getFile(FullName); ErrorOr<std::unique_ptr<MemoryBuffer>> Buf = MemoryBuffer::getFile(FullName);
if (std::error_code EC = Buf.getError()) if (std::error_code EC = Buf.getError())
return EC; return EC;
Parent->ThinBuffers.push_back(std::move(*Buf)); Parent->ThinBuffers.push_back(std::move(*Buf));
return Parent->ThinBuffers.back()->getBuffer(); return Parent->ThinBuffers.back()->getBuffer();
} }
ErrorOr<Archive::Child> Archive::Child::getNext() const { ErrorOr<Archive::Child> Archive::Child::getNext() const {
▲ Show 20 Lines • Show All 451 Lines • Show Last 20 Lines

test/Object/archive-thin-read.test

  • This file was added.
RUN: echo hello > %t.file
RUN: llvm-ar rcsT %t.a %t.file
RUN: llvm-ar p %t.a | FileCheck %s
CHECK: hello