diff options
| author | Daniel Jasper <djasper@google.com> | 2017-05-15 07:51:10 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2017-05-15 07:51:10 +0000 |
| commit | 89f9ad8636c672eb26e881f0f9f31f7de8c303a0 (patch) | |
| tree | f72d01e8924b0206ceca2284f28c79cfca738e15 /clang/lib/AST/ASTDumper.cpp | |
| parent | 06c61e863962f56ca0a8213eb3e2fa0666f5c53e (diff) | |
| download | bcm5719-llvm-89f9ad8636c672eb26e881f0f9f31f7de8c303a0.tar.gz bcm5719-llvm-89f9ad8636c672eb26e881f0f9f31f7de8c303a0.zip | |
Revert r302965 - [modules] When creating a declaration, cache its owning
module immediately
Also revert dependent r302969. This is leading to crashes.
Will provide more details reproduction instructions to Richard.
llvm-svn: 303037
Diffstat (limited to 'clang/lib/AST/ASTDumper.cpp')
| -rw-r--r-- | clang/lib/AST/ASTDumper.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/AST/ASTDumper.cpp b/clang/lib/AST/ASTDumper.cpp index d89be0d9e6f..ef491ab06f8 100644 --- a/clang/lib/AST/ASTDumper.cpp +++ b/clang/lib/AST/ASTDumper.cpp @@ -1038,10 +1038,10 @@ void ASTDumper::dumpDecl(const Decl *D) { dumpSourceRange(D->getSourceRange()); OS << ' '; dumpLocation(D->getLocation()); - if (D->isFromASTFile()) - OS << " imported"; - if (Module *M = D->getOwningModule()) + if (Module *M = D->getImportedOwningModule()) OS << " in " << M->getFullModuleName(); + else if (Module *M = D->getLocalOwningModule()) + OS << " in (local) " << M->getFullModuleName(); if (auto *ND = dyn_cast<NamedDecl>(D)) for (Module *M : D->getASTContext().getModulesWithMergedDefinition( const_cast<NamedDecl *>(ND))) |
