[CIR] Fix many new warnings on Darwin with most recent developer tools

Author: bcardosolopes

clang/include/clang/CIR/Dialect/IR/CIROps.td

@@ -767,7 +767,8 @@ def CIR_ReturnOp : CIR_Op<"return", [
 
   // Allow building a ReturnOp with no return operand.
   let builders = [
-    OpBuilder<(ins), [{ build($_builder, $_state, std::nullopt); }]>
+    OpBuilder<(ins),
+    [{ build($_builder, $_state, {}); }]>
   ];
 
   // Provide extra utility definitions on the c++ operation class definition.

clang/lib/Basic/LangStandards.cpp

@@ -21,6 +21,8 @@ StringRef clang::languageToString(Language L) {
     return "Asm";
   case Language::LLVM_IR:
     return "LLVM IR";
+  case Language::CIR:
+    return "ClangIR";
   case Language::C:
     return "C";
   case Language::CXX:
@@ -91,6 +93,7 @@ LangStandard::Kind clang::getDefaultLanguageStandard(clang::Language Lang,
   switch (Lang) {
   case Language::Unknown:
   case Language::LLVM_IR:
+  case Language::CIR:
   case Language::OpenCL:
     return LangStandard::lang_opencl12;
   case Language::OpenCLCXX:

clang/lib/CIR/CodeGen/CIRGenCall.cpp

@@ -1087,8 +1087,8 @@ CIRGenTypes::arrangeFreeFunctionType(CanQual<FunctionNoProtoType> FTNP) {
   // When translating an unprototyped function type, always use a
   // variadic type.
   return arrangeCIRFunctionInfo(FTNP->getReturnType().getUnqualifiedType(),
-                                cir::FnInfoOpts::None, std::nullopt,
-                                FTNP->getExtInfo(), {}, RequiredArgs(0));
+                                cir::FnInfoOpts::None, {}, FTNP->getExtInfo(),
+                                {}, RequiredArgs(0));
 }
 
 const CIRGenFunctionInfo &
@@ -1370,7 +1370,7 @@ CIRGenTypes::arrangeFunctionDeclaration(const FunctionDecl *FD) {
   // type.
   if (CanQual<FunctionNoProtoType> noProto = FTy.getAs<FunctionNoProtoType>()) {
     return arrangeCIRFunctionInfo(noProto->getReturnType(),
-                                  cir::FnInfoOpts::None, std::nullopt,
+                                  cir::FnInfoOpts::None, {},
                                   noProto->getExtInfo(), {}, RequiredArgs::All);
   }
 

clang/lib/CIR/CodeGen/CIRGenDecl.cpp

@@ -772,6 +772,7 @@ void CIRGenFunction::emitDecl(const Decl &D) {
   switch (D.getKind()) {
   case Decl::ImplicitConceptSpecialization:
   case Decl::HLSLBuffer:
+  case Decl::HLSLRootSignature:
   case Decl::TopLevelStmt:
   case Decl::OpenACCDeclare:
   case Decl::OpenACCRoutine:

clang/lib/CIR/CodeGen/CIRGenFunction.cpp

@@ -83,6 +83,7 @@ cir::TypeEvaluationKind CIRGenFunction::getEvaluationKind(QualType type) {
 
     case Type::ArrayParameter:
     case Type::HLSLAttributedResource:
+    case Type::HLSLInlineSpirv:
       llvm_unreachable("NYI");
 
     case Type::Auto:
@@ -1786,6 +1787,8 @@ void CIRGenFunction::emitVariablyModifiedType(QualType type) {
     case clang::Type::PackIndexing:
     case clang::Type::ArrayParameter:
     case clang::Type::HLSLAttributedResource:
+    case clang::Type::HLSLInlineSpirv:
+    case clang::Type::PredefinedSugar:
       llvm_unreachable("NYI");
 
 #define TYPE(Class, Base)

clang/lib/CIR/CodeGen/CIRGenFunction.h

@@ -2029,7 +2029,7 @@ class CIRGenFunction : public CIRGenTypeCache {
 
   mlir::LogicalResult
   emitCXXForRangeStmt(const CXXForRangeStmt &S,
-                      llvm::ArrayRef<const Attr *> Attrs = std::nullopt);
+                      llvm::ArrayRef<const Attr *> Attrs = {});
 
   RValue emitCXXMemberCallExpr(const clang::CXXMemberCallExpr *E,
                                ReturnValueSlot ReturnValue);
@@ -2387,9 +2387,8 @@ class CIRGenFunction : public CIRGenTypeCache {
 
   // Build CIR for a statement. useCurrentScope should be true if no
   // new scopes need be created when finding a compound statement.
-  mlir::LogicalResult
-  emitStmt(const clang::Stmt *S, bool useCurrentScope,
-           llvm::ArrayRef<const Attr *> Attrs = std::nullopt);
+  mlir::LogicalResult emitStmt(const clang::Stmt *S, bool useCurrentScope,
+                               llvm::ArrayRef<const Attr *> Attrs = {});
 
   LValue emitStmtExprLValue(const StmtExpr *E);
 

clang/lib/CIR/CodeGen/CIRGenItaniumCXXABI.cpp

@@ -1578,6 +1578,7 @@ void CIRGenItaniumRTTIBuilder::BuildVTablePointer(mlir::Location loc,
   switch (Ty->getTypeClass()) {
   case Type::ArrayParameter:
   case Type::HLSLAttributedResource:
+  case Type::HLSLInlineSpirv:
     llvm_unreachable("NYI");
 #define TYPE(Class, Base)
 #define ABSTRACT_TYPE(Class, Base)
@@ -1954,6 +1955,7 @@ mlir::Attribute CIRGenItaniumRTTIBuilder::BuildTypeInfo(
   switch (Ty->getTypeClass()) {
   case Type::ArrayParameter:
   case Type::HLSLAttributedResource:
+  case Type::HLSLInlineSpirv:
     llvm_unreachable("NYI");
 #define TYPE(Class, Base)
 #define ABSTRACT_TYPE(Class, Base)

clang/lib/CIR/CodeGen/CIRGenTypes.cpp

@@ -372,6 +372,7 @@ mlir::Type CIRGenTypes::convertType(QualType T) {
 
   case Type::ArrayParameter:
   case Type::HLSLAttributedResource:
+  case Type::HLSLInlineSpirv:
     llvm_unreachable("NYI");
 
   case Type::Builtin: {

clang/lib/CIR/Dialect/IR/CIRDialect.cpp

@@ -2491,10 +2491,9 @@ void cir::FuncOp::build(OpBuilder &builder, OperationState &result,
   if (argAttrs.empty())
     return;
 
-  call_interface_impl::addArgAndResultAttrs(builder, result, argAttrs,
-                                            /*resultAttrs=*/std::nullopt,
-                                            getArgAttrsAttrName(result.name),
-                                            getResAttrsAttrName(result.name));
+  call_interface_impl::addArgAndResultAttrs(
+      builder, result, argAttrs, ArrayRef<DictionaryAttr>{},
+      getArgAttrsAttrName(result.name), getResAttrsAttrName(result.name));
 }
 
 ParseResult cir::FuncOp::parse(OpAsmParser &parser, OperationState &state) {

clang/lib/CIR/Lowering/ThroughMLIR/LowerCIRToMLIR.cpp

@@ -1263,7 +1263,8 @@ class CIRCastOpLowering : public mlir::OpConversionPattern<cir::CastOp> {
     case CIR::array_to_ptrdecay: {
       auto newDstType = llvm::cast<mlir::MemRefType>(convertTy(dstType));
       rewriter.replaceOpWithNewOp<mlir::memref::ReinterpretCastOp>(
-          op, newDstType, src, 0, std::nullopt, std::nullopt);
+          op, newDstType, src, 0, ArrayRef<int64_t>{}, ArrayRef<int64_t>{},
+          ArrayRef<mlir::NamedAttribute>{});
       return mlir::success();
     }
     case CIR::int_to_bool: {
@@ -1397,8 +1398,9 @@ class CIRGetElementOpLowering
     rewriter.replaceOpWithNewOp<mlir::memref::ReinterpretCastOp>(
         op, dstType, adaptor.getBase(),
         /* offset */ index,
-        /* sizes */ std::nullopt,
-        /* strides */ std::nullopt);
+        /* sizes */ ArrayRef<mlir::OpFoldResult>{},
+        /* strides */ ArrayRef<mlir::OpFoldResult>{},
+        /* attr */ ArrayRef<mlir::NamedAttribute>{});
 
     return mlir::success();
   }
@@ -1476,7 +1478,8 @@ class CIRPtrStrideOpLowering
       stride = rewriter.create<mlir::arith::IndexCastOp>(op.getLoc(), indexType,
                                                          stride);
     rewriter.replaceOpWithNewOp<mlir::memref::ReinterpretCastOp>(
-        op, newDstType, base, stride, std::nullopt, std::nullopt);
+        op, newDstType, base, stride, mlir::ValueRange{}, mlir::ValueRange{},
+        llvm::ArrayRef<mlir::NamedAttribute>{});
     rewriter.eraseOp(baseOp);
     return mlir::success();
   }