Fix typo.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@216417 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Serialization/ASTReaderDecl.cpp b/lib/Serialization/ASTReaderDecl.cpp
index 4f1c4ec69158db5bcc4a5ef331b8e0fa75d4a25c..2503500dcd47a1d7f5e30d7ab76e756987fef2a9 100644 (file)
--- a/lib/Serialization/ASTReaderDecl.cpp
+++ b/lib/Serialization/ASTReaderDecl.cpp
@@ -2528,7 +2528,7 @@ ASTDeclReader::FindExistingResult ASTDeclReader::findExisting(NamedDecl *D) {
                                    IEnd = IdResolver.end();
          I != IEnd; ++I) {
       if (NamedDecl *Existing = getDeclForMerging(*I, IsTypedefNameForLinkage))
-        if (isSameEntity(*I, D))
+        if (isSameEntity(Existing, D))
           return FindExistingResult(Reader, D, Existing);
     }
   } else if (DeclContext *MergeDC = getPrimaryContextForMerging(DC)) {

diff --git a/test/Modules/Inputs/merge-typedefs/a1.h b/test/Modules/Inputs/merge-typedefs/a1.h
index cb8e5b4738838a22ac5c44fe8da055910b6e1a9c..cacc530c3d0a9d6cb39ca611ab32506b12ce950c 100644 (file)
--- a/test/Modules/Inputs/merge-typedefs/a1.h
+++ b/test/Modules/Inputs/merge-typedefs/a1.h
@@ -5,4 +5,7 @@ class MachineBasicBlock;
 template <class NodeT> class DomTreeNodeBase;
 typedef DomTreeNodeBase<MachineBasicBlock> MachineDomTreeNode;
 }
+
+typedef struct {} foo_t;
+typedef foo_t foo2_t;
 #endif

diff --git a/test/Modules/Inputs/merge-typedefs/b1.h b/test/Modules/Inputs/merge-typedefs/b1.h
index fba3a89c3089c7deaeba0110c71b9a10d53b47e3..8dde5f6fbaddfad8168a510976ff9a5a005fdd61 100644 (file)
--- a/test/Modules/Inputs/merge-typedefs/b1.h
+++ b/test/Modules/Inputs/merge-typedefs/b1.h
@@ -1,5 +1,7 @@
 #ifndef B1_H
 #define B1_H
+typedef struct {} foo_t;
+typedef foo_t foo2_t;
 #include "a2.h"
 namespace llvm {
 class MachineBasicBlock;

diff --git a/test/Modules/merge-typedefs.cpp b/test/Modules/merge-typedefs.cpp
index 5d821776030a7d05a6b4c34d548bf31994582806..607f8c5ad0ec71ffbb4f6732e63d5d0935d917b3 100644 (file)
--- a/test/Modules/merge-typedefs.cpp
+++ b/test/Modules/merge-typedefs.cpp
@@ -7,3 +7,4 @@
 
 // expected-no-diagnostics
 llvm::MachineDomTreeNode *p;
+foo2_t f2t;