[CIR][NFC] Use free op create functions in CirGenExprComplex (#1972)

Use the op create function in the CirGenExprComplex file after the
restructure

Author: AmrDeveloper

clang/lib/CIR/CodeGen/CIRGenExprComplex.cpp

@@ -928,23 +928,22 @@ mlir::Value ComplexExprEmitter::VisitAbstractConditionalOperator(
   Expr *cond = e->getCond()->IgnoreParens();
   mlir::Value condValue = cgf.evaluateExprAsBool(cond);
 
-  return builder
-      .create<cir::TernaryOp>(
-          loc, condValue,
-          /*thenBuilder=*/
-          [&](mlir::OpBuilder &b, mlir::Location loc) {
-            eval.begin(cgf);
-            mlir::Value trueValue = Visit(e->getTrueExpr());
-            b.create<cir::YieldOp>(loc, trueValue);
-            eval.end(cgf);
-          },
-          /*elseBuilder=*/
-          [&](mlir::OpBuilder &b, mlir::Location loc) {
-            eval.begin(cgf);
-            mlir::Value falseValue = Visit(e->getFalseExpr());
-            b.create<cir::YieldOp>(loc, falseValue);
-            eval.end(cgf);
-          })
+  return cir::TernaryOp::create(
+             builder, loc, condValue,
+             /*trueBuilder=*/
+             [&](mlir::OpBuilder &b, mlir::Location loc) {
+               eval.begin(cgf);
+               mlir::Value trueValue = Visit(e->getTrueExpr());
+               cir::YieldOp::create(b, loc, trueValue);
+               eval.end(cgf);
+             },
+             /*falseBuilder=*/
+             [&](mlir::OpBuilder &b, mlir::Location loc) {
+               eval.begin(cgf);
+               mlir::Value falseValue = Visit(e->getFalseExpr());
+               cir::YieldOp::create(b, loc, falseValue);
+               eval.end(cgf);
+             })
       .getResult();
 }
 

clang/lib/CIR/FrontendAction/CIRGenAction.cpp

@@ -227,7 +227,7 @@ class CIRGenConsumer : public clang::ASTConsumer {
               .failed()) {
         if (!passOptParsingFailure.empty())
           diagnosticsEngine.Report(diag::err_drv_cir_pass_opt_parsing)
-              << feOptions.ClangIRLifetimeCheckOpts;
+              << passOptParsingFailure;
         else
           llvm::report_fatal_error("CIR codegen: MLIR pass manager fails "
                                    "when running CIR passes!");

clang/test/CIR/Transforms/lifetime-invalid-option.cpp

@@ -1,3 +1,7 @@
 // RUN: not %clang_cc1 -triple x86_64-unknown-linux-gnu -fclangir -fclangir-lifetime-check="yolo=invalid,null" -emit-cir %s -o - 2>&1 | FileCheck %s
+// RUN: not %clang_cc1 -triple x86_64-unknown-linux-gnu -fclangir -fclangir-idiom-recognizer="idiom=invalid" -emit-cir %s -o - 2>&1 | FileCheck %s --check-prefix=IDIOM
+// RUN: not %clang_cc1 -triple x86_64-unknown-linux-gnu -fclangir -fclangir-idiom-recognizer -fclangir-lib-opt="libopt=invalid" -emit-cir %s -o - 2>&1 | FileCheck %s --check-prefix=LIBOPT
 
-// CHECK: clangir pass option 'yolo=invalid,null' not recognized
+// CHECK: clangir pass option 'yolo=invalid,null' not recognized
+// IDIOM: clangir pass option 'idiom=invalid' not recognized
+// LIBOPT: clangir pass option 'libopt=invalid' not recognized