Rebase with the main branch

Author: AmrDeveloper

clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp

@@ -201,40 +201,6 @@ class ScalarExprEmitter : public StmtVisitor<ScalarExprEmitter, mlir::Value> {
                                 e->getSourceRange().getBegin());
   }
 
-  mlir::Value
-  VisitAbstractConditionalOperator(const AbstractConditionalOperator *e) {
-    mlir::Location loc = cgf.getLoc(e->getSourceRange());
-    Expr *condExpr = e->getCond();
-    Expr *lhsExpr = e->getTrueExpr();
-    Expr *rhsExpr = e->getFalseExpr();
-
-    QualType condType = condExpr->getType();
-
-    // OpenCL: If the condition is a vector, we can treat this condition like
-    // the select function.
-    if ((cgf.getLangOpts().OpenCL && condType->isVectorType()) ||
-        condType->isExtVectorType()) {
-      cgf.cgm.errorNYI(loc, "TernaryOp OpenCL VectorType condition");
-      return {};
-    }
-
-    if (condType->isVectorType() || condType->isSveVLSBuiltinType()) {
-      if (!condExpr->getType()->isVectorType()) {
-        cgf.cgm.errorNYI(loc, "TernaryOp for SVE vector");
-        return {};
-      }
-
-      mlir::Value condValue = Visit(condExpr);
-      mlir::Value lhsValue = Visit(lhsExpr);
-      mlir::Value rhsValue = Visit(rhsExpr);
-      return builder.create<cir::VecTernaryOp>(loc, condValue, lhsValue,
-                                               rhsValue);
-    }
-
-    cgf.cgm.errorNYI(loc, "TernaryOp for non vector types");
-    return {};
-  }
-
   mlir::Value VisitMemberExpr(MemberExpr *e);
 
   mlir::Value VisitInitListExpr(InitListExpr *e);
@@ -1990,19 +1956,28 @@ mlir::Value ScalarExprEmitter::VisitAbstractConditionalOperator(
     }
   }
 
+  QualType condType = condExpr->getType();
+
   // OpenCL: If the condition is a vector, we can treat this condition like
   // the select function.
-  if ((cgf.getLangOpts().OpenCL && condExpr->getType()->isVectorType()) ||
-      condExpr->getType()->isExtVectorType()) {
+  if ((cgf.getLangOpts().OpenCL && condType->isVectorType()) ||
+      condType->isExtVectorType()) {
     assert(!cir::MissingFeatures::vectorType());
     cgf.cgm.errorNYI(e->getSourceRange(), "vector ternary op");
   }
 
-  if (condExpr->getType()->isVectorType() ||
-      condExpr->getType()->isSveVLSBuiltinType()) {
-    assert(!cir::MissingFeatures::vecTernaryOp());
-    cgf.cgm.errorNYI(e->getSourceRange(), "vector ternary op");
-    return {};
+  if (condType->isVectorType() || condType->isSveVLSBuiltinType()) {
+    if (!condType->isVectorType()) {
+      assert(!cir::MissingFeatures::vecTernaryOp());
+      cgf.cgm.errorNYI(loc, "TernaryOp for SVE vector");
+      return {};
+    }
+
+    mlir::Value condValue = Visit(condExpr);
+    mlir::Value lhsValue = Visit(lhsExpr);
+    mlir::Value rhsValue = Visit(rhsExpr);
+    return builder.create<cir::VecTernaryOp>(loc, condValue, lhsValue,
+                                             rhsValue);
   }
 
   // If this is a really simple expression (like x ? 4 : 5), emit this as a