[CIR] Start silencing unused var warnings

Author: bcardosolopes

clang/lib/CIR/CodeGen/CIRGenCleanup.h

@@ -124,7 +124,7 @@ class EHScope {
     // Traditional LLVM codegen also checks for `!block->use_empty()`, but
     // in CIRGen the block content is not important, just used as a way to
     // signal `hasEHBranches`.
-    if (mlir::Block *block = getCachedEHDispatchBlock())
+    if ([[maybe_unused]] mlir::Block *block = getCachedEHDispatchBlock())
       return true;
     return false;
   }

clang/lib/CIR/CodeGen/CIRGenFunction.cpp

@@ -251,7 +251,7 @@ static bool endsWithReturn(const Decl *f) {
   const Stmt *body = nullptr;
   if (auto *fd = dyn_cast_or_null<FunctionDecl>(f))
     body = fd->getBody();
-  else if (auto *omd = dyn_cast_or_null<ObjCMethodDecl>(f))
+  else if (isa_and_nonnull<ObjCMethodDecl>(f))
     llvm_unreachable("NYI");
 
   if (auto *cs = dyn_cast_or_null<CompoundStmt>(body)) {
@@ -554,7 +554,7 @@ void CIRGenFunction::finishFunction(SourceLocation endLoc) {
   // If there are multiple branches to the return block, the branch
   // instructions will get the location of the return statements and
   // all will be fine.
-  if (auto *di = getDebugInfo())
+  if (getDebugInfo())
     assert(!cir::MissingFeatures::generateDebugInfo() && "NYI");
 
   // Pop any cleanups that might have been associated with the
@@ -581,7 +581,7 @@ void CIRGenFunction::finishFunction(SourceLocation endLoc) {
   }
 
   // Emit debug descriptor for function end.
-  if (auto *di = getDebugInfo())
+  if (getDebugInfo())
     assert(!cir::MissingFeatures::generateDebugInfo() && "NYI");
 
   // Reset the debug location to that of the simple 'return' expression, if any
@@ -1090,9 +1090,7 @@ void CIRGenFunction::StartFunction(GlobalDecl gd, QualType retTy,
     llvm_unreachable("NYI");
 
   // Apply xray attributes to the function (as a string, for now)
-  if (const auto *xRayAttr = d ? d->getAttr<XRayInstrumentAttr>() : nullptr) {
-    assert(!cir::MissingFeatures::xray());
-  } else {
+  if (d->getAttr<XRayInstrumentAttr>()) {
     assert(!cir::MissingFeatures::xray());
   }
 
@@ -1522,8 +1520,7 @@ void CIRGenFunction::emitNullInitialization(mlir::Location loc, Address destPtr,
   // Don't bother emitting a zero-byte memset.
   if (size.isZero()) {
     // But note that getTypeInfo returns 0 for a VLA.
-    if (const VariableArrayType *vlaType = dyn_cast_or_null<VariableArrayType>(
-            getContext().getAsArrayType(ty))) {
+    if (isa_and_nonnull<VariableArrayType>(getContext().getAsArrayType(ty))) {
       llvm_unreachable("NYI");
     } else {
       return;

clang/lib/CIR/CodeGen/CIRGenModule.cpp

@@ -887,20 +887,20 @@ void CIRGenModule::setNonAliasAttributes(GlobalDecl gd, mlir::Operation *go) {
     if (gv) {
       if (d->hasAttr<RetainAttr>())
         assert(!cir::MissingFeatures::addUsedGlobal());
-      if (auto *sa = d->getAttr<PragmaClangBSSSectionAttr>())
+      if (d->getAttr<PragmaClangBSSSectionAttr>())
         assert(!cir::MissingFeatures::addSectionAttributes());
-      if (auto *sa = d->getAttr<PragmaClangDataSectionAttr>())
+      if (d->getAttr<PragmaClangDataSectionAttr>())
         assert(!cir::MissingFeatures::addSectionAttributes());
-      if (auto *sa = d->getAttr<PragmaClangRodataSectionAttr>())
+      if (d->getAttr<PragmaClangRodataSectionAttr>())
         assert(!cir::MissingFeatures::addSectionAttributes());
-      if (auto *sa = d->getAttr<PragmaClangRelroSectionAttr>())
+      if (d->getAttr<PragmaClangRelroSectionAttr>())
         assert(!cir::MissingFeatures::addSectionAttributes());
     }
     auto f = llvm::dyn_cast_or_null<cir::FuncOp>(go);
     if (f) {
       if (d->hasAttr<RetainAttr>())
         assert(!cir::MissingFeatures::addUsedGlobal());
-      if (auto *sa = d->getAttr<PragmaClangTextSectionAttr>())
+      if (d->getAttr<PragmaClangTextSectionAttr>())
         if (!d->getAttr<SectionAttr>())
           assert(!cir::MissingFeatures::setSectionForFuncOp());
 
@@ -1066,7 +1066,7 @@ void CIRGenModule::setTLSMode(mlir::Operation *op, const VarDecl &d) const {
   auto tlm = GetDefaultCIRTLSModel();
 
   // Override the TLS model if it is explicitly specified.
-  if (const TLSModelAttr *attr = d.getAttr<TLSModelAttr>()) {
+  if (d.getAttr<TLSModelAttr>()) {
     llvm_unreachable("NYI");
   }
 
@@ -1852,7 +1852,7 @@ void CIRGenModule::emitDeclContext(const DeclContext *dc) {
     // ObjCImplDecl does not recursively visit them. We need to do that in
     // case they're nested inside another construct (LinkageSpecDecl /
     // ExportDecl) that does stop them from being considered "top-level".
-    if (auto *oid = dyn_cast<ObjCImplDecl>(i))
+    if (isa<ObjCImplDecl>(i))
       llvm_unreachable("NYI");
 
     emitTopLevelDecl(i);
@@ -2599,7 +2599,7 @@ StringRef CIRGenModule::getMangledName(GlobalDecl gd) {
 
   // Some ABIs don't have constructor variants. Make sure that base and complete
   // constructors get mangled the same.
-  if (const auto *cd = dyn_cast<CXXConstructorDecl>(canonicalGd.getDecl())) {
+  if (isa<CXXConstructorDecl>(canonicalGd.getDecl())) {
     if (!getTarget().getCXXABI().hasConstructorVariants()) {
       assert(false && "NYI");
     }

clang/lib/CIR/CodeGen/CIRGenStmt.cpp

@@ -36,9 +36,9 @@ Address CIRGenFunction::emitCompoundStmtWithoutScope(const CompoundStmt &S,
   for (auto *CurStmt : S.body()) {
     if (getLast && ExprResult == CurStmt) {
       while (!isa<Expr>(ExprResult)) {
-        if (const auto *LS = dyn_cast<LabelStmt>(ExprResult))
+        if (isa<LabelStmt>(ExprResult))
           llvm_unreachable("labels are NYI");
-        else if (const auto *AS = dyn_cast<AttributedStmt>(ExprResult))
+        else if (isa<AttributedStmt>(ExprResult))
           llvm_unreachable("statement attributes are NYI");
         else
           llvm_unreachable("Unknown value statement");

clang/lib/CIR/CodeGen/CIRGenVTables.cpp

@@ -55,7 +55,6 @@ mlir::Type CIRGenVTables::getVTableComponentType() {
 
 mlir::Type CIRGenVTables::getVTableType(const VTableLayout &layout) {
   SmallVector<mlir::Type, 4> tys;
-  mlir::MLIRContext *mlirContext = CGM.getBuilder().getContext();
   auto componentType = getVTableComponentType();
   for (unsigned i = 0, e = layout.getNumVTables(); i != e; ++i)
     tys.push_back(cir::ArrayType::get(componentType, layout.getVTableSize(i)));

clang/lib/CIR/CodeGen/TargetInfo.cpp

@@ -53,10 +53,10 @@ class DefaultABIInfo : public ABIInfo {
       llvm_unreachable("NYI");
 
     // Treat an enum type as its underlying type.
-    if (const EnumType *EnumTy = RetTy->getAs<EnumType>())
+    if (RetTy->getAs<EnumType>())
       llvm_unreachable("NYI");
 
-    if (const auto *EIT = RetTy->getAs<BitIntType>())
+    if (RetTy->getAs<BitIntType>())
       llvm_unreachable("NYI");
 
     return (isPromotableIntegerTypeForABI(RetTy)
@@ -72,10 +72,10 @@ class DefaultABIInfo : public ABIInfo {
     }
 
     // Treat an enum type as its underlying type.
-    if (const EnumType *EnumTy = Ty->getAs<EnumType>())
+    if (Ty->getAs<EnumType>())
       llvm_unreachable("NYI");
 
-    if (const auto *EIT = Ty->getAs<BitIntType>())
+    if (Ty->getAs<BitIntType>())
       llvm_unreachable("NYI");
 
     return (isPromotableIntegerTypeForABI(Ty) ? cir::ABIArgInfo::getExtend(Ty)
@@ -357,7 +357,7 @@ class NVPTXTargetCIRGenInfo : public TargetCIRGenInfo {
   }
   void setTargetAttributes(const clang::Decl *decl, mlir::Operation *global,
                            CIRGenModule &cgm) const override {
-    if (const auto *vd = clang::dyn_cast_or_null<clang::VarDecl>(decl)) {
+    if (clang::isa_and_nonnull<clang::VarDecl>(decl)) {
       assert(!cir::MissingFeatures::emitNVVMMetadata());
       return;
     }