Apply reviews

Author: Andres-Salamanca

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

@@ -17,12 +17,13 @@
 #include "clang/CIR/Dialect/IR/CIRTypes.h"
 #include "clang/CIR/Interfaces/CIRLoopOpInterface.h"
 #include "clang/CIR/MissingFeatures.h"
+#include "llvm/ADT/SetOperations.h"
+#include "llvm/ADT/SmallSet.h"
 #include "llvm/ADT/TypeSwitch.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/LogicalResult.h"
 #include <numeric>
 #include <optional>
-#include <set>
 
 #include "mlir/Dialect/Func/IR/FuncOps.h"
 #include "mlir/Dialect/LLVMIR/LLVMTypes.h"
@@ -2886,38 +2887,41 @@ LogicalResult cir::FuncOp::verify() {
                            << "' must have empty body";
   }
 
-  std::set<llvm::StringRef> labels;
-  std::set<llvm::StringRef> gotos;
-  std::set<llvm::StringRef> blockAddresses;
+  llvm::SmallSet<llvm::StringRef, 16> labels;
+  llvm::SmallSet<llvm::StringRef, 16> gotos;
+  llvm::SmallSet<llvm::StringRef, 16> blockAddresses;
   bool invalidBlockAddress = false;
   getOperation()->walk([&](mlir::Operation *op) {
     if (auto lab = dyn_cast<cir::LabelOp>(op)) {
-      labels.emplace(lab.getLabel());
+      labels.insert(lab.getLabel());
     } else if (auto goTo = dyn_cast<cir::GotoOp>(op)) {
-      gotos.emplace(goTo.getLabel());
+      gotos.insert(goTo.getLabel());
     } else if (auto blkAdd = dyn_cast<cir::BlockAddressOp>(op)) {
-      if (blkAdd.getFunc() != getSymName())
+      if (blkAdd.getFunc() != getSymName()) {
+        // Stop the walk early, no need to continue
         invalidBlockAddress = true;
-      blockAddresses.emplace(blkAdd.getLabel());
+        return mlir::WalkResult::interrupt();
+      }
+      blockAddresses.insert(blkAdd.getLabel());
     }
+    return mlir::WalkResult::advance();
   });
 
   if (invalidBlockAddress)
     return emitOpError() << "blockaddress references a different function";
 
-  {
-    std::vector<llvm::StringRef> mismatched;
-    std::set_difference(gotos.begin(), gotos.end(), labels.begin(),
-                        labels.end(), std::back_inserter(mismatched));
+  llvm::SmallSet<llvm::StringRef, 16> mismatched;
+  if (!labels.empty() || !gotos.empty()) {
+    mismatched = llvm::set_difference(gotos, labels);
 
     if (!mismatched.empty())
       return emitOpError() << "goto/label mismatch";
   }
-  {
-    std::vector<llvm::StringRef> mismatched;
-    std::set_difference(blockAddresses.begin(), blockAddresses.end(),
-                        labels.begin(), labels.end(),
-                        std::back_inserter(mismatched));
+
+  mismatched.clear();
+
+  if (!labels.empty() || !blockAddresses.empty()) {
+    mismatched = llvm::set_difference(blockAddresses, labels);
 
     if (!mismatched.empty())
       return emitOpError()