Author: Takuya Shimizu Date: 2023-08-30T10:05:06+09:00 New Revision: 01b88dd66d9d52d3f531a7d490e18c549f36f445
URL: https://github.com/llvm/llvm-project/commit/01b88dd66d9d52d3f531a7d490e18c549f36f445 DIFF: https://github.com/llvm/llvm-project/commit/01b88dd66d9d52d3f531a7d490e18c549f36f445.diff LOG: [NFC] Remove unused variables declared in conditions D152495 makes clang warn on unused variables that are declared in conditions like `if (int var = init) {}` This patch is an NFC fix to suppress the new warning in llvm,clang,lld builds to pass CI in the above patch. Differential Revision: https://reviews.llvm.org/D158016 Added: Modified: clang/include/clang/ASTMatchers/ASTMatchers.h clang/lib/AST/Interp/ByteCodeStmtGen.cpp clang/lib/CodeGen/BackendUtil.cpp clang/lib/CodeGen/CGOpenMPRuntime.cpp clang/lib/CodeGen/CodeGenModule.cpp clang/lib/Driver/ToolChains/Cuda.cpp clang/lib/StaticAnalyzer/Checkers/FuchsiaHandleChecker.cpp clang/lib/StaticAnalyzer/Checkers/Yaml.h clang/tools/clang-scan-deps/ClangScanDeps.cpp lld/MachO/Driver.cpp llvm/lib/DebugInfo/DWARF/DWARFContext.cpp llvm/lib/DebugInfo/DWARF/DWARFUnit.cpp llvm/lib/DebugInfo/GSYM/DwarfTransformer.cpp llvm/lib/IR/PrintPasses.cpp llvm/lib/Passes/StandardInstrumentations.cpp llvm/lib/Support/VirtualFileSystem.cpp llvm/tools/llvm-profgen/ProfiledBinary.cpp Removed: ################################################################################ diff --git a/clang/include/clang/ASTMatchers/ASTMatchers.h b/clang/include/clang/ASTMatchers/ASTMatchers.h index bdc9a5624ce3af..c1ffe1a2dd3ed5 100644 --- a/clang/include/clang/ASTMatchers/ASTMatchers.h +++ b/clang/include/clang/ASTMatchers/ASTMatchers.h @@ -3928,7 +3928,7 @@ AST_MATCHER_P(CallExpr, callee, internal::Matcher<Stmt>, AST_POLYMORPHIC_MATCHER_P_OVERLOAD( callee, AST_POLYMORPHIC_SUPPORTED_TYPES(ObjCMessageExpr, CallExpr), internal::Matcher<Decl>, InnerMatcher, 1) { - if (const auto *CallNode = dyn_cast<CallExpr>(&Node)) + if (isa<CallExpr>(&Node)) return callExpr(hasDeclaration(InnerMatcher)) .matches(Node, Finder, Builder); else { diff --git a/clang/lib/AST/Interp/ByteCodeStmtGen.cpp b/clang/lib/AST/Interp/ByteCodeStmtGen.cpp index f048b2c218a4ca..b7553d8963ff0e 100644 --- a/clang/lib/AST/Interp/ByteCodeStmtGen.cpp +++ b/clang/lib/AST/Interp/ByteCodeStmtGen.cpp @@ -341,7 +341,7 @@ bool ByteCodeStmtGen<Emitter>::visitIfStmt(const IfStmt *IS) { return IS->getElse() ? visitStmt(IS->getElse()) : true; if (auto *CondInit = IS->getInit()) - if (!visitStmt(IS->getInit())) + if (!visitStmt(CondInit)) return false; if (const DeclStmt *CondDecl = IS->getConditionVariableDeclStmt()) diff --git a/clang/lib/CodeGen/BackendUtil.cpp b/clang/lib/CodeGen/BackendUtil.cpp index 3e8b2b78a3928b..79b23a85040970 100644 --- a/clang/lib/CodeGen/BackendUtil.cpp +++ b/clang/lib/CodeGen/BackendUtil.cpp @@ -1353,7 +1353,7 @@ void clang::EmbedObject(llvm::Module *M, const CodeGenOptions &CGOpts, for (StringRef OffloadObject : CGOpts.OffloadObjects) { llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> ObjectOrErr = llvm::MemoryBuffer::getFileOrSTDIN(OffloadObject); - if (std::error_code EC = ObjectOrErr.getError()) { + if (ObjectOrErr.getError()) { auto DiagID = Diags.getCustomDiagID(DiagnosticsEngine::Error, "could not open '%0' for embedding"); Diags.Report(DiagID) << OffloadObject; diff --git a/clang/lib/CodeGen/CGOpenMPRuntime.cpp b/clang/lib/CodeGen/CGOpenMPRuntime.cpp index ac04b838602345..336cb04b9ad2be 100644 --- a/clang/lib/CodeGen/CGOpenMPRuntime.cpp +++ b/clang/lib/CodeGen/CGOpenMPRuntime.cpp @@ -1557,7 +1557,7 @@ static llvm::TargetRegionEntryInfo getEntryInfoFromPresumedLoc( PresumedLoc PLoc = SM.getPresumedLoc(BeginLoc); llvm::sys::fs::UniqueID ID; - if (auto EC = llvm::sys::fs::getUniqueID(PLoc.getFilename(), ID)) { + if (llvm::sys::fs::getUniqueID(PLoc.getFilename(), ID)) { PLoc = SM.getPresumedLoc(BeginLoc, /*UseLineDirectives=*/false); } diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp index 4f3cdb00f1cc18..21e1363b613e0e 100644 --- a/clang/lib/CodeGen/CodeGenModule.cpp +++ b/clang/lib/CodeGen/CodeGenModule.cpp @@ -7423,7 +7423,7 @@ void CodeGenModule::printPostfixForExternalizedDecl(llvm::raw_ostream &OS, // Get the UniqueID for the file containing the decl. llvm::sys::fs::UniqueID ID; - if (auto EC = llvm::sys::fs::getUniqueID(PLoc.getFilename(), ID)) { + if (llvm::sys::fs::getUniqueID(PLoc.getFilename(), ID)) { PLoc = SM.getPresumedLoc(D->getLocation(), /*UseLineDirectives=*/false); assert(PLoc.isValid() && "Source location is expected to be valid."); if (auto EC = llvm::sys::fs::getUniqueID(PLoc.getFilename(), ID)) diff --git a/clang/lib/Driver/ToolChains/Cuda.cpp b/clang/lib/Driver/ToolChains/Cuda.cpp index 47187f554db29d..97472a302715bb 100644 --- a/clang/lib/Driver/ToolChains/Cuda.cpp +++ b/clang/lib/Driver/ToolChains/Cuda.cpp @@ -629,8 +629,7 @@ void NVPTX::Linker::ConstructJob(Compilation &C, const JobAction &JA, const char *CubinF = Args.MakeArgString(getToolChain().getDriver().GetTemporaryPath( llvm::sys::path::stem(InputFile), "cubin")); - if (std::error_code EC = - llvm::sys::fs::copy_file(InputFile, C.addTempFile(CubinF))) + if (llvm::sys::fs::copy_file(InputFile, C.addTempFile(CubinF))) continue; CmdArgs.push_back(CubinF); diff --git a/clang/lib/StaticAnalyzer/Checkers/FuchsiaHandleChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/FuchsiaHandleChecker.cpp index b2e55332074c49..079bc61a87d963 100644 --- a/clang/lib/StaticAnalyzer/Checkers/FuchsiaHandleChecker.cpp +++ b/clang/lib/StaticAnalyzer/Checkers/FuchsiaHandleChecker.cpp @@ -381,7 +381,7 @@ void FuchsiaHandleChecker::checkPostCall(const CallEvent &Call, SymbolRef RetSym = Call.getReturnValue().getAsSymbol(); Notes.push_back([RetSym, FuncDecl](BugReport &BR) -> std::string { auto *PathBR = static_cast<PathSensitiveBugReport *>(&BR); - if (auto IsInteresting = PathBR->getInterestingnessKind(RetSym)) { + if (PathBR->getInterestingnessKind(RetSym)) { std::string SBuf; llvm::raw_string_ostream OS(SBuf); OS << "Function '" << FuncDecl->getDeclName() @@ -397,7 +397,7 @@ void FuchsiaHandleChecker::checkPostCall(const CallEvent &Call, SymbolRef RetSym = Call.getReturnValue().getAsSymbol(); Notes.push_back([RetSym, FuncDecl](BugReport &BR) -> std::string { auto *PathBR = static_cast<PathSensitiveBugReport *>(&BR); - if (auto IsInteresting = PathBR->getInterestingnessKind(RetSym)) { + if (PathBR->getInterestingnessKind(RetSym)) { std::string SBuf; llvm::raw_string_ostream OS(SBuf); OS << "Function '" << FuncDecl->getDeclName() @@ -431,7 +431,7 @@ void FuchsiaHandleChecker::checkPostCall(const CallEvent &Call, } else { Notes.push_back([Handle, ParamDiagIdx](BugReport &BR) -> std::string { auto *PathBR = static_cast<PathSensitiveBugReport *>(&BR); - if (auto IsInteresting = PathBR->getInterestingnessKind(Handle)) { + if (PathBR->getInterestingnessKind(Handle)) { std::string SBuf; llvm::raw_string_ostream OS(SBuf); OS << "Handle released through " << ParamDiagIdx @@ -445,7 +445,7 @@ void FuchsiaHandleChecker::checkPostCall(const CallEvent &Call, } else if (hasFuchsiaAttr<AcquireHandleAttr>(PVD)) { Notes.push_back([Handle, ParamDiagIdx](BugReport &BR) -> std::string { auto *PathBR = static_cast<PathSensitiveBugReport *>(&BR); - if (auto IsInteresting = PathBR->getInterestingnessKind(Handle)) { + if (PathBR->getInterestingnessKind(Handle)) { std::string SBuf; llvm::raw_string_ostream OS(SBuf); OS << "Handle allocated through " << ParamDiagIdx @@ -459,7 +459,7 @@ void FuchsiaHandleChecker::checkPostCall(const CallEvent &Call, } else if (hasFuchsiaUnownedAttr<AcquireHandleAttr>(PVD)) { Notes.push_back([Handle, ParamDiagIdx](BugReport &BR) -> std::string { auto *PathBR = static_cast<PathSensitiveBugReport *>(&BR); - if (auto IsInteresting = PathBR->getInterestingnessKind(Handle)) { + if (PathBR->getInterestingnessKind(Handle)) { std::string SBuf; llvm::raw_string_ostream OS(SBuf); OS << "Unowned handle allocated through " << ParamDiagIdx diff --git a/clang/lib/StaticAnalyzer/Checkers/Yaml.h b/clang/lib/StaticAnalyzer/Checkers/Yaml.h index 4159e14105f820..b2d17420686ee5 100644 --- a/clang/lib/StaticAnalyzer/Checkers/Yaml.h +++ b/clang/lib/StaticAnalyzer/Checkers/Yaml.h @@ -35,7 +35,7 @@ std::optional<T> getConfiguration(CheckerManager &Mgr, Checker *Chk, llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> Buffer = FS->getBufferForFile(ConfigFile.str()); - if (std::error_code ec = Buffer.getError()) { + if (Buffer.getError()) { Mgr.reportInvalidCheckerOptionValue(Chk, Option, "a valid filename instead of '" + std::string(ConfigFile) + "'"); diff --git a/clang/tools/clang-scan-deps/ClangScanDeps.cpp b/clang/tools/clang-scan-deps/ClangScanDeps.cpp index 3baf58725cb22d..dab3de42b7fa1a 100644 --- a/clang/tools/clang-scan-deps/ClangScanDeps.cpp +++ b/clang/tools/clang-scan-deps/ClangScanDeps.cpp @@ -263,8 +263,8 @@ class ResourceDirectoryCache { OutputFile.str(), ErrorFile.str(), }; - if (const int RC = llvm::sys::ExecuteAndWait( - ClangBinaryPath, PrintResourceDirArgs, {}, Redirects)) { + if (llvm::sys::ExecuteAndWait(ClangBinaryPath, PrintResourceDirArgs, {}, + Redirects)) { auto ErrorBuf = llvm::MemoryBuffer::getFile(ErrorFile.c_str()); llvm::errs() << ErrorBuf.get()->getBuffer(); return ""; diff --git a/lld/MachO/Driver.cpp b/lld/MachO/Driver.cpp index 88e865af5cd74b..e175b59e159f27 100644 --- a/lld/MachO/Driver.cpp +++ b/lld/MachO/Driver.cpp @@ -311,7 +311,7 @@ static InputFile *addFile(StringRef path, LoadType loadType, path::filename(path).starts_with("libswift"); if ((isCommandLineLoad && config->allLoad) || loadType == LoadType::CommandLineForce || isLCLinkerForceLoad) { - if (std::optional<MemoryBufferRef> buffer = readFile(path)) { + if (readFile(path)) { Error e = Error::success(); for (const object::Archive::Child &c : file->getArchive().children(e)) { StringRef reason; @@ -341,7 +341,7 @@ static InputFile *addFile(StringRef path, LoadType loadType, // TODO: no need to look for ObjC sections for a given archive member if // we already found that it contains an ObjC symbol. - if (std::optional<MemoryBufferRef> buffer = readFile(path)) { + if (readFile(path)) { Error e = Error::success(); for (const object::Archive::Child &c : file->getArchive().children(e)) { Expected<MemoryBufferRef> mb = c.getMemoryBufferRef(); diff --git a/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp b/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp index 33168abbdc3866..9830e8c600bd09 100644 --- a/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp +++ b/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp @@ -1187,7 +1187,7 @@ DWARFCompileUnit *DWARFContext::getCompileUnitForDataAddress(uint64_t Address) { // So, we walk the CU's and their child DI's manually, looking for the // specific global variable. for (std::unique_ptr<DWARFUnit> &CU : compile_units()) { - if (DWARFDie Die = CU->getVariableForAddress(Address)) { + if (CU->getVariableForAddress(Address)) { return static_cast<DWARFCompileUnit *>(CU.get()); } } diff --git a/llvm/lib/DebugInfo/DWARF/DWARFUnit.cpp b/llvm/lib/DebugInfo/DWARF/DWARFUnit.cpp index 19678f12198281..387345a4ac2d60 100644 --- a/llvm/lib/DebugInfo/DWARF/DWARFUnit.cpp +++ b/llvm/lib/DebugInfo/DWARF/DWARFUnit.cpp @@ -828,7 +828,7 @@ void DWARFUnit::updateVariableDieMap(DWARFDie Die) { // no type), then we use a size of one to still allow symbolization of the // exact address. uint64_t GVSize = 1; - if (DWARFDie BaseType = Die.getAttributeValueAsReferencedDie(DW_AT_type)) + if (Die.getAttributeValueAsReferencedDie(DW_AT_type)) if (std::optional<uint64_t> Size = Die.getTypeSize(getAddressByteSize())) GVSize = *Size; diff --git a/llvm/lib/DebugInfo/GSYM/DwarfTransformer.cpp b/llvm/lib/DebugInfo/GSYM/DwarfTransformer.cpp index fe9a0fb7204b51..f68bae2230aa49 100644 --- a/llvm/lib/DebugInfo/GSYM/DwarfTransformer.cpp +++ b/llvm/lib/DebugInfo/GSYM/DwarfTransformer.cpp @@ -504,7 +504,7 @@ Error DwarfTransformer::convert(uint32_t NumThreads, raw_ostream *OS) { size_t NumBefore = Gsym.getNumFunctionInfos(); auto getDie = [&](DWARFUnit &DwarfUnit) -> DWARFDie { DWARFDie ReturnDie = DwarfUnit.getUnitDIE(false); - if (std::optional<uint64_t> DWOId = DwarfUnit.getDWOId()) { + if (DwarfUnit.getDWOId()) { DWARFUnit *DWOCU = DwarfUnit.getNonSkeletonUnitDIE(false).getDwarfUnit(); if (OS && !DWOCU->isDWOUnit()) { std::string DWOName = dwarf::toString( diff --git a/llvm/lib/IR/PrintPasses.cpp b/llvm/lib/IR/PrintPasses.cpp index d2a9827fd07c43..e2ef20bb81ba7d 100644 --- a/llvm/lib/IR/PrintPasses.cpp +++ b/llvm/lib/IR/PrintPasses.cpp @@ -212,7 +212,7 @@ std::string llvm::doSystemDiff(StringRef Before, StringRef After, static SmallVector<int> FD{-1, -1, -1}; SmallVector<StringRef> SR{Before, After}; static SmallVector<std::string> FileName{"", "", ""}; - if (auto Err = prepareTempFiles(FD, SR, FileName)) + if (prepareTempFiles(FD, SR, FileName)) return "Unable to create temporary file."; static ErrorOr<std::string> DiffExe = sys::findProgramByName(DiffBinary); @@ -238,7 +238,7 @@ std::string llvm::doSystemDiff(StringRef Before, StringRef After, else return "Unable to read result."; - if (auto Err = cleanUpTempFiles(FileName)) + if (cleanUpTempFiles(FileName)) return "Unable to remove temporary file."; return Diff; diff --git a/llvm/lib/Passes/StandardInstrumentations.cpp b/llvm/lib/Passes/StandardInstrumentations.cpp index 7eef511928ec5f..ce14489ba43474 100644 --- a/llvm/lib/Passes/StandardInstrumentations.cpp +++ b/llvm/lib/Passes/StandardInstrumentations.cpp @@ -501,7 +501,7 @@ void IRChangedTester::handleIR(const std::string &S, StringRef PassID) { static SmallVector<int> FD{-1}; SmallVector<StringRef> SR{S}; static SmallVector<std::string> FileName{""}; - if (auto Err = prepareTempFiles(FD, SR, FileName)) { + if (prepareTempFiles(FD, SR, FileName)) { dbgs() << "Unable to create temporary file."; return; } @@ -518,7 +518,7 @@ void IRChangedTester::handleIR(const std::string &S, StringRef PassID) { return; } - if (auto Err = cleanUpTempFiles(FileName)) + if (cleanUpTempFiles(FileName)) dbgs() << "Unable to remove temporary file."; } diff --git a/llvm/lib/Support/VirtualFileSystem.cpp b/llvm/lib/Support/VirtualFileSystem.cpp index d381d79fba9663..e36151038b2d33 100644 --- a/llvm/lib/Support/VirtualFileSystem.cpp +++ b/llvm/lib/Support/VirtualFileSystem.cpp @@ -1337,7 +1337,7 @@ std::error_code RedirectingFileSystem::isLocal(const Twine &Path_, SmallString<256> Path; Path_.toVector(Path); - if (std::error_code EC = makeCanonical(Path)) + if (makeCanonical(Path)) return {}; return ExternalFS->isLocal(Path, Result); diff --git a/llvm/tools/llvm-profgen/ProfiledBinary.cpp b/llvm/tools/llvm-profgen/ProfiledBinary.cpp index 4755f758a828b8..5fb51d3ac9eba7 100644 --- a/llvm/tools/llvm-profgen/ProfiledBinary.cpp +++ b/llvm/tools/llvm-profgen/ProfiledBinary.cpp @@ -812,7 +812,7 @@ void ProfiledBinary::loadSymbolsFromDWARF(ObjectFile &Obj) { // Handles DWO sections that can either be in .o, .dwo or .dwp files. for (const auto &CompilationUnit : DebugContext->compile_units()) { DWARFUnit *const DwarfUnit = CompilationUnit.get(); - if (std::optional<uint64_t> DWOId = DwarfUnit->getDWOId()) { + if (DwarfUnit->getDWOId()) { DWARFUnit *DWOCU = DwarfUnit->getNonSkeletonUnitDIE(false).getDwarfUnit(); if (!DWOCU->isDWOUnit()) { std::string DWOName = dwarf::toString( _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
