/// Abstracts clang modules and precompiled header files and holds
/// everything needed to generate debug info for an imported module
/// or PCH.
- struct ASTSourceDescriptor {
+ class ASTSourceDescriptor {
+ StringRef PCHModuleName;
+ StringRef Path;
+ StringRef ASTFile;
+ uint64_t Signature = 0;
+ const Module *ClangModule = nullptr;
+
+ public:
ASTSourceDescriptor(){};
- ASTSourceDescriptor(std::string Name, std::string Path, std::string ASTFile,
+ ASTSourceDescriptor(StringRef Name, StringRef Path, StringRef ASTFile,
uint64_t Signature)
- : FullModuleName(std::move(Name)), Path(std::move(Path)),
+ : PCHModuleName(std::move(Name)), Path(std::move(Path)),
ASTFile(std::move(ASTFile)), Signature(Signature){};
ASTSourceDescriptor(const Module &M);
- std::string FullModuleName;
- std::string Path;
- std::string ASTFile;
- uint64_t Signature = 0;
+ std::string getFullModuleName() const;
+ StringRef getPath() const { return Path; }
+ StringRef getASTFile() const { return ASTFile; }
+ uint64_t getSignature() const { return Signature; }
};
/// Return a descriptor for the corresponding module, if one exists.
}
ExternalASTSource::ASTSourceDescriptor::ASTSourceDescriptor(const Module &M)
- : FullModuleName(M.getFullModuleName()), Signature(M.Signature) {
+ : Signature(M.Signature), ClangModule(&M) {
if (M.Directory)
Path = M.Directory->getName();
if (auto *File = M.getASTFile())
ASTFile = File->getName();
}
+std::string ExternalASTSource::ASTSourceDescriptor::getFullModuleName() const {
+ if (ClangModule)
+ return ClangModule->getFullModuleName();
+ else
+ return PCHModuleName;
+}
+
void ExternalASTSource::FindFileRegionDecls(FileID File, unsigned Offset,
unsigned Length,
SmallVectorImpl<Decl *> &Decls) {}
llvm::DIModule *
CGDebugInfo::getOrCreateModuleRef(ExternalASTSource::ASTSourceDescriptor Mod,
bool CreateSkeletonCU) {
- auto &ModRef = ModuleRefCache[Mod.FullModuleName];
+ std::string FullModuleName = Mod.getFullModuleName();
+ auto &ModRef = ModuleRefCache[FullModuleName];
if (ModRef)
return cast<llvm::DIModule>(ModRef);
if (CreateSkeletonCU) {
llvm::DIBuilder DIB(CGM.getModule());
- DIB.createCompileUnit(TheCU->getSourceLanguage(), Mod.FullModuleName,
- Mod.Path, TheCU->getProducer(), true, StringRef(), 0,
- Mod.ASTFile, llvm::DIBuilder::FullDebug,
- Mod.Signature);
+ DIB.createCompileUnit(TheCU->getSourceLanguage(), FullModuleName,
+ Mod.getPath(), TheCU->getProducer(), true,
+ StringRef(), 0, Mod.getASTFile(),
+ llvm::DIBuilder::FullDebug, Mod.getSignature());
DIB.finalize();
}
llvm::DIModule *M =
- DBuilder.createModule(TheCU, Mod.FullModuleName, ConfigMacros, Mod.Path,
+ DBuilder.createModule(TheCU, FullModuleName, ConfigMacros, Mod.getPath(),
CGM.getHeaderSearchOpts().Sysroot);
ModRef.reset(M);
return M;