mirrors/llvm-project
0
0
Fork 0
mirror of https://github.com/llvm/llvm-project.git synced 2025-04-26 13:16:06 +00:00
Code Issues Projects Releases Wiki Activity

[NFC] [C++20] [Modules] Refactor ReducedBMIGenerator

Browse Source 
Changes:
- Don't lookup the emitting module from HeaderSearch. We will use the
  module from the ASTContext directly.
- Remove some useless arguments. Let's addback in the future if
  required.
This commit is contained in:
Chuanqi Xu 2024-03-13 11:20:38 +08:00
parent a62222f5f0
commit 5d7796e674
3 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clang/include/clang/Serialization/ASTWriter.h
View File

@ -868,6 +868,8 @@ protected:
return SemaPtr->getDiagnostics();
}
virtual Module *getEmittingModule(ASTContext &Ctx);
public:
PCHGenerator(const Preprocessor &PP, InMemoryModuleCache &ModuleCache,
StringRef OutputFile, StringRef isysroot,
@ -887,10 +889,12 @@ public:
};
class ReducedBMIGenerator : public PCHGenerator {
protected:
virtual Module *getEmittingModule(ASTContext &Ctx) override;
public:
ReducedBMIGenerator(const Preprocessor &PP, InMemoryModuleCache &ModuleCache,
StringRef OutputFile, std::shared_ptr<PCHBuffer> Buffer,
bool IncludeTimestamps);
StringRef OutputFile);
void HandleTranslationUnit(ASTContext &Ctx) override;
};

8
clang/lib/Frontend/FrontendActions.cpp
View File

@ -293,11 +293,9 @@ GenerateModuleInterfaceAction::CreateOutputFile(CompilerInstance &CI,
std::unique_ptr<ASTConsumer>
GenerateReducedModuleInterfaceAction::CreateASTConsumer(CompilerInstance &CI,
StringRef InFile) {
auto Buffer = std::make_shared<PCHBuffer>();
return std::make_unique<ReducedBMIGenerator>(
CI.getPreprocessor(), CI.getModuleCache(),
CI.getFrontendOpts().OutputFile, Buffer,
/*IncludeTimestamps=*/+CI.getFrontendOpts().IncludeTimestamps);
return std::make_unique<ReducedBMIGenerator>(CI.getPreprocessor(),
CI.getModuleCache(),
CI.getFrontendOpts().OutputFile);
}
bool GenerateHeaderUnitAction::BeginSourceFileAction(CompilerInstance &CI) {

42
clang/lib/Serialization/GeneratePCH.cpp
View File

@ -41,6 +41,21 @@ PCHGenerator::PCHGenerator(
PCHGenerator::~PCHGenerator() {
}
Module *PCHGenerator::getEmittingModule(ASTContext &) {
Module *M = nullptr;
if (PP.getLangOpts().isCompilingModule()) {
M = PP.getHeaderSearchInfo().lookupModule(PP.getLangOpts().CurrentModule,
SourceLocation(),
/*AllowSearch*/ false);
if (!M)
assert(PP.getDiagnostics().hasErrorOccurred() &&
"emitting module but current module doesn't exist");
}
return M;
}
void PCHGenerator::HandleTranslationUnit(ASTContext &Ctx) {
// Don't create a PCH if there were fatal failures during module loading.
if (PP.getModuleLoader().HadFatalFailure)
@ -50,16 +65,7 @@ void PCHGenerator::HandleTranslationUnit(ASTContext &Ctx) {
if (hasErrors && !AllowASTWithErrors)
return;
Module *Module = nullptr;
if (PP.getLangOpts().isCompilingModule()) {
Module = PP.getHeaderSearchInfo().lookupModule(
PP.getLangOpts().CurrentModule, SourceLocation(),
/*AllowSearch*/ false);
if (!Module) {
assert(hasErrors && "emitting module but current module doesn't exist");
return;
}
}
Module *Module = getEmittingModule(Ctx);
// Errors that do not prevent the PCH from being written should not cause the
// overall compilation to fail either.
@ -84,16 +90,22 @@ ASTDeserializationListener *PCHGenerator::GetASTDeserializationListener() {
ReducedBMIGenerator::ReducedBMIGenerator(const Preprocessor &PP,
InMemoryModuleCache &ModuleCache,
StringRef OutputFile,
std::shared_ptr<PCHBuffer> Buffer,
bool IncludeTimestamps)
StringRef OutputFile)
: PCHGenerator(
PP, ModuleCache, OutputFile, llvm::StringRef(), Buffer,
PP, ModuleCache, OutputFile, llvm::StringRef(),
std::make_shared<PCHBuffer>(),
/*Extensions=*/ArrayRef<std::shared_ptr<ModuleFileExtension>>(),
/*AllowASTWithErrors*/ false, /*IncludeTimestamps=*/IncludeTimestamps,
/*AllowASTWithErrors*/ false, /*IncludeTimestamps=*/false,
/*BuildingImplicitModule=*/false, /*ShouldCacheASTInMemory=*/false,
/*GeneratingReducedBMI=*/true) {}
Module *ReducedBMIGenerator::getEmittingModule(ASTContext &Ctx) {
Module *M = Ctx.getCurrentNamedModule();
assert(M->isNamedModuleUnit() &&
"ReducedBMIGenerator should only be used with C++20 Named modules.");
return M;
}
void ReducedBMIGenerator::HandleTranslationUnit(ASTContext &Ctx) {
PCHGenerator::HandleTranslationUnit(Ctx);