r248070 - Rename ASTSourceDescriptor::ModuleName to FullModuleName for clarity.
Adrian Prantl via cfe-commits
cfe-commits at lists.llvm.org
Fri Sep 18 17:10:37 PDT 2015
Author: adrian
Date: Fri Sep 18 19:10:37 2015
New Revision: 248070
URL: http://llvm.org/viewvc/llvm-project?rev=248070&view=rev
Log:
Rename ASTSourceDescriptor::ModuleName to FullModuleName for clarity.
Modified:
cfe/trunk/include/clang/AST/ExternalASTSource.h
cfe/trunk/lib/AST/ExternalASTSource.cpp
cfe/trunk/lib/CodeGen/CGDebugInfo.cpp
Modified: cfe/trunk/include/clang/AST/ExternalASTSource.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/ExternalASTSource.h?rev=248070&r1=248069&r2=248070&view=diff
==============================================================================
--- cfe/trunk/include/clang/AST/ExternalASTSource.h (original)
+++ cfe/trunk/include/clang/AST/ExternalASTSource.h Fri Sep 18 19:10:37 2015
@@ -146,12 +146,13 @@ public:
/// everything needed to generate debug info for an imported module
/// or PCH.
struct ASTSourceDescriptor {
+ ASTSourceDescriptor(){};
ASTSourceDescriptor(std::string Name, std::string Path, std::string ASTFile,
uint64_t Signature)
- : ModuleName(Name), Path(Path), ASTFile(ASTFile),
+ : FullModuleName(Name), Path(Path), ASTFile(ASTFile),
Signature(Signature){};
ASTSourceDescriptor(const Module &M);
- std::string ModuleName;
+ std::string FullModuleName;
std::string Path;
std::string ASTFile;
uint64_t Signature = 0;
Modified: cfe/trunk/lib/AST/ExternalASTSource.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/ExternalASTSource.cpp?rev=248070&r1=248069&r2=248070&view=diff
==============================================================================
--- cfe/trunk/lib/AST/ExternalASTSource.cpp (original)
+++ cfe/trunk/lib/AST/ExternalASTSource.cpp Fri Sep 18 19:10:37 2015
@@ -29,7 +29,7 @@ ExternalASTSource::getSourceDescriptor(u
}
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())
Modified: cfe/trunk/lib/CodeGen/CGDebugInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.cpp?rev=248070&r1=248069&r2=248070&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGDebugInfo.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGDebugInfo.cpp Fri Sep 18 19:10:37 2015
@@ -1675,7 +1675,7 @@ llvm::DIType *CGDebugInfo::CreateType(co
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(Extern
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;
More information about the cfe-commits
mailing list