[CIR] One more batch of fixing unused vars warnings (and others while here)

Author: bcardosolopes

clang/lib/CIR/CodeGen/CIRAsm.cpp

@@ -122,7 +122,8 @@ static void collectClobbers(const CIRGenFunction &cgf, const AsmStmt &S,
 
   // Clobbers
   for (unsigned i = 0, e = S.getNumClobbers(); i != e; i++) {
-    StringRef clobber = S.getClobber(i);
+    std::string clobberStr = S.getClobber(i);
+    StringRef clobber{clobberStr};
     if (clobber == "memory")
       readOnly = readNone = false;
     else if (clobber == "unwind") {

clang/lib/CIR/CodeGen/CIRGenBuiltin.cpp

@@ -2612,7 +2612,7 @@ RValue CIRGenFunction::emitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
   // can move this up to the beginning of the function.
   //   checkTargetFeatures(E, FD);
 
-  if (unsigned VectorWidth =
+  if ([[maybe_unused]] unsigned VectorWidth =
           getContext().BuiltinInfo.getRequiredVectorWidth(BuiltinID))
     llvm_unreachable("NYI");
 

clang/lib/CIR/CodeGen/CIRGenBuiltinAArch64.cpp

@@ -1866,6 +1866,8 @@ static cir::VectorType GetNeonType(CIRGenFunction *CGF, NeonTypeFlags TypeFlags,
     return cir::VectorType::get(TypeFlags.isUnsigned() ? CGF->UInt8Ty
                                                        : CGF->SInt8Ty,
                                 V1Ty ? 1 : (8 << IsQuad));
+  case NeonTypeFlags::MFloat8:
+    llvm_unreachable("NeonTypeFlags::MFloat8 NYI");
   case NeonTypeFlags::Int16:
   case NeonTypeFlags::Poly16:
     return cir::VectorType::get(TypeFlags.isUnsigned() ? CGF->UInt16Ty

clang/lib/CIR/CodeGen/CIRGenBuiltinNVPTX.cpp

@@ -32,7 +32,7 @@ using namespace cir;
 
 mlir::Value CIRGenFunction::emitNVPTXBuiltinExpr(unsigned builtinId,
                                                  const CallExpr *expr) {
-  auto getIntrinsic = [&](const char *name) {
+  [[maybe_unused]] auto getIntrinsic = [&](const char *name) {
     mlir::Type intTy = cir::IntType::get(&getMLIRContext(), 32, false);
     return builder
         .create<cir::LLVMIntrinsicCallOp>(getLoc(expr->getExprLoc()),

clang/lib/CIR/CodeGen/CIRGenCall.cpp

@@ -308,7 +308,7 @@ void CIRGenFunction::emitAggregateStore(mlir::Value Val, Address Dest,
 
 static Address emitAddressAtOffset(CIRGenFunction &CGF, Address addr,
                                    const cir::ABIArgInfo &info) {
-  if (unsigned offset = info.getDirectOffset()) {
+  if ([[maybe_unused]] unsigned offset = info.getDirectOffset()) {
     llvm_unreachable("NYI");
   }
   return addr;
@@ -1380,8 +1380,7 @@ bool CIRGenModule::MayDropFunctionReturn(const ASTContext &astContext,
                                          QualType ReturnType) {
   // We can't just disard the return value for a record type with a complex
   // destructor or a non-trivially copyable type.
-  if (const RecordType *RT =
-          ReturnType.getCanonicalType()->getAs<RecordType>()) {
+  if (ReturnType.getCanonicalType()->getAs<RecordType>()) {
     llvm_unreachable("NYI");
   }
 

clang/lib/CIR/CodeGen/CIRGenClass.cpp

@@ -439,7 +439,7 @@ class AssignmentMemcpyizer : public FieldMemcpyizer {
           return Field;
       }
       return nullptr;
-    } else if (CXXMemberCallExpr *MCE = dyn_cast<CXXMemberCallExpr>(S)) {
+    } else if (isa<CXXMemberCallExpr>(S)) {
       // We want to represent all calls explicitly for analysis purposes.
       return nullptr;
     } else if (CallExpr *CE = dyn_cast<CallExpr>(S)) {

clang/lib/CIR/CodeGen/CIRGenCoroutine.cpp

@@ -287,7 +287,7 @@ CIRGenFunction::emitCoroutineBody(const CoroutineBodyStmt &S) {
           .getResult();
 
   // Handle allocation failure if 'ReturnStmtOnAllocFailure' was provided.
-  if (auto *RetOnAllocFailure = S.getReturnStmtOnAllocFailure())
+  if (S.getReturnStmtOnAllocFailure())
     llvm_unreachable("NYI");
 
   {

clang/lib/CIR/CodeGen/CIRGenDecl.cpp

@@ -377,7 +377,7 @@ void CIRGenFunction::emitAutoVarCleanups(const AutoVarEmission &emission) {
     assert(0 && "not implemented");
 
   // Handle the cleanup attribute.
-  if (const CleanupAttr *CA = D.getAttr<CleanupAttr>())
+  if (D.getAttr<CleanupAttr>())
     assert(0 && "not implemented");
 
   // TODO: handle block variable
@@ -436,9 +436,9 @@ static std::string getStaticDeclName(CIRGenModule &CGM, const VarDecl &D) {
     DC = cast<DeclContext>(CD->getNonClosureContext());
   if (const auto *FD = dyn_cast<FunctionDecl>(DC))
     ContextName = std::string(CGM.getMangledName(FD));
-  else if (const auto *BD = dyn_cast<BlockDecl>(DC))
+  else if (isa<BlockDecl>(DC))
     llvm_unreachable("block decl context for static var is NYI");
-  else if (const auto *OMD = dyn_cast<ObjCMethodDecl>(DC))
+  else if (isa<ObjCMethodDecl>(DC))
     llvm_unreachable("ObjC decl context for static var is NYI");
   else
     llvm_unreachable("Unknown context for static var decl");
@@ -520,9 +520,9 @@ CIRGenModule::getOrCreateStaticVarDecl(const VarDecl &D,
   }
 
   GlobalDecl GD;
-  if (const auto *CD = dyn_cast<CXXConstructorDecl>(DC))
+  if (isa<CXXConstructorDecl>(DC))
     llvm_unreachable("C++ constructors static var context is NYI");
-  else if (const auto *DD = dyn_cast<CXXDestructorDecl>(DC))
+  else if (isa<CXXDestructorDecl>(DC))
     llvm_unreachable("C++ destructors static var context is NYI");
   else if (const auto *FD = dyn_cast<FunctionDecl>(DC))
     GD = GlobalDecl(FD);
@@ -652,16 +652,16 @@ void CIRGenFunction::emitStaticVarDecl(const VarDecl &D,
   if (D.hasAttr<AnnotateAttr>())
     llvm_unreachable("Global annotations are NYI");
 
-  if (auto *SA = D.getAttr<PragmaClangBSSSectionAttr>())
+  if (D.getAttr<PragmaClangBSSSectionAttr>())
     llvm_unreachable("CIR global BSS section attribute is NYI");
-  if (auto *SA = D.getAttr<PragmaClangDataSectionAttr>())
+  if (D.getAttr<PragmaClangDataSectionAttr>())
     llvm_unreachable("CIR global Data section attribute is NYI");
-  if (auto *SA = D.getAttr<PragmaClangRodataSectionAttr>())
+  if (D.getAttr<PragmaClangRodataSectionAttr>())
     llvm_unreachable("CIR global Rodata section attribute is NYI");
-  if (auto *SA = D.getAttr<PragmaClangRelroSectionAttr>())
+  if (D.getAttr<PragmaClangRelroSectionAttr>())
     llvm_unreachable("CIR global Relro section attribute is NYI");
 
-  if (const SectionAttr *SA = D.getAttr<SectionAttr>())
+  if (D.getAttr<SectionAttr>())
     llvm_unreachable("CIR global object file section attribute is NYI");
 
   if (D.hasAttr<RetainAttr>())
@@ -754,7 +754,7 @@ void CIRGenFunction::emitExprAsInit(const Expr *init, const ValueDecl *D,
     AggValueSlot::Overlap_t Overlap = AggValueSlot::MayOverlap;
     if (isa<VarDecl>(D))
       Overlap = AggValueSlot::DoesNotOverlap;
-    else if (auto *FD = dyn_cast<FieldDecl>(D))
+    else if (isa<FieldDecl>(D))
       assert(false && "Field decl NYI");
     else
       assert(false && "Only VarDecl implemented so far");
@@ -773,6 +773,8 @@ void CIRGenFunction::emitDecl(const Decl &D) {
   case Decl::ImplicitConceptSpecialization:
   case Decl::HLSLBuffer:
   case Decl::TopLevelStmt:
+  case Decl::OpenACCDeclare:
+  case Decl::OpenACCRoutine:
     llvm_unreachable("NYI");
   case Decl::BuiltinTemplate:
   case Decl::TranslationUnit:
@@ -831,11 +833,11 @@ void CIRGenFunction::emitDecl(const Decl &D) {
     llvm_unreachable("Declaration should not be in declstmts!");
   case Decl::Record:    // struct/union/class X;
   case Decl::CXXRecord: // struct/union/class X; [C++]
-    if (auto *DI = getDebugInfo())
+    if (getDebugInfo())
       llvm_unreachable("NYI");
     return;
   case Decl::Enum: // enum X;
-    if (auto *DI = getDebugInfo())
+    if (getDebugInfo())
       llvm_unreachable("NYI");
     return;
   case Decl::Function:     // void X();
@@ -886,7 +888,7 @@ void CIRGenFunction::emitDecl(const Decl &D) {
   case Decl::Typedef:     // typedef int X;
   case Decl::TypeAlias: { // using X = int; [C++0x]
     QualType Ty = cast<TypedefNameDecl>(D).getUnderlyingType();
-    if (auto *DI = getDebugInfo())
+    if (getDebugInfo())
       assert(!cir::MissingFeatures::generateDebugInfo());
     if (Ty->isVariablyModifiedType())
       emitVariablyModifiedType(Ty);

clang/lib/CIR/Dialect/Transforms/TargetLowering/LowerFunction.cpp

@@ -35,7 +35,7 @@ namespace {
 
 mlir::Value buildAddressAtOffset(LowerFunction &LF, mlir::Value addr,
                                  const ABIArgInfo &info) {
-  if (unsigned offset = info.getDirectOffset()) {
+  if ([[maybe_unused]] unsigned offset = info.getDirectOffset()) {
     cir_cconv_unreachable("NYI");
   }
   return addr;
@@ -359,7 +359,7 @@ mlir::Value createCoercedValue(mlir::Value Src, mlir::Type Ty,
 
 mlir::Value emitAddressAtOffset(LowerFunction &LF, mlir::Value addr,
                                 const ABIArgInfo &info) {
-  if (unsigned offset = info.getDirectOffset()) {
+  if ([[maybe_unused]] unsigned offset = info.getDirectOffset()) {
     cir_cconv_unreachable("NYI");
   }
   return addr;

clang/lib/CIR/Dialect/Transforms/TargetLowering/RecordLayoutBuilder.cpp

@@ -258,7 +258,8 @@ void ItaniumRecordLayoutBuilder::initializeLayout(const mlir::Type Ty) {
   cir_cconv_assert(!cir::MissingFeatures::recordDeclIsPacked());
 
   // Honor the default struct packing maximum alignment flag.
-  if (unsigned DefaultMaxFieldAlignment = Context.getLangOpts().PackStruct) {
+  if ([[maybe_unused]] unsigned DefaultMaxFieldAlignment =
+          Context.getLangOpts().PackStruct) {
     cir_cconv_unreachable("NYI");
   }