diff options
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/AST/ExternalASTSource.cpp | 2 | ||||
| -rw-r--r-- | clang/lib/CodeGen/CGDebugInfo.cpp | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/clang/lib/AST/ExternalASTSource.cpp b/clang/lib/AST/ExternalASTSource.cpp index 62d41d3e497..8d32dd23bbe 100644 --- a/clang/lib/AST/ExternalASTSource.cpp +++ b/clang/lib/AST/ExternalASTSource.cpp @@ -29,7 +29,7 @@ ExternalASTSource::getSourceDescriptor(unsigned ID) { } ExternalASTSource::ASTSourceDescriptor::ASTSourceDescriptor(const Module &M) - : ModuleName(M.getFullModuleName()), Signature(M.Signature) { + : FullModuleName(M.getFullModuleName()), Signature(M.Signature) { if (M.Directory) Path = M.Directory->getName(); if (auto *File = M.getASTFile()) diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp index 7d6bd166873..2743c3f28e8 100644 --- a/clang/lib/CodeGen/CGDebugInfo.cpp +++ b/clang/lib/CodeGen/CGDebugInfo.cpp @@ -1675,7 +1675,7 @@ llvm::DIType *CGDebugInfo::CreateType(const ObjCInterfaceType *Ty, llvm::DIModule * CGDebugInfo::getOrCreateModuleRef(ExternalASTSource::ASTSourceDescriptor Mod, bool CreateSkeletonCU) { - auto &ModRef = ModuleRefCache[Mod.ModuleName]; + auto &ModRef = ModuleRefCache[Mod.FullModuleName]; if (ModRef) return cast<llvm::DIModule>(ModRef); @@ -1705,15 +1705,15 @@ CGDebugInfo::getOrCreateModuleRef(ExternalASTSource::ASTSourceDescriptor Mod, llvm::DIModule *M = nullptr; if (CreateSkeletonCU) { llvm::DIBuilder DIB(CGM.getModule()); - auto *CU = DIB.createCompileUnit(TheCU->getSourceLanguage(), Mod.ModuleName, - Mod.Path, TheCU->getProducer(), true, - StringRef(), 0, Mod.ASTFile, - llvm::DIBuilder::FullDebug, Mod.Signature); - M = DIB.createModule(CU, Mod.ModuleName, ConfigMacros, Mod.Path, + auto *CU = DIB.createCompileUnit( + TheCU->getSourceLanguage(), Mod.FullModuleName, Mod.Path, + TheCU->getProducer(), true, StringRef(), 0, Mod.ASTFile, + llvm::DIBuilder::FullDebug, Mod.Signature); + M = DIB.createModule(CU, Mod.FullModuleName, ConfigMacros, Mod.Path, CGM.getHeaderSearchOpts().Sysroot); DIB.finalize(); } else - M = DBuilder.createModule(TheCU, Mod.ModuleName, ConfigMacros, Mod.Path, + M = DBuilder.createModule(TheCU, Mod.FullModuleName, ConfigMacros, Mod.Path, CGM.getHeaderSearchOpts().Sysroot); ModRef.reset(M); return M; |
