Leverage PybindAdaptors and fix test

Author: Wheest

mlir/lib/Bindings/Python/IRCore.cpp

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

mlir/test/python/ir/value.py

@@ -161,7 +161,7 @@ def testValueReplaceAllUsesWithExcept():
             op1 = Operation.create("custom.op1", operands=[value])
             op2 = Operation.create("custom.op2", operands=[value])
             value2 = Operation.create("custom.op3", results=[i32]).results[0]
-            value.replace_all_uses_except(value2, [op1])
+            value.replace_all_uses_except(value2, op1)
 
     assert len(list(value.uses)) == 1