From 7f2f94faeb04e0f97990d9d941745a630aaa5a54 Mon Sep 17 00:00:00 2001
From: Rafael Espindola <rafael.espindola@gmail.com>
Date: Mon, 16 Jun 2014 16:41:00 +0000
Subject: [PATCH] Fix pr17056.

This makes llvm-nm ignore members that are not sufficiently aligned for
lib/Object to handle.

These archives are invalid. GNU AR is able to handle this, but in general
just warns about broken archive members.

We should probably start warning too, but for now just make sure llvm-nm
exits with an 0.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@211036 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Object/ELFObjectFile.cpp         |  10 +++++-----
 test/Object/Inputs/corrupt-archive.a | Bin 0 -> 2698 bytes
 test/Object/nm-archive.test          |   6 ++++++
 3 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 test/Object/Inputs/corrupt-archive.a

diff --git a/lib/Object/ELFObjectFile.cpp b/lib/Object/ELFObjectFile.cpp
index a11a9e016df..356288ffc51 100644
--- a/lib/Object/ELFObjectFile.cpp
+++ b/lib/Object/ELFObjectFile.cpp
@@ -36,7 +36,7 @@ ErrorOr<ObjectFile *> ObjectFile::createELFObjectFile(MemoryBuffer *Obj,
       R.reset(new ELFObjectFile<ELFType<support::little, 2, false> >(
           Obj, EC, BufferOwned));
     else
-      llvm_unreachable("Invalid alignment for ELF file!");
+      return object_error::parse_failed;
   else if (Ident.first == ELF::ELFCLASS32 && Ident.second == ELF::ELFDATA2MSB)
 #if !LLVM_IS_UNALIGNED_ACCESS_FAST
     if (MaxAlignment >= 4)
@@ -48,7 +48,7 @@ ErrorOr<ObjectFile *> ObjectFile::createELFObjectFile(MemoryBuffer *Obj,
       R.reset(new ELFObjectFile<ELFType<support::big, 2, false> >(Obj, EC,
                                                                   BufferOwned));
     else
-      llvm_unreachable("Invalid alignment for ELF file!");
+      return object_error::parse_failed;
   else if (Ident.first == ELF::ELFCLASS64 && Ident.second == ELF::ELFDATA2MSB)
 #if !LLVM_IS_UNALIGNED_ACCESS_FAST
     if (MaxAlignment >= 8)
@@ -60,7 +60,7 @@ ErrorOr<ObjectFile *> ObjectFile::createELFObjectFile(MemoryBuffer *Obj,
       R.reset(new ELFObjectFile<ELFType<support::big, 2, true> >(Obj, EC,
                                                                  BufferOwned));
     else
-      llvm_unreachable("Invalid alignment for ELF file!");
+      return object_error::parse_failed;
   else if (Ident.first == ELF::ELFCLASS64 && Ident.second == ELF::ELFDATA2LSB) {
 #if !LLVM_IS_UNALIGNED_ACCESS_FAST
     if (MaxAlignment >= 8)
@@ -72,10 +72,10 @@ ErrorOr<ObjectFile *> ObjectFile::createELFObjectFile(MemoryBuffer *Obj,
       R.reset(new ELFObjectFile<ELFType<support::little, 2, true> >(
           Obj, EC, BufferOwned));
     else
-      llvm_unreachable("Invalid alignment for ELF file!");
+      return object_error::parse_failed;
   }
   else
-    report_fatal_error("Buffer is not an ELF object file!");
+    llvm_unreachable("Buffer is not an ELF object file!");
 
   if (EC)
     return EC;
diff --git a/test/Object/Inputs/corrupt-archive.a b/test/Object/Inputs/corrupt-archive.a
new file mode 100644
index 0000000000000000000000000000000000000000..f8940ff6420c1d6c461cb4b656ec01cc61f5ce58
GIT binary patch
literal 2698
zcmcImOKTHR6uxPyjnzsmKB<c-6|G>#c_mGyNMdabS`~aEDCs1bl4_EX%v7oy1wjxu
zy7Payac7}|zeI4+je9}QH*;=!J4rT*2j+g~eCM3G?=v$s?{;d9i=)$(<>h<VE4Lq9
zuiPnJs!W^qY{4`OcEQ#(%didG$<5|1P0Kru1~H-*&C2MsdEVZ!HH~r&+jcB7zdP47
zjJ!jErjd(ZLb+jQ?b({!%=*>GUM<XqUJ&YDb2YnB$Y=A;%f;oTp;Rg@SW@DmNJ&G*
zp&g?bsYQ_yBcl9zJM-=GsbNrG(ELDSY)0^o9Oc(vGh1b^+4Qyhey3TVf?tTS7{q?U
zZs(*=Fpus===t?KmJ<rUSK*oN0nA}o{QTYHAR^s=hQuqAR1(v>Mi@Je5lkrWInD8y
z-Z<+joE*T5e%lj>mb=y#PuIgh-1b}E&9LEhme$*~aLsQEp@-f^DD;kBcSBbX!j7q%
zLT~$_r(d~oHyea*?FqTPrpuAR^H%6q1wvzNu%?di?{us)9_)!KMK<KRNMCYou*b-^
z67j2S%X7k}vf?pwlmPisY*qqEBv6fo3*(CpFUJ)aHyF!|dkB%6Vf#3vNvNKhSIloF
z5bJ|?B=hHpQ_p{q2l$Fn&WB&OYp&o*iTr@`J~3XCiHuBlSyUFYTWO-o;^b!y!<-vX
zS)5!h4)0r8tlrYn?P^eIX((eVM$tto3mI{@{Pz2!EwrD({@A8UpxBSLz+PEcxS-9@
zu|KOh`mAnIDK#x)&N8)`TV7o&yJ5^{t+NP+9F9SxUfdF?jq%jvfsxF68UwB<9tgHe
zln#!+8Cn?ITcQ9m;hP6f5*=gdzqaFl7`vmg*3Dmv{dE5Z-9x^oxX(hb27%CPeyioR
z>6Z7s)?TBs+HqSR_x5ivN$J>vXwJ&3imXp598~qXz=j|B>M;giN7F}=`DZ8w>-)F)
z=O`Eb8}z6m`_HN*>4=3$%qe>0;O2vBD7ws()KyZzsbv7Zk7!6_DT%F}5+LnGQj%)|
zUm5iR7=zeHh&@V{kVC{J*A6M;JkUEZ6iJT1-`Ej8!-L9j!YFYVL$ZHx{rWd}{71;I
zO0s{|r|O9NpPz8dW2k!ycAx)rRIJs}#Cp2tmPo#L2M>@7zX<YP$xj~;JU(3z`~pQ1
j{hHN8)$NE?-;e(R$f3pF=zOVXteD_sKPw4d_A~ki>Mh_$

literal 0
HcmV?d00001

diff --git a/test/Object/nm-archive.test b/test/Object/nm-archive.test
index fbbf051b478..d875d6c991c 100644
--- a/test/Object/nm-archive.test
+++ b/test/Object/nm-archive.test
@@ -33,3 +33,9 @@ RUN: llvm-nm -s %p/Inputs/archive-test.a-gnu-minimal
 
 Don't reject an empty archive.
 RUN: llvm-nm %p/Inputs/archive-test.a-empty
+
+This archive has an unaligned member and a unknown format member.
+GNU AR is able to parse the unaligned member and warns about the member with
+the unknown format. We should probably simply warn on both. For now just check
+that we don't produce an error.
+RUN: llvm-nm %p/Inputs/corrupt-archive.a
-- 
2.34.1