This is an archive of the discontinued LLVM Phabricator instance.

Differential D62866

Print dylib load kind (weak, reexport, etc) in llvm-objdump -m -dylibs-used
ClosedPublic

Authored by mtrent on Jun 4 2019, 10:15 AM.

Details

Reviewers
pete
lhames
Commits
rGc2885ded2b1e: Print dylib load kind (weak, reexport, etc) in llvm-objdump -m -dylibs-used
rL363746: Print dylib load kind (weak, reexport, etc) in llvm-objdump -m -dylibs-used
Summary

Historically llvm-objdump prints the path to a dylib as well as the
dylib's compatibility version and current version number. This change
extends this information by adding the kind of dylib load: weak,
reexport, etc.

rdar://51383512

Diff Detail

Event Timeline

mtrent created this revision.Jun 4 2019, 10:15 AM
Herald added a project: Restricted Project. · View Herald TranscriptJun 4 2019, 10:15 AM
Herald added a subscriber: rupprecht. · View Herald Transcript
Harbormaster completed remote builds in B32885: Diff 202974.Jun 4 2019, 10:15 AM
mtrent updated this revision to Diff 202975.Jun 4 2019, 10:17 AM

Trim unused space from the macho-dylib.test file.

Harbormaster completed remote builds in B32886: Diff 202975.Jun 4 2019, 10:20 AM
pete accepted this revision.Jun 5 2019, 7:21 AM

LGTM.

This revision is now accepted and ready to land.Jun 5 2019, 7:21 AM
Closed by commit rL363746: Print dylib load kind (weak, reexport, etc) in llvm-objdump -m -dylibs-used (authored by mtrent). · Explain WhyJun 18 2019, 3:16 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
test/
tools/
llvm-objdump/
X86/
14 lines
tools/
llvm-objdump/
11 lines

Diff 202974

test/tools/llvm-objdump/X86/macho-dylib.test

RUN: llvm-objdump -m -dylibs-used %p/Inputs/hello.exe.macho-x86_64 | FileCheck %s -check-prefix=USED RUN: llvm-objdump -m -dylibs-used %p/Inputs/dylibLoadKinds.macho-x86_64 | FileCheck %s -check-prefix=USED
RUN: llvm-objdump -m -dylib-id %p/Inputs/dylibLoadKinds.macho-x86_64 | FileCheck %s -check-prefix=ID USED: /usr/lib/foo1.dylib (compatibility version 0.0.0, current version 0.0.0)
RUN: llvm-objdump -m -dylib-id -no-leading-headers %p/Inputs/dylibLoadKinds.macho-x86_64 | FileCheck %s -check-prefix=IDNOHEADERS USED: /usr/lib/foo2.dylib (compatibility version 0.0.0, current version 0.0.0, weak)
USED: /usr/lib/foo3.dylib (compatibility version 0.0.0, current version 0.0.0, reexport)
USED: /usr/lib/foo4.dylib (compatibility version 0.0.0, current version 0.0.0, lazy)
USED: /usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1197.1.1) USED: /usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1197.1.1)
RUN: llvm-objdump -m -dylib-id %p/Inputs/dylibLoadKinds.macho-x86_64 | FileCheck %s -check-prefix=ID
ID: /usr/lib/foo.dylib ID: /usr/lib/foo.dylib
RUN: llvm-objdump -m -dylib-id -no-leading-headers %p/Inputs/dylibLoadKinds.macho-x86_64 | FileCheck %s -check-prefix=IDNOHEADERS
IDNOHEADERS-NOT: dylibLoadKinds.macho-x86_64: IDNOHEADERS-NOT: dylibLoadKinds.macho-x86_64:
IDNOHEADERS: /usr/lib/foo.dylib IDNOHEADERS: /usr/lib/foo.dylib

tools/llvm-objdump/MachODump.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 1,200 Lines • ▼ Show 20 Lines if ((JustId && Load.C.cmd == MachO::LC_ID_DYLIB) ||
outs() << "\t" << p; outs() << "\t" << p;
outs() << " (compatibility version " outs() << " (compatibility version "
<< ((dl.dylib.compatibility_version >> 16) & 0xffff) << "." << ((dl.dylib.compatibility_version >> 16) & 0xffff) << "."
<< ((dl.dylib.compatibility_version >> 8) & 0xff) << "." << ((dl.dylib.compatibility_version >> 8) & 0xff) << "."
<< (dl.dylib.compatibility_version & 0xff) << ","; << (dl.dylib.compatibility_version & 0xff) << ",";
outs() << " current version " outs() << " current version "
<< ((dl.dylib.current_version >> 16) & 0xffff) << "." << ((dl.dylib.current_version >> 16) & 0xffff) << "."
<< ((dl.dylib.current_version >> 8) & 0xff) << "." << ((dl.dylib.current_version >> 8) & 0xff) << "."
<< (dl.dylib.current_version & 0xff) << ")\n"; << (dl.dylib.current_version & 0xff);
if (Load.C.cmd == MachO::LC_LOAD_WEAK_DYLIB)
outs() << ", weak";
if (Load.C.cmd == MachO::LC_REEXPORT_DYLIB)
outs() << ", reexport";
if (Load.C.cmd == MachO::LC_LOAD_UPWARD_DYLIB)
outs() << ", upward";
if (Load.C.cmd == MachO::LC_LAZY_LOAD_DYLIB)
outs() << ", lazy";
outs() << ")\n";
} }
} else { } else {
outs() << "\tBad offset (" << dl.dylib.name << ") for name of "; outs() << "\tBad offset (" << dl.dylib.name << ") for name of ";
if (Load.C.cmd == MachO::LC_ID_DYLIB) if (Load.C.cmd == MachO::LC_ID_DYLIB)
outs() << "LC_ID_DYLIB "; outs() << "LC_ID_DYLIB ";
else if (Load.C.cmd == MachO::LC_LOAD_DYLIB) else if (Load.C.cmd == MachO::LC_LOAD_DYLIB)
outs() << "LC_LOAD_DYLIB "; outs() << "LC_LOAD_DYLIB ";
else if (Load.C.cmd == MachO::LC_LOAD_WEAK_DYLIB) else if (Load.C.cmd == MachO::LC_LOAD_WEAK_DYLIB)
▲ Show 20 Lines • Show All 9,172 Lines • Show Last 20 Lines