replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix typo. 

llvm-svn: 216417
This commit is contained in:
Richard Smith 2014-08-25 23:33:46 +00:00
parent a220946990
commit 87dacc7922
4 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/lib/Serialization/ASTReaderDecl.cpp
View File

@ -2528,7 +2528,7 @@ ASTDeclReader::FindExistingResult ASTDeclReader::findExisting(NamedDecl *D) {
IEnd = IdResolver.end(); IEnd = IdResolver.end();
I != IEnd; ++I) { I != IEnd; ++I) {
if (NamedDecl *Existing = getDeclForMerging(*I, IsTypedefNameForLinkage)) if (NamedDecl *Existing = getDeclForMerging(*I, IsTypedefNameForLinkage))
if (isSameEntity(*I, D)) if (isSameEntity(Existing, D))
return FindExistingResult(Reader, D, Existing); return FindExistingResult(Reader, D, Existing);
} }
} else if (DeclContext *MergeDC = getPrimaryContextForMerging(DC)) { } else if (DeclContext *MergeDC = getPrimaryContextForMerging(DC)) {

3
clang/test/Modules/Inputs/merge-typedefs/a1.h
View File

@ -5,4 +5,7 @@ class MachineBasicBlock;
template <class NodeT> class DomTreeNodeBase; template <class NodeT> class DomTreeNodeBase;
typedef DomTreeNodeBase<MachineBasicBlock> MachineDomTreeNode; typedef DomTreeNodeBase<MachineBasicBlock> MachineDomTreeNode;
} }
typedef struct {} foo_t;
typedef foo_t foo2_t;
#endif #endif

2
clang/test/Modules/Inputs/merge-typedefs/b1.h
View File

@ -1,5 +1,7 @@
#ifndef B1_H #ifndef B1_H
#define B1_H #define B1_H
typedef struct {} foo_t;
typedef foo_t foo2_t;
#include "a2.h" #include "a2.h"
namespace llvm { namespace llvm {
class MachineBasicBlock; class MachineBasicBlock;

1
clang/test/Modules/merge-typedefs.cpp
View File

@ -7,3 +7,4 @@
// expected-no-diagnostics // expected-no-diagnostics
llvm::MachineDomTreeNode *p; llvm::MachineDomTreeNode *p;
foo2_t f2t;