r216417 - Fix typo.

[Richard Smith]

Author: rsmith
Date: Mon Aug 25 18:33:46 2014
New Revision: 216417

URL: http://llvm.org/viewvc/llvm-project?rev=216417&view=rev
Log:
Fix typo.

Modified:
    cfe/trunk/lib/Serialization/ASTReaderDecl.cpp
    cfe/trunk/test/Modules/Inputs/merge-typedefs/a1.h
    cfe/trunk/test/Modules/Inputs/merge-typedefs/b1.h
    cfe/trunk/test/Modules/merge-typedefs.cpp

Modified: cfe/trunk/lib/Serialization/ASTReaderDecl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTReaderDecl.cpp?rev=216417&r1=216416&r2=216417&view=diff
==============================================================================
--- cfe/trunk/lib/Serialization/ASTReaderDecl.cpp (original)
+++ cfe/trunk/lib/Serialization/ASTReaderDecl.cpp Mon Aug 25 18:33:46 2014
@@ -2528,7 +2528,7 @@ ASTDeclReader::FindExistingResult ASTDec
                                    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)) {

Modified: cfe/trunk/test/Modules/Inputs/merge-typedefs/a1.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/merge-typedefs/a1.h?rev=216417&r1=216416&r2=216417&view=diff
==============================================================================
--- cfe/trunk/test/Modules/Inputs/merge-typedefs/a1.h (original)
+++ cfe/trunk/test/Modules/Inputs/merge-typedefs/a1.h Mon Aug 25 18:33:46 2014
@@ -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

Modified: cfe/trunk/test/Modules/Inputs/merge-typedefs/b1.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/merge-typedefs/b1.h?rev=216417&r1=216416&r2=216417&view=diff
==============================================================================
--- cfe/trunk/test/Modules/Inputs/merge-typedefs/b1.h (original)
+++ cfe/trunk/test/Modules/Inputs/merge-typedefs/b1.h Mon Aug 25 18:33:46 2014
@@ -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;

Modified: cfe/trunk/test/Modules/merge-typedefs.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/merge-typedefs.cpp?rev=216417&r1=216416&r2=216417&view=diff
==============================================================================
--- cfe/trunk/test/Modules/merge-typedefs.cpp (original)
+++ cfe/trunk/test/Modules/merge-typedefs.cpp Mon Aug 25 18:33:46 2014
@@ -7,3 +7,4 @@
 
 // expected-no-diagnostics
 llvm::MachineDomTreeNode *p;
+foo2_t f2t;