diff options
| author | Douglas Gregor <dgregor@apple.com> | 2012-01-13 23:49:34 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2012-01-13 23:49:34 +0000 |
| commit | 87ea58f5cdff650fdb5be3f5d02a531fe4c9302b (patch) | |
| tree | e5f238e56bb81657ec39154f4913cdee40a8b976 /clang/lib/Serialization/ASTReaderDecl.cpp | |
| parent | c09e0557a548a3032c9de7915e9f10426efd9d70 (diff) | |
| download | bcm5719-llvm-87ea58f5cdff650fdb5be3f5d02a531fe4c9302b.tar.gz bcm5719-llvm-87ea58f5cdff650fdb5be3f5d02a531fe4c9302b.zip | |
(Implicit) parameters deserialized as part of a function type must not
get added to the identifier chains as part of deserialization, because
they should not be visible to name lookup.
llvm-svn: 148159
Diffstat (limited to 'clang/lib/Serialization/ASTReaderDecl.cpp')
| -rw-r--r-- | clang/lib/Serialization/ASTReaderDecl.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/clang/lib/Serialization/ASTReaderDecl.cpp b/clang/lib/Serialization/ASTReaderDecl.cpp index 6b8a72f807f..75c079fb65b 100644 --- a/clang/lib/Serialization/ASTReaderDecl.cpp +++ b/clang/lib/Serialization/ASTReaderDecl.cpp @@ -879,8 +879,10 @@ void ASTDeclReader::VisitVarDecl(VarDecl *VD) { VD->VarDeclBits.NRVOVariable = Record[Idx++]; VD->VarDeclBits.CXXForRangeDecl = Record[Idx++]; VD->VarDeclBits.ARCPseudoStrong = Record[Idx++]; - - mergeRedeclarable(VD, Redecl); + + // Only true variables (not parameters or implicit parameters) can be merged. + if (VD->getKind() == Decl::Var) + mergeRedeclarable(VD, Redecl); if (uint64_t Val = Record[Idx++]) { VD->setInit(Reader.ReadExpr(F)); |
