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

Alloc redeclaration of typedefs within ExternCSystemHeaderDir's AND SystemHeaderDir's. 

llvm-svn: 48841
This commit is contained in:
Steve Naroff 2008-03-26 21:27:00 +00:00
parent 19e24df3a4
commit c06ee808d7
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clang/lib/Sema/SemaDecl.cpp
View File

@ -220,11 +220,12 @@ TypedefDecl *Sema::MergeTypeDefDecl(TypedefDecl *New, ScopedDecl *OldD) {
DirectoryLookup::DirType OldDirType = HdrInfo.getFileDirFlavor(OldDeclFile);
DirectoryLookup::DirType NewDirType = HdrInfo.getFileDirFlavor(NewDeclFile);
if ((OldDirType == DirectoryLookup::ExternCSystemHeaderDir ||
NewDirType == DirectoryLookup::ExternCSystemHeaderDir) ||
// Allow reclarations in both SystemHeaderDir and ExternCSystemHeaderDir.
if ((OldDirType != DirectoryLookup::NormalHeaderDir ||
NewDirType != DirectoryLookup::NormalHeaderDir) ||
getLangOptions().Microsoft)
return New;
// TODO: CHECK FOR CONFLICTS, multiple decls with same name in one scope.
// TODO: This is totally simplistic. It should handle merging functions
// together etc, merging extern int X; int X; ...