Skip to content

[clang] Simplify updating CodeGenOptions #23214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
hahnjo wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −19
Draft

[clang] Simplify updating CodeGenOptions #23214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions interpreter/cling/lib/Interpreter/IncrementalParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,8 +556,7 @@ namespace cling {

llvm::Module* IncrementalParser::StartModule() {
return m_Interpreter->withLLVMContextDo([&](llvm::LLVMContext* Ctx) {
return getCodeGenerator()->StartModule(makeModuleName(), *Ctx,
getCI()->getCodeGenOpts());
return getCodeGenerator()->StartModule(makeModuleName(), *Ctx);
});
}

Expand Down
3 changes: 0 additions & 3 deletions interpreter/llvm-project/clang/include/clang/CodeGen/ModuleBuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,6 @@ class CodeGenerator : public ASTConsumer {
/// enable codegen in interactive processing environments.
llvm::Module* StartModule(llvm::StringRef ModuleName, llvm::LLVMContext &C);

llvm::Module *StartModule(llvm::StringRef ModuleName, llvm::LLVMContext &C,
const CodeGenOptions &CGO);

void forgetGlobal(llvm::GlobalValue *GV);
void forgetDecl(llvm::StringRef MangledName);
};
Expand Down
15 changes: 1 addition & 14 deletions interpreter/llvm-project/clang/lib/CodeGen/ModuleBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ namespace clang {
IntrusiveRefCntPtr<llvm::vfs::FileSystem> FS; // Only used for debug info.
const HeaderSearchOptions &HeaderSearchOpts; // Only used for debug info.
const PreprocessorOptions &PreprocessorOpts; // Only used for debug info.
CodeGenOptions CodeGenOpts; // Intentionally copied in.
const CodeGenOptions &CodeGenOpts;

unsigned HandlingTopLevelDecls;

Expand Down Expand Up @@ -267,12 +267,6 @@ namespace clang {
return M.get();
}

llvm::Module *StartModule(llvm::StringRef ModuleName, llvm::LLVMContext &C,
const CodeGenOptions &CGO) {
CodeGenOpts = CGO;
return StartModule(ModuleName, C);
}

void forgetGlobal(llvm::GlobalValue *GV) {
for (auto I = Builder->ConstantStringMap.begin(),
E = Builder->ConstantStringMap.end();
Expand Down Expand Up @@ -511,13 +505,6 @@ llvm::Module *CodeGenerator::StartModule(llvm::StringRef ModuleName,
return static_cast<CodeGeneratorImpl*>(this)->StartModule(ModuleName, C);
}

llvm::Module *CodeGenerator::StartModule(llvm::StringRef ModuleName,
llvm::LLVMContext &C,
const CodeGenOptions &CGO) {
return static_cast<CodeGeneratorImpl *>(this)->StartModule(ModuleName, C,
CGO);
}

void CodeGenerator::forgetGlobal(llvm::GlobalValue *GV) {
static_cast<CodeGeneratorImpl *>(this)->forgetGlobal(GV);
}
Expand Down
Loading