From 54a3f636d86a21c8cc08bff63e2735d7e9ac3e2a Mon Sep 17 00:00:00 2001
From: Adrian Prantl <aprantl@apple.com>
Date: Wed, 23 Sep 2015 20:44:37 +0000
Subject: [PATCH] dsymutil: Don't prune forward declarations inside a module
 definition.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@248428 91177308-0d34-0410-b5e6-96231b3b80d8
---
 test/tools/dsymutil/Inputs/modules/1.o     | Bin 2392 -> 2392 bytes
 test/tools/dsymutil/Inputs/modules/Bar.pcm | Bin 25532 -> 25636 bytes
 test/tools/dsymutil/Inputs/modules/Foo.pcm | Bin 25464 -> 25464 bytes
 test/tools/dsymutil/X86/modules.m          |  11 ++++++++---
 tools/dsymutil/DwarfLinker.cpp             |  15 +++++++++------
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/test/tools/dsymutil/Inputs/modules/1.o b/test/tools/dsymutil/Inputs/modules/1.o
index 254ae692a8e8068815d47a18711e9df7c6b8889e..e7a52931b9f83c7b521e7ff4819e568de87dff34 100644
GIT binary patch
delta 164
zcmca1bVF!@gP;Km0~maO(gqs?|1&er*c`~B!{lMhz`_`+4U}hvC}Loc12P!H6M!UB
zSU-?tW13iziOeg=1M{W<Np_}*85JO2_~fH(9z1bCrYjIjI!iQ6mSmUXsfG%ad7jML
a?9A@U$QU)blOvGnD#PU494?a;I4uAUTpqRn

delta 163
zcmca1bVF!@gP=YO0~maO()t?%|1&dA-yF!I!{njKz`|&#4U}hvC}Loc12P!H6M!U>
zQ9qDmW13iziOeg=1M{W<Np_}*85JO&@#Ldy9z3x?rYjJ)i*CC)S(06jrwS_2xvTNS
aW@mO+M#jj=og9IThLi7bxJ;Jkv;+X+;2#wL

diff --git a/test/tools/dsymutil/Inputs/modules/Bar.pcm b/test/tools/dsymutil/Inputs/modules/Bar.pcm
index 8d3a534667cda76d1c8b0dde1741b70323d73060..bd77ec55826a6192df9abdc52454c6eb4276ede4 100644
GIT binary patch
delta 967
zcmZ9LT}V@L6u{5f?$+k6`_yGQbb_q8{FtUiTANCeieITC3f<LBMNP~^lL#uch<vE@
zP)5|7<V(`S5<&*0(1$%l27v}aJtdJKJqZ<d?z|dw;QY_IzjN;S|Ih#28-0yaZ}4`p
z)ha<u)`cx=mB#CD#_O8@Q8mpA$)rQ4Wt-}@g0Mk{(Qh>?xlIa%5RIYF(xc#Q+C(ep
z-=Pf(ZlVm8-|}3^J*m(qbV22}+JoEgZdq-Z-l}{%I9-V{-mCUm3zh6`><Lph<KTa|
zCQNf`pJhbB9ZHdY(hGjeszN;qU8YmQp*W!p0GTATMeYmbZq1Lt-Ic<~x6C<Am>3>v
zeNl;}t^L`ZoRPkP`3p3gU1XRS0Y-IV+G+PN{mQP;I5=vgk{lb(MFKh35l!^jn}Vju
zZ?6e2<Ksl{fh!-*XnOzHi#P4{W?@v?-`N2?lY5WSbnm~;B(By)XF~v97k0i%2P2mo
z5zTHP?x>1gS#&+!2sc<q5@cSc-olVHEqBv}@RIE~+X&mAY(tF}cfOuu&RqcUY>jj-
zFITe(P6V3H%ff4sk9oH;T=`R#VvAYM<2?tQNjhynfF+N4tQX-OYfB%(mne-j^~D`a
z)`8if<=lzpQtR?;#YH=q7Wq+@s6kDQ%~xq%6381YCueSBYADm}e!8RqShvM;5RP#N
zA~)VpRt51i8T6oq7J~cGM&E;JxSK>N8TI6roR~-zQfh$;*7)oqsG+M3_QZ++$agYR
zFqtNT0qXh(d)uqqYt9Y;_Zbr-U6Sl*pgU5L(G(;6MHjOpjt|@Te9w#ydESZ?A^!lb
z+yJ8yhkUhzJlmM`$?GT9GLC6jAF}UaE00Gaed~sPXLs6cElIS2+IWNysZD3cXD}Ez
zuYsyUDZ=@R#ct{iB{{N$;|yzAF`J8?U<b6-yl4cV`A{9Lg@&+}+QSFwLD=~hfEc{J

delta 954
zcmZ9LUr5tY6vxlq?>F7tZ@S<7la;y+#LY1+ml&aKb1BslX=V@p+2(!|QPU<<p`Owu
zL<W`}3W|gx9}*O#Wr+zXJtRd&^bkozNKr3^FGW#S_ijH8JaF!p^Ev09%RQGnzC`Aq
zkV`K8gdgIz#wT>bKUz1Uoo)V4Ib7s-qKX*B4XR2c;STO2PW^&h>y_zr5Qm9F6n%0m
z3&A(Uxk){nv{2y`o8;O$nI6H@3a5T*ONTKDpDG-iIA1QNcn9auzm%&t@S=pB6o1=-
zKT0^qImGSqwcF$-YE<)1@r+EZG7Vz`zc=MZ2!K#B8H!!!4_TCTE4kiC?2~PdWOSM?
zG%a|DI~XZ$rxp3&Hax(Y;&RQD0B}|%m>MmW_^bG^D19*Ac2{^g);M?z;C{@v>m0G9
z(hzF^au}yZVE+55DJ9UyU?;LPxTqrun$cMD{IWg0t#UGR_nv{(6Uvjnvs{0&YF_F1
z&$`zseU{b65`b)kQo123=q!B7e%6E;|Ez;RG=s5fMFN3tf?ji>oxluLFU?E!qNP+x
zvpN7RUbB}dISz~jU)YPtmDsxdVqrnmc%#rl)2t-gXUtY59p~YZRp;p@FhboJCUEm1
z-fiwl8Zv{cCmU@(x4wHAtyz#ZBOl!GR)GV)A)NNzG)Oj`<(`)wx~7k32~>3w5a<Ao
zRo8$9AN#E&4Zr%$M8vFsDK}H@kxZ4q)!LuD07-D5E7;o$$ygsSl63437>Wpd(E{zm
zK}RcWlQ*%O6NtPEm<3S7(MY&2913@V8s7)XwX~d?Dn4$_=wLclw9IPP<1n%0utz8=
zqa%&xutD}~<YX7q73u{vH%2v?DtkH?HUxiQv*Z-=flGC0G;BvLPD^>V^K*ksGyp{<
jU8<=&sdFsgNgjWYD*GYCKo=$cm6nMImqTU9wVM6`YuUBu

diff --git a/test/tools/dsymutil/Inputs/modules/Foo.pcm b/test/tools/dsymutil/Inputs/modules/Foo.pcm
index 33bca2a6547bb8f58f7863ac0247591ad88ba877..a715bfaa7f21fb09386dfab1a983b06a5ba4fbd9 100644
GIT binary patch
delta 536
zcmexyjPb`Y#tn~jSc_!ZoC795*D>W!Tst9=?bjmCb&Y#Z8AY>i*4CZODBLKQc)*L%
zEk9o`gMooT<p-n5p~)BZx&;M*JY^sj1Y#K=7Mh%^FU_dGxl?}~V|~LluMJHNtP9tQ
zT4;Y*vre>Oy{H0f<Ao{Pn6lUc)~{t?;PL1<kdwg7&~S4Givtq_LlcjH1`C%hGteL)
zkAcT2nUNtCi2H!JNdzS43X%h1i3M5=4A&DG84dvHkR(QiGeG((kWLB_)G*-%sxaVY
zU;sG}<TRnl2MrBb|1&5sGEDw%sLR;8S=FdtQ_N(E7f%96jRDZ^5(Nnkwon#^OOsDU
zH!{jk_KEQlnsnFllo$j5DWDP%_`<<Fc|}al<d#^E$q!-*CZCCwW8|IuI#!EOaI#pO
zI-~GpyEsKg@yQ8s;<C~ZEet|Hnvr3e-%l1E1~vxgoW$Z{2F}S-;uNGrp(@zGD&7L!
z%megVW(tGk<a2RyjNFso#;Hn!T+hg0Z{p#_0hEr94|9xn3~~>Sk7wZDtQ#-I$jGzV
zBcY1XLDE^G0c0MNBam<fVtXKF4h0hKK+I^%;tix280{FCKzx`2RuG4UfsM&#GE<T=
OOPS}%tj(H9{)_;sM|-pY

delta 536
zcmexyjPb`Y#tn~jSpBx8l$T9@u4Brdy!M0bv;K0<b&g)UmA&{jYwJ#C6jtnxKH$aZ
zmY=Ve!N9<v!r&yoeey-UZb5z^PZ@{>fLI2I1t;g~OEWrd?$lq$Sij(!*M_DB)`x3F
zO|&1pStoj6y{H0f<AFKbn$p<<Hm+r0;PGfUkdwg7&~S4Givkk^LlcjH1`C%hGteML
zAm(vOW@JbO;yxg55&_A%g5-cI86*~IF)&<DWMnu5q(hPz8O{Oet3Wy_L{P(o7pTI3
zn}Gr3Jdo1_Cm%F4WMyV%P+*+=-B6ct>Sk4=eoZl#B~d&HAbA6z-6aYV9BiR13|A(f
zif&|-n(PzfCG>8?xesCt{HK6QKp^rC)8rK~Ig<@y3nq)idQ3hOE62z^`E{%oBmZQv
zICVzB$#!vyjG~hh;>2YoAzBy&fixq-G{2uLJPd3M&N+$2#SH9|r^G2p2}4z|fmOT(
zx|xT8nISWUL45MLI5|en$#3ISr9rM^WUx2!@ZtbU$H#{`#ybYN2gk=V@NU+Pmtth(
z-t3W3#puv3y6q;&JSImV;R?j|K+GHpB;0|RQIo|RNHH*KF))GnFa@k24hsVtlg4DG
RBxRP)U5zI;YbN<K0svLReIEb-

diff --git a/test/tools/dsymutil/X86/modules.m b/test/tools/dsymutil/X86/modules.m
index 0e82c999d78..63d628baa5a 100644
--- a/test/tools/dsymutil/X86/modules.m
+++ b/test/tools/dsymutil/X86/modules.m
@@ -9,8 +9,8 @@
        export *
      }
    EOF
-   clang -D BAR_H -E -o Bar.h
-   clang -D FOO_H -E -o Foo.h
+   clang -D BAR_H -E -o Bar.h modules.m
+   clang -D FOO_H -E -o Foo.h modules.m
    clang -cc1 -emit-obj -fmodules -fmodule-map-file=modules.modulemap \
      -fmodule-format=obj -g -dwarf-ext-refs -fmodules-cache-path=. \
      -fdisable-module-hash modules.m -o 1.o
@@ -32,17 +32,22 @@
 // CHECK-NOT:        DW_TAG
 // CHECK:              DW_TAG_module
 // CHECK-NEXT:           DW_AT_name{{.*}}"Bar"
-// CHECK-NOT:            DW_TAG
 // CHECK: 0x0[[BAR:.*]]: DW_TAG_structure_type
+// CHECK-NOT:              DW_TAG
 // CHECK:                  DW_AT_name {{.*}}"Bar"
 // CHECK-NOT:              DW_TAG
 // CHECK:                  DW_TAG_member
 // CHECK:                    DW_AT_name {{.*}}"value"
+// CHECK:                DW_TAG_structure_type
+// CHECK-NOT:              DW_TAG
+// CHECK:                  DW_AT_name {{.*}}"PruneMeNot"
 
 struct Bar {
   int value;
 };
 
+struct PruneMeNot;
+
 #else
 // ---------------------------------------------------------------------
 #ifdef FOO_H
diff --git a/tools/dsymutil/DwarfLinker.cpp b/tools/dsymutil/DwarfLinker.cpp
index 818746dabeb..1aa15c5fb67 100644
--- a/tools/dsymutil/DwarfLinker.cpp
+++ b/tools/dsymutil/DwarfLinker.cpp
@@ -1764,7 +1764,7 @@ static bool analyzeContextInfo(const DWARFDebugInfoEntryMinimal *DIE,
                                DeclContext *CurrentDeclContext,
                                NonRelocatableStringpool &StringPool,
                                DeclContextTree &Contexts,
-                               bool InTagModule = false) {
+                               bool InImportedModule = false) {
   unsigned MyIdx = CU.getOrigUnit().getDIEIndex(DIE);
   CompileUnit::DIEInfo &Info = CU.getInfo(MyIdx);
 
@@ -1780,11 +1780,14 @@ static bool analyzeContextInfo(const DWARFDebugInfoEntryMinimal *DIE,
   //   definitions match)."
   //
   // We treat non-C++ modules like namespaces for this reason.
-  if (DIE->getTag() == dwarf::DW_TAG_module)
-    InTagModule = true;
+  if (DIE->getTag() == dwarf::DW_TAG_module &&
+      DIE->getAttributeValueAsString(&CU.getOrigUnit(), dwarf::DW_AT_name,
+                                     "") != CU.getClangModuleName()) {
+    InImportedModule = true;
+  }
 
   Info.ParentIdx = ParentIdx;
-  if (CU.hasODR() || CU.isClangModule() || InTagModule) {
+  if (CU.hasODR() || CU.isClangModule() || InImportedModule) {
     if (CurrentDeclContext) {
       auto PtrInvalidPair = Contexts.getChildDeclContext(*CurrentDeclContext,
                                                          DIE, CU, StringPool);
@@ -1795,12 +1798,12 @@ static bool analyzeContextInfo(const DWARFDebugInfoEntryMinimal *DIE,
       Info.Ctxt = CurrentDeclContext = nullptr;
   }
 
-  Info.Prune = InTagModule;
+  Info.Prune = InImportedModule;
   if (DIE->hasChildren())
     for (auto *Child = DIE->getFirstChild(); Child && !Child->isNULL();
          Child = Child->getSibling())
       Info.Prune &= analyzeContextInfo(Child, MyIdx, CU, CurrentDeclContext,
-                                       StringPool, Contexts, InTagModule);
+                                       StringPool, Contexts, InImportedModule);
 
   // Prune this DIE if it is either a forward declaration inside a
   // DW_TAG_module or a DW_TAG_module that contains nothing but
-- 
2.34.1