commit f3e634b8fb43374c3896bee8fde351d128f4a9c7
author Adrian Prantl <aprantl@apple.com> Thu Sep 24 16:10:14 2015 +0000
committer Adrian Prantl <aprantl@apple.com> Thu Sep 24 16:10:14 2015 +0000
tree 18872fac7428aa7c977dd4aead89ecfe9c34c376
parent 835e6633abda36f51ce9ee47696649bc0f0cf99e

dsymutil: Fix the condition to distinguish module imports form definitions.

llvm-svn: 248512

llvm/tools/dsymutil/DwarfLinker.cpp

diff --git a/llvm/tools/dsymutil/DwarfLinker.cpp b/llvm/tools/dsymutil/DwarfLinker.cpp
index 1aa15c5..8489189 100644
--- a/llvm/tools/dsymutil/DwarfLinker.cpp
+++ b/llvm/tools/dsymutil/DwarfLinker.cpp
@@ -1780,7 +1780,7 @@
   //   definitions match)."
   //
   // We treat non-C++ modules like namespaces for this reason.
-  if (DIE->getTag() == dwarf::DW_TAG_module &&
+  if (DIE->getTag() == dwarf::DW_TAG_module && ParentIdx == 0 &&
       DIE->getAttributeValueAsString(&CU.getOrigUnit(), dwarf::DW_AT_name,
                                      "") != CU.getClangModuleName()) {
     InImportedModule = true;