This is an archive of the discontinued LLVM Phabricator instance.

Differential D57845

[llvm-ar] Remove leading slash when printing thin archive members
ClosedPublic

Authored by rupprecht on Feb 6 2019, 1:31 PM.

Details

Reviewers
ruiu
Commits
rGdb5036504ec5: [llvm-ar] Remove leading slash when printing thin archive members
rL353347: [llvm-ar] Remove leading slash when printing thin archive members

Diff Detail

Event Timeline

rupprecht created this revision.Feb 6 2019, 1:31 PM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 6 2019, 1:31 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B27838: Diff 185629.Feb 6 2019, 1:31 PM
rupprecht mentioned this in D57842: [llvm-ar][libObject] Fix relative paths when nesting thin archives..Feb 6 2019, 1:33 PM
ruiu accepted this revision.Feb 6 2019, 1:35 PM

LGTM

Thanks you for doing this!

llvm/test/tools/llvm-ar/print-thin-archive-path.test
11

Make sure that this file ends with a newline character.

This revision is now accepted and ready to land.Feb 6 2019, 1:35 PM
Closed by commit rL353347: [llvm-ar] Remove leading slash when printing thin archive members (authored by rupprecht). · Explain WhyFeb 6 2019, 1:52 PM
This revision was automatically updated to reflect the committed changes.
rupprecht marked an inline comment as done.

Revision Contents

PathSize
llvm/
test/
tools/
llvm-ar/
10 lines
tools/
llvm-ar/
5 lines

Diff 185629

llvm/test/tools/llvm-ar/print-thin-archive-path.test

  • This file was added.
RUN: mkdir -p %t/foo
RUN: touch %t/foo/a.txt
RUN: rm -f %t/foo/archive.a
RUN: cd %t && llvm-ar rcST foo/archive.a foo/a.txt
RUN: cd %t && llvm-ar t foo/archive.a | FileCheck %s --match-full-lines --check-prefix=PARENT-DIR
RUN: cd %t/foo && llvm-ar t archive.a | FileCheck %s --match-full-lines --check-prefix=CHILD-DIR
PARENT-DIR: foo/a.txt
CHILD-DIR: a.txt
No newline at end of file
ruiuUnsubmitted
Done
ReplyInline Actions

Make sure that this file ends with a newline character.

ruiu: Make sure that this file ends with a newline character.

llvm/tools/llvm-ar/llvm-ar.cpp

Show First 20 Lines • Show All 423 Lines • ▼ Show 20 Lines if (Verbose) {
// nanoseconds. // nanoseconds.
// TODO: fix format_provider<TimePoint<>> to allow other units. // TODO: fix format_provider<TimePoint<>> to allow other units.
sys::TimePoint<> ModTimeInNs = ModTimeOrErr.get(); sys::TimePoint<> ModTimeInNs = ModTimeOrErr.get();
outs() << ' ' << formatv("{0:%b %e %H:%M %Y}", ModTimeInNs); outs() << ' ' << formatv("{0:%b %e %H:%M %Y}", ModTimeInNs);
outs() << ' '; outs() << ' ';
} }
if (C.getParent()->isThin()) { if (C.getParent()->isThin()) {
outs() << sys::path::parent_path(ArchiveName); StringRef ParentDir = sys::path::parent_path(ArchiveName);
outs() << '/'; if (!ParentDir.empty())
outs() << ParentDir << '/';
} }
outs() << Name << "\n"; outs() << Name << "\n";
} }
// Implement the 'x' operation. This function extracts files back to the file // Implement the 'x' operation. This function extracts files back to the file
// system. // system.
static void doExtract(StringRef Name, const object::Archive::Child &C) { static void doExtract(StringRef Name, const object::Archive::Child &C) {
// Retain the original mode. // Retain the original mode.
▲ Show 20 Lines • Show All 606 Lines • Show Last 20 Lines