refactor: remove InvalidOpsWithReturn entirely and replace with test::add

Signed-off-by: Tomas Fabrizio Orsi <[email protected]>

Author: lima-limon-inc

hir/src/derive.rs

@@ -148,9 +148,9 @@ mod tests {
 
     use crate::{
         attributes::Overflow,
-        dialects::test::{self, Add, InvalidOpsWithReturn},
+        dialects::test::{self, Add},
         pass::{Nesting, PassManager},
-        Builder, BuilderExt, Context, Op, Operation, Report, Spanned,
+        Builder, BuilderExt, Context, Op, Operation, Report, Spanned, Value,
     };
 
     derive! {
@@ -255,12 +255,20 @@ mod tests {
         let mut builder = context.clone().builder();
         builder.set_insertion_point_to_end(block);
 
-        let op_builder = builder.create::<InvalidOpsWithReturn, _>(SourceSpan::default());
-        let op = op_builder(lhs, rhs);
-        let op = op.unwrap();
+        let op_builder = builder.create::<Add, _>(SourceSpan::default());
+        let op = op_builder(lhs, rhs, Overflow::Wrapping);
+        let mut op = op.unwrap();
+
+        // NOTE: We override the result's type in order to force the SameOperandsAndResultType
+        // verification function to trigger an error
+        {
+            let mut binding = op.borrow_mut();
+            let mut result = binding.result_mut();
+            result.set_type(Type::U64);
+        }
 
         // Construct a pass manager with the default pass pipeline
-        let mut pm = PassManager::on::<InvalidOpsWithReturn>(context.clone(), Nesting::Implicit);
+        let mut pm = PassManager::on::<Add>(context.clone(), Nesting::Implicit);
         // Run pass pipeline
         pm.run(op.as_operation_ref()).unwrap();
     }

hir/src/dialects/test.rs

@@ -115,7 +115,6 @@ impl DialectRegistration for TestDialect {
 
     fn register_operations(info: &mut DialectInfo) {
         info.register_operation::<ops::Add>();
-        info.register_operation::<ops::InvalidOpsWithReturn>();
         info.register_operation::<ops::Mul>();
         info.register_operation::<ops::Shl>();
         info.register_operation::<ops::Ret>();

hir/src/dialects/test/ops/binary.rs

@@ -74,25 +74,3 @@ impl InferTypeOpInterface for Shl {
         Ok(())
     }
 }
-
-/// Invalid operation that breaks the SameOperandsAndResultType trait (used for testing).
-#[operation(
-    dialect = TestDialect,
-    traits(BinaryOp, SameTypeOperands, SameOperandsAndResultType),
-    implements(InferTypeOpInterface)
-)]
-pub struct InvalidOpsWithReturn {
-    #[operand]
-    lhs: AnyInteger,
-    #[operand]
-    rhs: AnyInteger,
-    #[result]
-    result: AnyUnsignedInteger,
-}
-
-impl InferTypeOpInterface for InvalidOpsWithReturn {
-    fn infer_return_types(&mut self, _context: &Context) -> Result<(), Report> {
-        self.result_mut().set_type(Type::U64);
-        Ok(())
-    }
-}