Skip to content

Commit 8d9b154

Browse files
authored
Fix unused private field warning (#91500)
After 11a6799 "[clang][CodeGen] Omit pre-opt link when post-opt is link requested (#85672)" I'm seeing a new warning: > BackendConsumer.h:37:22: error: private field 'FileMgr' is not used [-Werror,-Wunused-private-field] Remove the field since it's no longer used.
1 parent efad149 commit 8d9b154

File tree

2 files changed

+11
-15
lines changed

2 files changed

+11
-15
lines changed

clang/lib/CodeGen/BackendConsumer.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ class BackendConsumer : public ASTConsumer {
3434
const CodeGenOptions &CodeGenOpts;
3535
const TargetOptions &TargetOpts;
3636
const LangOptions &LangOpts;
37-
const FileManager &FileMgr;
3837
std::unique_ptr<raw_pwrite_stream> AsmOutStream;
3938
ASTContext *Context;
4039
IntrusiveRefCntPtr<llvm::vfs::FileSystem> FS;
@@ -76,7 +75,7 @@ class BackendConsumer : public ASTConsumer {
7675
const PreprocessorOptions &PPOpts,
7776
const CodeGenOptions &CodeGenOpts,
7877
const TargetOptions &TargetOpts, const LangOptions &LangOpts,
79-
const FileManager &FileMgr, const std::string &InFile,
78+
const std::string &InFile,
8079
SmallVector<LinkModule, 4> LinkModules,
8180
std::unique_ptr<raw_pwrite_stream> OS, llvm::LLVMContext &C,
8281
CoverageSourceInfo *CoverageInfo = nullptr);
@@ -90,8 +89,8 @@ class BackendConsumer : public ASTConsumer {
9089
const PreprocessorOptions &PPOpts,
9190
const CodeGenOptions &CodeGenOpts,
9291
const TargetOptions &TargetOpts, const LangOptions &LangOpts,
93-
const FileManager &FileMgr, llvm::Module *Module,
94-
SmallVector<LinkModule, 4> LinkModules, llvm::LLVMContext &C,
92+
llvm::Module *Module, SmallVector<LinkModule, 4> LinkModules,
93+
llvm::LLVMContext &C,
9594
CoverageSourceInfo *CoverageInfo = nullptr);
9695

9796
llvm::Module *getModule() const;

clang/lib/CodeGen/CodeGenAction.cpp

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,12 @@ BackendConsumer::BackendConsumer(
114114
const HeaderSearchOptions &HeaderSearchOpts,
115115
const PreprocessorOptions &PPOpts, const CodeGenOptions &CodeGenOpts,
116116
const TargetOptions &TargetOpts, const LangOptions &LangOpts,
117-
const FileManager &FileMgr, const std::string &InFile,
118-
SmallVector<LinkModule, 4> LinkModules,
117+
const std::string &InFile, SmallVector<LinkModule, 4> LinkModules,
119118
std::unique_ptr<raw_pwrite_stream> OS, LLVMContext &C,
120119
CoverageSourceInfo *CoverageInfo)
121120
: Diags(Diags), Action(Action), HeaderSearchOpts(HeaderSearchOpts),
122121
CodeGenOpts(CodeGenOpts), TargetOpts(TargetOpts), LangOpts(LangOpts),
123-
FileMgr(FileMgr), AsmOutStream(std::move(OS)), Context(nullptr), FS(VFS),
122+
AsmOutStream(std::move(OS)), Context(nullptr), FS(VFS),
124123
LLVMIRGeneration("irgen", "LLVM IR Generation Time"),
125124
LLVMIRGenerationRefCount(0),
126125
Gen(CreateLLVMCodeGen(Diags, InFile, std::move(VFS), HeaderSearchOpts,
@@ -140,12 +139,11 @@ BackendConsumer::BackendConsumer(
140139
const HeaderSearchOptions &HeaderSearchOpts,
141140
const PreprocessorOptions &PPOpts, const CodeGenOptions &CodeGenOpts,
142141
const TargetOptions &TargetOpts, const LangOptions &LangOpts,
143-
const FileManager &FileMgr, llvm::Module *Module,
144-
SmallVector<LinkModule, 4> LinkModules, LLVMContext &C,
145-
CoverageSourceInfo *CoverageInfo)
142+
llvm::Module *Module, SmallVector<LinkModule, 4> LinkModules,
143+
LLVMContext &C, CoverageSourceInfo *CoverageInfo)
146144
: Diags(Diags), Action(Action), HeaderSearchOpts(HeaderSearchOpts),
147145
CodeGenOpts(CodeGenOpts), TargetOpts(TargetOpts), LangOpts(LangOpts),
148-
FileMgr(FileMgr), Context(nullptr), FS(VFS),
146+
Context(nullptr), FS(VFS),
149147
LLVMIRGeneration("irgen", "LLVM IR Generation Time"),
150148
LLVMIRGenerationRefCount(0),
151149
Gen(CreateLLVMCodeGen(Diags, "", std::move(VFS), HeaderSearchOpts, PPOpts,
@@ -1022,9 +1020,8 @@ CodeGenAction::CreateASTConsumer(CompilerInstance &CI, StringRef InFile) {
10221020
std::unique_ptr<BackendConsumer> Result(new BackendConsumer(
10231021
BA, CI.getDiagnostics(), &CI.getVirtualFileSystem(),
10241022
CI.getHeaderSearchOpts(), CI.getPreprocessorOpts(), CI.getCodeGenOpts(),
1025-
CI.getTargetOpts(), CI.getLangOpts(), CI.getFileManager(),
1026-
std::string(InFile), std::move(LinkModules), std::move(OS), *VMContext,
1027-
CoverageInfo));
1023+
CI.getTargetOpts(), CI.getLangOpts(), std::string(InFile),
1024+
std::move(LinkModules), std::move(OS), *VMContext, CoverageInfo));
10281025
BEConsumer = Result.get();
10291026

10301027
// Enable generating macro debug info only when debug info is not disabled and
@@ -1195,7 +1192,7 @@ void CodeGenAction::ExecuteAction() {
11951192
BackendConsumer Result(BA, CI.getDiagnostics(), &CI.getVirtualFileSystem(),
11961193
CI.getHeaderSearchOpts(), CI.getPreprocessorOpts(),
11971194
CI.getCodeGenOpts(), CI.getTargetOpts(),
1198-
CI.getLangOpts(), CI.getFileManager(), TheModule.get(),
1195+
CI.getLangOpts(), TheModule.get(),
11991196
std::move(LinkModules), *VMContext, nullptr);
12001197

12011198
// Link in each pending link module.

0 commit comments

Comments
 (0)