Fix

raviqqe · raviqqe · commit 067943dff349 · 2025-01-28T22:58:14.000+09:00
diff --git a/macro/src/dialect.rs b/macro/src/dialect.rs
@@ -99,7 +99,7 @@ fn generate_dialect_module(
     Ok(quote! {
         #[doc = #doc]
         pub mod #name {
-            use ::melior::ir::OperationLike;
+            use ::melior::ir::{OperationLike, OperationLikeMut};
 
             #(#operations)*
         }
diff --git a/melior/src/dialect/index.rs b/melior/src/dialect/index.rs
@@ -77,7 +77,7 @@ mod tests {
             attribute::{StringAttribute, TypeAttribute},
             block::BlockLike,
             r#type::{FunctionType, IntegerType},
-            Block, Location, Module, Region, RegionLike, Type,
+            Block, Location, Module, OperationLike, Region, RegionLike, Type,
         },
         test::load_all_dialects,
         Context,
diff --git a/melior/src/dialect/llvm.rs b/melior/src/dialect/llvm.rs
@@ -381,7 +381,7 @@ mod tests {
             attribute::{IntegerAttribute, StringAttribute, TypeAttribute},
             block::BlockLike,
             r#type::{FunctionType, IntegerType},
-            Block, Module, Region, RegionLike,
+            Block, Module, OperationLike, Region, RegionLike,
         },
         pass::{self, PassManager},
         test::create_test_context,
diff --git a/melior/src/dialect/memref.rs b/melior/src/dialect/memref.rs
@@ -326,7 +326,7 @@ mod tests {
             attribute::{DenseElementsAttribute, StringAttribute, TypeAttribute},
             block::BlockLike,
             r#type::{FunctionType, IntegerType, RankedTensorType},
-            Block, Module, Region, RegionLike, Type,
+            Block, Module, OperationLike, Region, RegionLike, Type,
         },
         test::create_test_context,
     };
diff --git a/melior/src/dialect/scf.rs b/melior/src/dialect/scf.rs
@@ -116,7 +116,7 @@ mod tests {
             attribute::{FloatAttribute, IntegerAttribute, StringAttribute, TypeAttribute},
             block::BlockLike,
             r#type::{FunctionType, IntegerType, Type},
-            Attribute, Block, Module, RegionLike,
+            Attribute, Block, Module, OperationLike, RegionLike,
         },
         test::load_all_dialects,
         Context,
diff --git a/melior/src/ir.rs b/melior/src/ir.rs
@@ -18,7 +18,7 @@ pub use self::{
     identifier::Identifier,
     location::Location,
     module::Module,
-    operation::{Operation, OperationLike, OperationRef},
+    operation::{Operation, OperationLike, OperationLikeMut, OperationRef},
     r#type::{ShapedTypeLike, Type, TypeLike},
     region::{Region, RegionLike, RegionRef},
     value::{Value, ValueLike},
diff --git a/melior/src/ir/block.rs b/melior/src/ir/block.rs
@@ -206,7 +206,8 @@ mod tests {
     use super::*;
     use crate::{
         ir::{
-            operation::OperationBuilder, r#type::IntegerType, Module, Region, RegionLike, ValueLike,
+            operation::OperationBuilder, r#type::IntegerType, Module, OperationLike, Region,
+            RegionLike, ValueLike,
         },
         test::create_test_context,
         Error,
diff --git a/melior/src/ir/block/block_like.rs b/melior/src/ir/block/block_like.rs
@@ -1,6 +1,9 @@
 use super::{BlockArgument, BlockRef, TypeLike};
 use crate::{
-    ir::{operation::OperationRefMut, Location, Operation, OperationRef, RegionRef, Type, Value},
+    ir::{
+        operation::OperationRefMut, Location, Operation, OperationLike, OperationRef, RegionRef,
+        Type, Value,
+    },
     Error,
 };
 use core::fmt::Display;
diff --git a/melior/src/ir/module.rs b/melior/src/ir/module.rs
@@ -98,7 +98,10 @@ impl Drop for Module<'_> {
 mod tests {
     use super::*;
     use crate::{
-        ir::{attribute::StringAttribute, operation::OperationBuilder, Block, Region, RegionLike},
+        ir::{
+            attribute::StringAttribute, operation::OperationBuilder, Block, OperationLike,
+            OperationLikeMut, Region, RegionLike,
+        },
         test::create_test_context,
     };
 
diff --git a/melior/src/ir/operation.rs b/melior/src/ir/operation.rs
@@ -17,7 +17,7 @@ use core::{
 use mlir_sys::{
     mlirOperationClone, mlirOperationDestroy, mlirOperationEqual, mlirOperationPrint, MlirOperation,
 };
-pub use operation_like::OperationLike;
+pub use operation_like::{OperationLike, OperationLikeMut};
 use std::{
     ffi::c_void,
     fmt::{Debug, Display, Formatter},
@@ -73,6 +73,14 @@ impl<'c: 'a, 'a> OperationLike<'c, 'a> for &'a Operation<'c> {
     }
 }
 
+impl<'c: 'a, 'a> OperationLike<'c, 'a> for &'a mut Operation<'c> {
+    fn to_raw(self) -> MlirOperation {
+        self.raw
+    }
+}
+
+impl<'c: 'a, 'a> OperationLikeMut<'c, 'a> for &'a mut Operation<'c> {}
+
 impl Clone for Operation<'_> {
     fn clone(&self) -> Self {
         unsafe { Self::from_raw(mlirOperationClone(self.raw)) }
@@ -198,6 +206,8 @@ impl<'c: 'a, 'a> OperationLike<'c, 'a> for OperationRefMut<'c, 'a> {
     }
 }
 
+impl<'c: 'a, 'a> OperationLikeMut<'c, 'a> for OperationRefMut<'c, 'a> {}
+
 impl OperationRefMut<'_, '_> {
     /// Creates an operation reference from a raw object.
     ///
@@ -265,8 +275,8 @@ mod tests {
     use crate::{
         context::Context,
         ir::{
-            attribute::StringAttribute, Block, BlockLike, Location, OperationLike, Region,
-            RegionLike, Type,
+            attribute::StringAttribute, Block, BlockLike, Location, OperationLike,
+            OperationLikeMut, Region, RegionLike, Type,
         },
         test::create_test_context,
         Error,
diff --git a/melior/src/ir/operation/builder.rs b/melior/src/ir/operation/builder.rs
@@ -137,7 +137,7 @@ impl<'c> OperationBuilder<'c> {
 mod tests {
     use super::*;
     use crate::{
-        ir::{block::BlockLike, Block, ValueLike},
+        ir::{block::BlockLike, Block, OperationLike, ValueLike},
         test::create_test_context,
     };
 
diff --git a/melior/src/ir/operation/operation_like.rs b/melior/src/ir/operation/operation_like.rs
@@ -192,24 +192,6 @@ where
         self.attribute(name).is_ok()
     }
 
-    /// Sets the attribute with the given name to the given attribute.
-    fn set_attribute(&mut self, name: &str, attribute: Attribute<'c>) {
-        unsafe {
-            mlirOperationSetAttributeByName(
-                self.to_raw(),
-                StringRef::new(name).to_raw(),
-                attribute.to_raw(),
-            )
-        }
-    }
-
-    /// Removes the attribute with the given name.
-    fn remove_attribute(&mut self, name: &str) -> Result<(), Error> {
-        unsafe { mlirOperationRemoveAttributeByName(self.to_raw(), StringRef::new(name).to_raw()) }
-            .then_some(())
-            .ok_or_else(|| Error::AttributeNotFound(name.into()))
-    }
-
     /// Returns a reference to the next operation in the same block.
     fn next_in_block(self) -> Option<OperationRef<'c, 'a>> {
         unsafe { OperationRef::from_option_raw(mlirOperationGetNextInBlock(self.to_raw())) }
@@ -230,11 +212,6 @@ where
         unsafe { OperationRef::from_option_raw(mlirOperationGetParentOperation(self.to_raw())) }
     }
 
-    /// Removes itself from a parent block.
-    fn remove_from_parent(&mut self) {
-        unsafe { mlirOperationRemoveFromParent(self.to_raw()) }
-    }
-
     /// Verifies an operation.
     fn verify(self) -> bool {
         unsafe { mlirOperationVerify(self.to_raw()) }
@@ -263,3 +240,29 @@ where
         Ok(data.0)
     }
 }
+
+/// A mutable operation-like trait.
+pub trait OperationLikeMut<'c: 'a, 'a>: OperationLike<'c, 'a> {
+    /// Sets the attribute with the given name to the given attribute.
+    fn set_attribute(self, name: &str, attribute: Attribute<'c>) {
+        unsafe {
+            mlirOperationSetAttributeByName(
+                self.to_raw(),
+                StringRef::new(name).to_raw(),
+                attribute.to_raw(),
+            )
+        }
+    }
+
+    /// Removes the attribute with the given name.
+    fn remove_attribute(self, name: &str) -> Result<(), Error> {
+        unsafe { mlirOperationRemoveAttributeByName(self.to_raw(), StringRef::new(name).to_raw()) }
+            .then_some(())
+            .ok_or_else(|| Error::AttributeNotFound(name.into()))
+    }
+
+    /// Removes itself from a parent block.
+    fn remove_from_parent(self) {
+        unsafe { mlirOperationRemoveFromParent(self.to_raw()) }
+    }
+}
diff --git a/melior/src/ir/operation/result.rs b/melior/src/ir/operation/result.rs
@@ -61,7 +61,7 @@ impl<'c, 'a> TryFrom<Value<'c, 'a>> for OperationResult<'c, 'a> {
 #[cfg(test)]
 mod tests {
     use crate::{
-        ir::{block::BlockLike, operation::OperationBuilder, Block, Location, Type},
+        ir::{block::BlockLike, operation::OperationBuilder, Block, Location, OperationLike, Type},
         test::create_test_context,
     };
 

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ fn generate_dialect_module(`
`99`	`99`	`Ok(quote! {`
`100`	`100`	`#[doc = #doc]`
`101`	`101`	`pub mod #name {`
`102`		`- use ::melior::ir::OperationLike;`
	`102`	`+ use ::melior::ir::{OperationLike, OperationLikeMut};`
`103`	`103`
`104`	`104`	`#(#operations)*`
`105`	`105`	`}`