From 1a0afd82b1f5e1f4e31f58f5323f5032d24be86c Mon Sep 17 00:00:00 2001
From: Nick Kledzik <kledzik@apple.com>
Date: Tue, 14 Oct 2014 23:29:38 +0000
Subject: [PATCH] [llvm-objdump] Update error message and add test case for
 mach-o file with bad library ordinals

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@219746 91177308-0d34-0410-b5e6-96231b3b80d8
---
 .../llvm-objdump/Inputs/bad-ordinal.macho-x86_64 | Bin 0 -> 8496 bytes
 test/tools/llvm-objdump/macho-bad-ordinal.test   |   6 ++++++
 tools/llvm-objdump/MachODump.cpp                 |   2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100755 test/tools/llvm-objdump/Inputs/bad-ordinal.macho-x86_64
 create mode 100644 test/tools/llvm-objdump/macho-bad-ordinal.test

diff --git a/test/tools/llvm-objdump/Inputs/bad-ordinal.macho-x86_64 b/test/tools/llvm-objdump/Inputs/bad-ordinal.macho-x86_64
new file mode 100755
index 0000000000000000000000000000000000000000..3ab622781b852ba1386f5e1a96ed7f7a84089ec6
GIT binary patch
literal 8496
zcmeHMO=uHA6rOF>MjP!~iug~gR;of<!GqursWg~k(f$b{$e6TS6HU^PA8b9P6oo2<
z3ZC@h(Tm{4yP%-r!Hb>*@uF1GgSS$|_<g&x%_OzGi}T=R=9~BC&6{s$V6*S-;*Z}A
zLRj@el<I^KHg&BKH$@0NA+|xIP$~PnPe(3B2G4P{TC8gLSHw8&SU}3*$c5o*7k54v
z)<t3DCXkL;r)*LdoQXoku{K_~37diWpmHHzQ*kFK=}^jip%~9E4b{fGs^a<U``Dil
zQ1N`b7f&XfRMyGCsWx6##oMj|5R>;MS(e{OzK~01t|*7vc(+wN@<bulr7AWIQWi7U
zlbKPO%#4k@xcYhAQ}OuBDa5rgJd5`$rIV0jxmeoqado^;D&AH#i5O>XMd3M_hf3Mg
zJ>0Fi;XG8G6aTzu=Y(<nT&2vUWPUOoA5Y0_A-7^YKMW7Po)@2|yPirx%2aH%csAzK
zKcM`H^>}<fI<DNSzTUHEB0atSoe0(J6PVJal3^S@uU6dKE;@v~wF78<uH9i^q$0Y|
z(vSSm{s@@&Vgc<@w2jbys4n#NRUg;;^P!sirHq@<!X$#w&SE~-nM%exM<-LGz?2<O
z=F#}`!~4BYPrkWz|G}Mi-%3;aFvfhv`VFq~9=n)hkap~s^LVdy;X2$0ZOqxS9%Fk}
zWo@iKG?_0r>5fw!$Rint6J$S>@h^uw{thUd0Hz#*(oP&kYs4^M7%&VN1`Gp+0mFb{
z;Qwaee01h>bo#p;ojq|3OuUTzA|Fr0{6;i~U(ZAqW?n_7U)YzPm)jm<sBd=HT{PW8
z<+drba|!&2uV2dLGX65A#_`hYz2EO-2coxpujPC15wz56>K&MU{<jF?eb<I6aXT#v
z)ZZ8s)`V@@!G^%xl8f(JX-kN?in-!wdWHeRfMLKeU>GnA7zPXjh5^HXVZbn87%&X{
zGYo8QwFj7NbC|_Bw-_$ts1KufJ&+S~B4;;;WfleK!Wa<5lBmbm$#g<G6V6Dn;GotW
zqx+t8ESV8){76wRp6#YD#P2MA46=-W9O{2wXu%j=P||b9SaRj;My*r_=#@=rXtKOY
rAOmc1vG+ZMnBPgz(#;jt5q0dP<(k6mhfon-z6a^<!QbyPMlkOWX*$Yz

literal 0
HcmV?d00001

diff --git a/test/tools/llvm-objdump/macho-bad-ordinal.test b/test/tools/llvm-objdump/macho-bad-ordinal.test
new file mode 100644
index 00000000000..16badcc878d
--- /dev/null
+++ b/test/tools/llvm-objdump/macho-bad-ordinal.test
@@ -0,0 +1,6 @@
+# RUN: llvm-objdump -macho -bind -lazy-bind %p/Inputs/bad-ordinal.macho-x86_64 \
+# RUN:   | FileCheck %s 
+
+
+# CHECK: __DATA   __nl_symbol_ptr    0x100001000 pointer         0 <<bad library ordinal>> dyld_stub_binder
+# CHECK: __DATA   __la_symbol_ptr    0x100001010 <<bad library ordinal>> _printf
diff --git a/tools/llvm-objdump/MachODump.cpp b/tools/llvm-objdump/MachODump.cpp
index f4cd08b039f..c881ccd874f 100644
--- a/tools/llvm-objdump/MachODump.cpp
+++ b/tools/llvm-objdump/MachODump.cpp
@@ -2802,7 +2802,7 @@ static StringRef ordinalName(const object::MachOObjectFile *Obj, int Ordinal) {
       std::error_code EC = Obj->getLibraryShortNameByIndex(Ordinal-1, 
                                                            DylibName);
       if (EC)
-        return "<<ordinal too big>>";
+        return "<<bad library ordinal>>";
       return DylibName;
     }
   }