Remove extraneous overloads

Author: Wheest

mlir/include/mlir-c/IR.h

@@ -961,16 +961,9 @@ MLIR_CAPI_EXPORTED void mlirValueReplaceAllUsesOfWith(MlirValue of,
 /// 'exceptions'. The 'exceptions' parameter is an array of MlirOperation
 /// pointers with a length of 'numExceptions'.
 MLIR_CAPI_EXPORTED void
-mlirValueReplaceAllUsesExceptWithSet(MlirValue of, MlirValue with,
-                                     MlirOperation *exceptions,
-                                     intptr_t numExceptions);
-
-/// Replace all uses of 'of' value with 'with' value, updating anything in the
-/// IR that uses 'of' to use 'with' instead, except if the user is
-/// 'exceptedUser'.
-MLIR_CAPI_EXPORTED void
-mlirValueReplaceAllUsesExceptWithSingle(MlirValue of, MlirValue with,
-                                        MlirOperation exceptedUser);
+mlirValueReplaceAllUsesExcept(MlirValue of, MlirValue with,
+                              intptr_t numExceptions,
+                              MlirOperation *exceptions);
 
 //===----------------------------------------------------------------------===//
 // OpOperand API.

mlir/lib/Bindings/Python/IRCore.cpp

@@ -3728,22 +3728,22 @@ void mlir::python::populateIRCore(py::module &m) {
           "replace_all_uses_except",
           [](MlirValue self, MlirValue with, PyOperation &exception) {
             MlirOperation exceptedUser = exception.get();
-            mlirValueReplaceAllUsesExceptWithSingle(self, with, exceptedUser);
+            mlirValueReplaceAllUsesExcept(self, with, 1, &exceptedUser);
           },
           py::arg("with"), py::arg("exceptions"),
           kValueReplaceAllUsesExceptDocstring)
       .def(
           "replace_all_uses_except",
           [](MlirValue self, MlirValue with, py::list exceptions) {
             // Convert Python list to a SmallVector of MlirOperations
-            llvm::SmallVector<MlirOperation, 4> exceptionOps;
+            llvm::SmallVector<MlirOperation> exceptionOps;
             for (py::handle exception : exceptions) {
               exceptionOps.push_back(exception.cast<PyOperation &>().get());
             }
 
-            mlirValueReplaceAllUsesExceptWithSet(
-                self, with, exceptionOps.data(),
-                static_cast<intptr_t>(exceptionOps.size()));
+            mlirValueReplaceAllUsesExcept(
+                self, with, static_cast<intptr_t>(exceptionOps.size()),
+                exceptionOps.data());
           },
           py::arg("with"), py::arg("exceptions"),
           kValueReplaceAllUsesExceptDocstring)

mlir/lib/CAPI/IR/IR.cpp

@@ -1010,10 +1010,9 @@ void mlirValueReplaceAllUsesOfWith(MlirValue oldValue, MlirValue newValue) {
   unwrap(oldValue).replaceAllUsesWith(unwrap(newValue));
 }
 
-void mlirValueReplaceAllUsesExceptWithSet(MlirValue oldValue,
-                                          MlirValue newValue,
-                                          MlirOperation *exceptions,
-                                          intptr_t numExceptions) {
+void mlirValueReplaceAllUsesExcept(MlirValue oldValue, MlirValue newValue,
+                                   intptr_t numExceptions,
+                                   MlirOperation *exceptions) {
   Value oldValueCpp = unwrap(oldValue);
   Value newValueCpp = unwrap(newValue);
 
@@ -1025,16 +1024,6 @@ void mlirValueReplaceAllUsesExceptWithSet(MlirValue oldValue,
   oldValueCpp.replaceAllUsesExcept(newValueCpp, exceptionSet);
 }
 
-void mlirValueReplaceAllUsesExceptWithSingle(MlirValue oldValue,
-                                             MlirValue newValue,
-                                             MlirOperation exceptedUser) {
-  Value oldValueCpp = unwrap(oldValue);
-  Value newValueCpp = unwrap(newValue);
-  Operation *exceptedUserCpp = unwrap(exceptedUser);
-
-  oldValueCpp.replaceAllUsesExcept(newValueCpp, exceptedUserCpp);
-}
-
 //===----------------------------------------------------------------------===//
 // OpOperand API.
 //===----------------------------------------------------------------------===//