Address code review comments

Author: AmrDeveloper

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

@@ -1643,34 +1643,31 @@ OpFoldResult cir::VecTernaryOp::fold(FoldAdaptor adaptor) {
   mlir::Attribute lhs = adaptor.getLhs();
   mlir::Attribute rhs = adaptor.getRhs();
 
-  if (mlir::isa_and_nonnull<cir::ConstVectorAttr>(cond) &&
-      mlir::isa_and_nonnull<cir::ConstVectorAttr>(lhs) &&
-      mlir::isa_and_nonnull<cir::ConstVectorAttr>(rhs)) {
-    auto condVec = mlir::cast<cir::ConstVectorAttr>(cond);
-    auto lhsVec = mlir::cast<cir::ConstVectorAttr>(lhs);
-    auto rhsVec = mlir::cast<cir::ConstVectorAttr>(rhs);
-
-    mlir::ArrayAttr condElts = condVec.getElts();
+  if (!mlir::isa_and_nonnull<cir::ConstVectorAttr>(cond) ||
+      !mlir::isa_and_nonnull<cir::ConstVectorAttr>(lhs) ||
+      !mlir::isa_and_nonnull<cir::ConstVectorAttr>(rhs))
+    return {};
+  auto condVec = mlir::cast<cir::ConstVectorAttr>(cond);
+  auto lhsVec = mlir::cast<cir::ConstVectorAttr>(lhs);
+  auto rhsVec = mlir::cast<cir::ConstVectorAttr>(rhs);
 
-    SmallVector<mlir::Attribute, 16> elements;
-    elements.reserve(condElts.size());
+  mlir::ArrayAttr condElts = condVec.getElts();
 
-    for (const auto &[idx, condAttr] :
-         llvm::enumerate(condElts.getAsRange<cir::IntAttr>())) {
-      if (condAttr.getSInt()) {
-        elements.push_back(lhsVec.getElts()[idx]);
-        continue;
-      }
+  SmallVector<mlir::Attribute, 16> elements;
+  elements.reserve(condElts.size());
 
+  for (const auto &[idx, condAttr] :
+       llvm::enumerate(condElts.getAsRange<cir::IntAttr>())) {
+    if (condAttr.getSInt()) {
+      elements.push_back(lhsVec.getElts()[idx]);
+    } else {
       elements.push_back(rhsVec.getElts()[idx]);
     }
-
-    cir::VectorType vecTy = getLhs().getType();
-    return cir::ConstVectorAttr::get(
-        vecTy, mlir::ArrayAttr::get(getContext(), elements));
   }
 
-  return {};
+  cir::VectorType vecTy = getLhs().getType();
+  return cir::ConstVectorAttr::get(
+      vecTy, mlir::ArrayAttr::get(getContext(), elements));
 }
 
 //===----------------------------------------------------------------------===//

clang/lib/CIR/Dialect/Transforms/CIRCanonicalize.cpp

@@ -138,10 +138,13 @@ void CIRCanonicalizePass::runOnOperation() {
     assert(!cir::MissingFeatures::complexRealOp());
     assert(!cir::MissingFeatures::complexImagOp());
     assert(!cir::MissingFeatures::callOp());
-    // CastOp, UnaryOp, VecExtractOp, VecShuffleDynamicOp and VecTernaryOp are
-    // here to perform a manual `fold` in applyOpPatternsGreedily.
-    if (isa<BrOp, BrCondOp, CastOp, ScopeOp, SwitchOp, SelectOp, UnaryOp,
-            VecExtractOp, VecShuffleDynamicOp, VecTernaryOp>(op))
+
+    if (isa<BrOp, BrCondOp, ScopeOp, SwitchOp, SelectOp>(op))
+      ops.push_back(op);
+
+    // Operations to perform manual `fold` in applyOpPatternsGreedily.
+    if (isa<CastOp, UnaryOp, VecExtractOp, VecShuffleDynamicOp, VecTernaryOp>(
+            op))
       ops.push_back(op);
   });