diff --git a/clang/lib/CIR/CodeGen/CIRGenStmt.cpp b/clang/lib/CIR/CodeGen/CIRGenStmt.cpp
index 8dff466cecd8..410c25891bbb 100644
--- a/clang/lib/CIR/CodeGen/CIRGenStmt.cpp
+++ b/clang/lib/CIR/CodeGen/CIRGenStmt.cpp
@@ -101,6 +101,7 @@ mlir::LogicalResult CIRGenFunction::emitStmt(const Stmt *S,
   switch (S->getStmtClass()) {
   case Stmt::OMPScopeDirectiveClass:
     llvm_unreachable("NYI");
+  case Stmt::OpenACCCombinedConstructClass:
   case Stmt::OpenACCComputeConstructClass:
   case Stmt::OpenACCLoopConstructClass:
   case Stmt::OMPErrorDirectiveClass:
diff --git a/clang/lib/CIR/CodeGen/CIRGenTBAA.h b/clang/lib/CIR/CodeGen/CIRGenTBAA.h
index b6a392bd164c..49ff321e342a 100644
--- a/clang/lib/CIR/CodeGen/CIRGenTBAA.h
+++ b/clang/lib/CIR/CodeGen/CIRGenTBAA.h
@@ -98,11 +98,11 @@ struct TBAAAccessInfo {
 /// types to LLVM types.
 class CIRGenTBAA {
   mlir::MLIRContext *ctx;
-  clang::ASTContext &context;
-  CIRGenTypes &types;
+  [[maybe_unused]] clang::ASTContext &context;
+  [[maybe_unused]] CIRGenTypes &types;
   mlir::ModuleOp moduleOp;
-  const clang::CodeGenOptions &codeGenOpts;
-  const clang::LangOptions &features;
+  [[maybe_unused]] const clang::CodeGenOptions &codeGenOpts;
+  [[maybe_unused]] const clang::LangOptions &features;
 
 public:
   CIRGenTBAA(mlir::MLIRContext *ctx, clang::ASTContext &context,
diff --git a/clang/lib/CIR/Dialect/Transforms/TargetLowering/RecordLayoutBuilder.cpp b/clang/lib/CIR/Dialect/Transforms/TargetLowering/RecordLayoutBuilder.cpp
index db2af4ac9177..e47fb6fa3afc 100644
--- a/clang/lib/CIR/Dialect/Transforms/TargetLowering/RecordLayoutBuilder.cpp
+++ b/clang/lib/CIR/Dialect/Transforms/TargetLowering/RecordLayoutBuilder.cpp
@@ -487,10 +487,6 @@ void ItaniumRecordLayoutBuilder::finishLayout(const StructType D) {
 
   // Finally, round the size of the record up to the alignment of the
   // record itself.
-  uint64_t unpaddedSize = getSizeInBits() - UnfilledBitsInLastUnit;
-  uint64_t unpackedSizeInBits =
-      llvm::alignTo(getSizeInBits(), Context.toBits(UnpackedAlignment));
-
   uint64_t roundedSize = llvm::alignTo(
       getSizeInBits(),
       Context.toBits(!Context.getTargetInfo().defaultsToAIXPowerAlignment()
@@ -549,10 +545,8 @@ void ItaniumRecordLayoutBuilder::checkFieldPadding(
   // Warn if padding was introduced to the struct/class.
   if (!IsUnion && Offset > UnpaddedOffset) {
     unsigned padSize = Offset - UnpaddedOffset;
-    bool inBits = true;
     if (padSize % CharBitNum == 0) {
       padSize = padSize / CharBitNum;
-      inBits = false;
     }
     cir_cconv_assert(!cir::MissingFeatures::bitFieldPaddingDiagnostics());
   }