diff options
author | Kevin Enderby <enderby@apple.com> | 2014-05-20 23:04:47 +0000 |
---|---|---|
committer | Kevin Enderby <enderby@apple.com> | 2014-05-20 23:04:47 +0000 |
commit | b38059ab25cdabc9bcf4819cd82ab5955e8d3e3e (patch) | |
tree | 0dbfaadf07612e99198e0c0499bb34f112856532 | |
parent | acf621545dace3f78904072f88fb05dd983dab2e (diff) | |
download | llvm-b38059ab25cdabc9bcf4819cd82ab5955e8d3e3e.tar.gz llvm-b38059ab25cdabc9bcf4819cd82ab5955e8d3e3e.tar.bz2 llvm-b38059ab25cdabc9bcf4819cd82ab5955e8d3e3e.tar.xz |
Update MachOObjectFile::getSymbolAddress so it returns UnknownAddressOrSize
for undefined symbols, so it matches what COFFObjectFile::getSymbolAddress
does. This allows llvm-nm to print spaces instead of 0’s for the value
of undefined symbols in Mach-O files.
To make this change other uses of MachOObjectFile::getSymbolAddress
are updated to handle when the Value is returned as UnknownAddressOrSize.
Which is needed to keep two of the ExecutionEngine tests working for example.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@209253 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/Object/MachOObjectFile.cpp | 20 | ||||
-rw-r--r-- | test/Object/nm-trivial-object.test | 8 | ||||
-rw-r--r-- | test/Object/nm-universal-binary.test | 2 |
3 files changed, 22 insertions, 8 deletions
diff --git a/lib/Object/MachOObjectFile.cpp b/lib/Object/MachOObjectFile.cpp index 0951460ccb..c6bab03d01 100644 --- a/lib/Object/MachOObjectFile.cpp +++ b/lib/Object/MachOObjectFile.cpp @@ -472,10 +472,18 @@ error_code MachOObjectFile::getSymbolAddress(DataRefImpl Symb, uint64_t &Res) const { if (is64Bit()) { MachO::nlist_64 Entry = getSymbol64TableEntry(Symb); - Res = Entry.n_value; + if ((Entry.n_type & MachO::N_TYPE) == MachO::N_UNDF && + Entry.n_value == 0) + Res = UnknownAddressOrSize; + else + Res = Entry.n_value; } else { MachO::nlist Entry = getSymbolTableEntry(Symb); - Res = Entry.n_value; + if ((Entry.n_type & MachO::N_TYPE) == MachO::N_UNDF && + Entry.n_value == 0) + Res = UnknownAddressOrSize; + else + Res = Entry.n_value; } return object_error::success; } @@ -501,6 +509,10 @@ error_code MachOObjectFile::getSymbolSize(DataRefImpl DRI, nlist_base Entry = getSymbolTableEntryBase(this, DRI); uint64_t Value; getSymbolAddress(DRI, Value); + if (Value == UnknownAddressOrSize) { + Result = UnknownAddressOrSize; + return object_error::success; + } BeginOffset = Value; @@ -519,6 +531,8 @@ error_code MachOObjectFile::getSymbolSize(DataRefImpl DRI, DataRefImpl DRI = Symbol.getRawDataRefImpl(); Entry = getSymbolTableEntryBase(this, DRI); getSymbolAddress(DRI, Value); + if (Value == UnknownAddressOrSize) + continue; if (Entry.n_sect == SectionIndex && Value > BeginOffset) if (!EndOffset || Value < EndOffset) EndOffset = Value; @@ -578,7 +592,7 @@ uint32_t MachOObjectFile::getSymbolFlags(DataRefImpl DRI) const { if ((MachOType & MachO::N_TYPE) == MachO::N_UNDF) { uint64_t Value; getSymbolAddress(DRI, Value); - if (Value) + if (Value && Value != UnknownAddressOrSize) Result |= SymbolRef::SF_Common; } } diff --git a/test/Object/nm-trivial-object.test b/test/Object/nm-trivial-object.test index 1117492898..20ac6621e7 100644 --- a/test/Object/nm-trivial-object.test +++ b/test/Object/nm-trivial-object.test @@ -55,14 +55,14 @@ WEAK-ELF64: 0000000000000000 V x2 ABSOLUTE-ELF64: 0000000000000123 a a1 ABSOLUTE-ELF64: 0000000000000123 A a2 -macho: 00000000 U _SomeOtherFunction +macho: U _SomeOtherFunction macho: 00000000 T _main -macho: 00000000 U _puts +macho: U _puts macho64: 0000000000000028 s L_.str -macho64: 0000000000000000 U _SomeOtherFunction +macho64: U _SomeOtherFunction macho64: 0000000000000000 T _main -macho64: 0000000000000000 U _puts +macho64: U _puts Test that nm uses addresses even with ELF .o files. diff --git a/test/Object/nm-universal-binary.test b/test/Object/nm-universal-binary.test index faf4812e53..c20c733dcd 100644 --- a/test/Object/nm-universal-binary.test +++ b/test/Object/nm-universal-binary.test @@ -13,7 +13,7 @@ CHECK-AR: 0000000000000068 s EH_frame0 CHECK-AR: 000000000000003b s L_.str CHECK-AR: 0000000000000000 T _main CHECK-AR: 0000000000000080 S _main.eh -CHECK-AR: 0000000000000000 U _printf +CHECK-AR: U _printf CHECK-AR: macho-universal-archive.x86_64.i386:i386:foo.o: CHECK-AR: 00000008 S _bar CHECK-AR: 00000000 T _foo |