diff options
| author | Daniel Jasper <djasper@google.com> | 2017-10-11 07:47:54 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2017-10-11 07:47:54 +0000 |
| commit | 4a6d5b72af56742e56684d52a2c80068597be4bc (patch) | |
| tree | 570a3c3958e3ff612fb638a848dcd56652ac2a76 /clang/lib/Serialization/ASTCommon.cpp | |
| parent | 0c8dd052b828ca2f0bcbad5398cef010d60649d4 (diff) | |
| download | bcm5719-llvm-4a6d5b72af56742e56684d52a2c80068597be4bc.tar.gz bcm5719-llvm-4a6d5b72af56742e56684d52a2c80068597be4bc.zip | |
Revert r314955: "Remove PendingBody mechanism for function and ObjC method deserialization."
This is breaking a build of https://github.com/abseil/abseil-cpp and so
likely not really NFC. Also reverted subsequent r314956/7.
I'll forward reproduction instructions to Richard.
llvm-svn: 315439
Diffstat (limited to 'clang/lib/Serialization/ASTCommon.cpp')
| -rw-r--r-- | clang/lib/Serialization/ASTCommon.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Serialization/ASTCommon.cpp b/clang/lib/Serialization/ASTCommon.cpp index 7519dc239c0..9c6f03cd0bb 100644 --- a/clang/lib/Serialization/ASTCommon.cpp +++ b/clang/lib/Serialization/ASTCommon.cpp @@ -344,8 +344,8 @@ bool serialization::needsAnonymousDeclarationNumber(const NamedDecl *D) { return true; } - // Otherwise, we only care about anonymous class members / block-scope decls. - if (D->getDeclName() || D->getLexicalDeclContext()->isFileContext()) + // Otherwise, we only care about anonymous class members. + if (D->getDeclName() || !isa<CXXRecordDecl>(D->getLexicalDeclContext())) return false; return isa<TagDecl>(D) || isa<FieldDecl>(D); } |
