Update melior

lambdaclass · Jan 20, 2025 · ff4ddbc · ff4ddbc
1 parent 965e3f9
commit ff4ddbc
Show file tree

Hide file tree

Showing 50 changed files with 114 additions and 212 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -70,7 +70,7 @@ itertools = "0.13.0"
 lazy_static = "1.5"
 libc = "0.2"
 llvm-sys = "191.0.0"
-melior = { version = "0.20.2", features = ["ods-dialects", "helpers"] }
+melior = { version = "0.21.0", features = ["ods-dialects", "helpers"] }
 mlir-sys = { version = "0.4.1" }
 num-bigint = "0.4.6"
 num-traits = "0.2"

diff --git a/src/compiler.rs b/src/compiler.rs
@@ -84,8 +84,8 @@ use melior::{
         },
         operation::OperationBuilder,
         r#type::{FunctionType, IntegerType, MemRefType},
-        Attribute, AttributeLike, Block, BlockRef, Identifier, Location, Module, Region, Type,
-        Value,
+        Attribute, AttributeLike, Block, BlockLike, BlockRef, Identifier, Location, Module, Region,
+        Type, Value,
     },
     Context,
 };

diff --git a/src/libfuncs.rs b/src/libfuncs.rs
@@ -25,7 +25,7 @@ use cairo_lang_sierra::{
 };
 use melior::{
     dialect::{arith, cf},
-    ir::{Block, BlockRef, Location, Module, Operation, Region, Value},
+    ir::{Block, BlockLike, BlockRef, Location, Module, Operation, Region, Value},
     Context,
 };
 use num_bigint::BigInt;

diff --git a/src/libfuncs/array.rs b/src/libfuncs/array.rs
@@ -24,7 +24,8 @@ use melior::{
         cf, llvm, ods, scf,
     },
     ir::{
-        attribute::IntegerAttribute, r#type::IntegerType, Block, Location, Region, Value, ValueLike,
+        attribute::IntegerAttribute, r#type::IntegerType, Block, BlockLike, Location, Region,
+        Value, ValueLike,
     },
     Context,
 };

diff --git a/src/libfuncs/bool.rs b/src/libfuncs/bool.rs
@@ -18,7 +18,7 @@ use cairo_lang_sierra::{
 };
 use melior::{
     dialect::{arith, llvm},
-    ir::{r#type::IntegerType, Block, Location},
+    ir::{r#type::IntegerType, Block, BlockLike, Location},
     Context,
 };
 

diff --git a/src/libfuncs/bounded_int.rs b/src/libfuncs/bounded_int.rs
@@ -26,7 +26,7 @@ use melior::{
         arith::{self, CmpiPredicate},
         cf,
     },
-    ir::{r#type::IntegerType, Block, Location, Value, ValueLike},
+    ir::{r#type::IntegerType, Block, BlockLike, Location, Value, ValueLike},
     Context,
 };
 use num_bigint::{BigInt, Sign};

diff --git a/src/libfuncs/box.rs b/src/libfuncs/box.rs
@@ -22,7 +22,7 @@ use melior::{
         llvm::{self, r#type::pointer, LoadStoreOptions},
         ods,
     },
-    ir::{attribute::IntegerAttribute, r#type::IntegerType, Block, Location},
+    ir::{attribute::IntegerAttribute, r#type::IntegerType, Block, BlockLike, Location},
     Context,
 };
 

diff --git a/src/libfuncs/bytes31.rs b/src/libfuncs/bytes31.rs
@@ -21,7 +21,7 @@ use melior::{
         arith::{self, CmpiPredicate},
         cf,
     },
-    ir::{Attribute, Block, Location, Value},
+    ir::{Attribute, Block, BlockLike, Location, Value},
     Context,
 };
 use num_bigint::BigUint;

diff --git a/src/libfuncs/cast.rs b/src/libfuncs/cast.rs
@@ -19,7 +19,7 @@ use cairo_lang_sierra::{
 };
 use melior::{
     dialect::arith::{self, CmpiPredicate},
-    ir::{r#type::IntegerType, Block, Location, Value, ValueLike},
+    ir::{r#type::IntegerType, Block, BlockLike, Location, Value, ValueLike},
     Context,
 };
 use num_bigint::{BigInt, Sign};

diff --git a/src/libfuncs/circuit.rs b/src/libfuncs/circuit.rs
@@ -26,7 +26,8 @@ use melior::{
         cf, llvm,
     },
     ir::{
-        attribute::DenseI32ArrayAttribute, r#type::IntegerType, Block, Location, Value, ValueLike,
+        attribute::DenseI32ArrayAttribute, r#type::IntegerType, Block, BlockLike, Location, Value,
+        ValueLike,
     },
     Context,
 };

diff --git a/src/libfuncs/const.rs b/src/libfuncs/const.rs
@@ -23,7 +23,7 @@ use cairo_lang_sierra::{
 };
 use melior::{
     dialect::llvm::{self, r#type::pointer},
-    ir::{Block, Location, Value},
+    ir::{Block, BlockLike, Location, Value},
     Context,
 };
 use num_bigint::Sign;

diff --git a/src/libfuncs/coupon.rs b/src/libfuncs/coupon.rs
@@ -20,7 +20,7 @@ use cairo_lang_sierra::{
 };
 use melior::{
     dialect::llvm,
-    ir::{Block, Location},
+    ir::{Block, BlockLike, Location},
     Context,
 };
 

diff --git a/src/libfuncs/debug.rs b/src/libfuncs/debug.rs
@@ -27,7 +27,7 @@ use cairo_lang_sierra::{
 };
 use melior::{
     dialect::{arith, cf, llvm},
-    ir::{r#type::IntegerType, Block, Location},
+    ir::{r#type::IntegerType, Block, BlockLike, Location},
     Context,
 };
 

diff --git a/src/libfuncs/drop.rs b/src/libfuncs/drop.rs
@@ -19,7 +19,7 @@ use cairo_lang_sierra::{
     program_registry::ProgramRegistry,
 };
 use melior::{
-    ir::{Block, Location},
+    ir::{Block, BlockLike, Location},
     Context,
 };
 

diff --git a/src/libfuncs/dup.rs b/src/libfuncs/dup.rs
@@ -18,7 +18,7 @@ use cairo_lang_sierra::{
     program_registry::ProgramRegistry,
 };
 use melior::{
-    ir::{Block, Location},
+    ir::{Block, BlockLike, Location},
     Context,
 };
 

diff --git a/src/libfuncs/ec.rs b/src/libfuncs/ec.rs
@@ -20,7 +20,7 @@ use melior::{
         arith::{self, CmpiPredicate},
         llvm,
     },
-    ir::{operation::OperationBuilder, r#type::IntegerType, Block, Location},
+    ir::{operation::OperationBuilder, r#type::IntegerType, Block, BlockLike, Location},
     Context,
 };
 

diff --git a/src/libfuncs/enum.rs b/src/libfuncs/enum.rs
@@ -25,7 +25,7 @@ use melior::{
     ir::{
         attribute::{DenseI64ArrayAttribute, IntegerAttribute},
         r#type::IntegerType,
-        Block, Location, Value,
+        Block, BlockLike, Location, Value,
     },
     Context,
 };

diff --git a/src/libfuncs/felt252.rs b/src/libfuncs/felt252.rs
@@ -23,7 +23,7 @@ use melior::{
         arith::{self, CmpiPredicate},
         cf,
     },
-    ir::{r#type::IntegerType, Block, Location, Value, ValueLike},
+    ir::{r#type::IntegerType, Block, BlockLike, Location, Value, ValueLike},
     Context,
 };
 use num_bigint::{BigInt, Sign};

diff --git a/src/libfuncs/felt252_dict.rs b/src/libfuncs/felt252_dict.rs
@@ -20,7 +20,7 @@ use cairo_lang_sierra::{
 };
 use melior::{
     dialect::{llvm, ods},
-    ir::{Block, Location},
+    ir::{Block, BlockLike, Location},
     Context,
 };
 

diff --git a/src/libfuncs/felt252_dict_entry.rs b/src/libfuncs/felt252_dict_entry.rs
@@ -18,7 +18,7 @@ use cairo_lang_sierra::{
 };
 use melior::{
     dialect::{llvm, scf},
-    ir::{r#type::IntegerType, Block, Location, Region},
+    ir::{r#type::IntegerType, Block, BlockLike, Location, Region},
     Context,
 };
 use std::cell::Cell;

diff --git a/src/libfuncs/function_call.rs b/src/libfuncs/function_call.rs
@@ -23,7 +23,7 @@ use melior::{
         attribute::{DenseI32ArrayAttribute, FlatSymbolRefAttribute},
         operation::OperationBuilder,
         r#type::IntegerType,
-        Attribute, Block, Identifier, Location, Type, Value,
+        Attribute, Block, BlockLike, Identifier, Location, Type, Value,
     },
     Context,
 };

diff --git a/src/libfuncs/gas.rs b/src/libfuncs/gas.rs
@@ -17,7 +17,7 @@ use cairo_lang_sierra::{
 };
 use melior::{
     dialect::{arith::CmpiPredicate, ods},
-    ir::{r#type::IntegerType, Block, Location},
+    ir::{r#type::IntegerType, Block, BlockLike, Location},
     Context,
 };
 

diff --git a/src/libfuncs/int.rs b/src/libfuncs/int.rs
@@ -30,7 +30,7 @@ use melior::{
     },
     ir::{
         attribute::IntegerAttribute, operation::OperationBuilder, r#type::IntegerType, Block,
-        Location, Region, ValueLike,
+        BlockLike, Location, Region, ValueLike,
     },
     Context,
 };

diff --git a/src/libfuncs/int_range.rs b/src/libfuncs/int_range.rs
@@ -21,7 +21,7 @@ use melior::{
         arith::{self, CmpiPredicate},
         ods,
     },
-    ir::{Block, Location},
+    ir::{Block, BlockLike, Location},
     Context,
 };
 use num_bigint::BigInt;

diff --git a/src/libfuncs/mem.rs b/src/libfuncs/mem.rs
@@ -20,7 +20,7 @@ use cairo_lang_sierra::{
 };
 use melior::{
     dialect::llvm,
-    ir::{Block, Location},
+    ir::{Block, BlockLike, Location},
     Context,
 };
 

diff --git a/src/libfuncs/nullable.rs b/src/libfuncs/nullable.rs
@@ -16,7 +16,7 @@ use melior::{
     dialect::{cf, llvm::r#type::pointer, ods},
     ir::{
         attribute::IntegerAttribute, operation::OperationBuilder, r#type::IntegerType, Block,
-        Identifier, Location,
+        BlockLike, Identifier, Location,
     },
     Context,
 };

diff --git a/src/libfuncs/pedersen.rs b/src/libfuncs/pedersen.rs
@@ -17,7 +17,7 @@ use cairo_lang_sierra::{
     program_registry::ProgramRegistry,
 };
 use melior::{
-    ir::{r#type::IntegerType, Block, Location},
+    ir::{r#type::IntegerType, Block, BlockLike, Location},
     Context,
 };
 

diff --git a/src/libfuncs/poseidon.rs b/src/libfuncs/poseidon.rs
@@ -18,7 +18,7 @@ use cairo_lang_sierra::{
 };
 use melior::{
     dialect::ods,
-    ir::{r#type::IntegerType, Block, Location},
+    ir::{r#type::IntegerType, Block, BlockLike, Location},
     Context,
 };
 

diff --git a/src/libfuncs/starknet.rs b/src/libfuncs/starknet.rs
@@ -25,7 +25,7 @@ use melior::{
     },
     ir::{
         attribute::DenseI64ArrayAttribute, operation::OperationBuilder, r#type::IntegerType,
-        Attribute, Block, Location, Type, ValueLike,
+        Attribute, Block, BlockLike, Location, Type, ValueLike,
     },
     Context,
 };

diff --git a/src/libfuncs/starknet/secp256.rs b/src/libfuncs/starknet/secp256.rs
@@ -18,7 +18,7 @@ use melior::{
     dialect::llvm::{self, LoadStoreOptions},
     ir::{
         attribute::DenseI32ArrayAttribute, operation::OperationBuilder, r#type::IntegerType, Block,
-        Location,
+        BlockLike, Location,
     },
     Context,
 };

diff --git a/src/libfuncs/starknet/testing.rs b/src/libfuncs/starknet/testing.rs
@@ -19,7 +19,7 @@ use melior::{
     ir::{
         attribute::{IntegerAttribute, TypeAttribute},
         r#type::IntegerType,
-        Block, Location,
+        Block, BlockLike, Location,
     },
     Context,
 };

diff --git a/src/libfuncs/struct.rs b/src/libfuncs/struct.rs
@@ -19,7 +19,7 @@ use cairo_lang_sierra::{
 };
 use melior::{
     dialect::llvm,
-    ir::{Block, Location, Value},
+    ir::{Block, BlockLike, Location, Value},
     Context,
 };
 

diff --git a/src/libfuncs/uint256.rs b/src/libfuncs/uint256.rs
@@ -20,7 +20,7 @@ use melior::{
         attribute::{DenseI64ArrayAttribute, IntegerAttribute},
         operation::OperationBuilder,
         r#type::IntegerType,
-        Block, Location, Region, Value,
+        Block, BlockLike, Location, Region, Value,
     },
     Context,
 };

diff --git a/src/libfuncs/uint512.rs b/src/libfuncs/uint512.rs
@@ -17,7 +17,7 @@ use cairo_lang_sierra::{
 };
 use melior::{
     dialect::{arith, llvm},
-    ir::{r#type::IntegerType, Block, Location, Value},
+    ir::{r#type::IntegerType, Block, BlockLike, Location, Value},
     Context,
 };
 

diff --git a/src/metadata/debug_utils.rs b/src/metadata/debug_utils.rs
@@ -97,7 +97,7 @@ use melior::{
         attribute::{FlatSymbolRefAttribute, IntegerAttribute, StringAttribute, TypeAttribute},
         operation::OperationBuilder,
         r#type::{FunctionType, IntegerType},
-        Block, Identifier, Location, Module, Region, Value,
+        Block, BlockLike, Identifier, Location, Module, Region, Value,
     },
     Context, ExecutionEngine,
 };

diff --git a/src/metadata/drop_overrides.rs b/src/metadata/drop_overrides.rs
@@ -35,7 +35,7 @@ use melior::{
     ir::{
         attribute::{FlatSymbolRefAttribute, StringAttribute, TypeAttribute},
         r#type::FunctionType,
-        Attribute, Block, Identifier, Location, Module, Region, Value,
+        Attribute, Block, BlockLike, Identifier, Location, Module, Region, Value,
     },
     Context,
 };

diff --git a/src/metadata/dup_overrides.rs b/src/metadata/dup_overrides.rs
@@ -35,7 +35,7 @@ use melior::{
     ir::{
         attribute::{FlatSymbolRefAttribute, StringAttribute, TypeAttribute},
         r#type::FunctionType,
-        Attribute, Block, Identifier, Location, Module, Region, Value, ValueLike,
+        Attribute, Block, BlockLike, Identifier, Location, Module, Region, Value, ValueLike,
     },
     Context,
 };

diff --git a/src/metadata/felt252_dict.rs b/src/metadata/felt252_dict.rs
@@ -12,7 +12,7 @@ use melior::{
     dialect::llvm,
     ir::{
         attribute::{FlatSymbolRefAttribute, StringAttribute, TypeAttribute},
-        Attribute, Block, Identifier, Location, Module, Region,
+        Attribute, Block, BlockLike, Identifier, Location, Module, Region,
     },
     Context,
 };

diff --git a/src/metadata/realloc_bindings.rs b/src/metadata/realloc_bindings.rs
@@ -9,7 +9,7 @@ use melior::{
         attribute::{FlatSymbolRefAttribute, StringAttribute, TypeAttribute},
         operation::OperationBuilder,
         r#type::IntegerType,
-        Identifier, Location, Module, Operation, Region, Value,
+        BlockLike, Identifier, Location, Module, Operation, Region, Value,
     },
     Context, Error,
 };

diff --git a/src/metadata/runtime_bindings.rs b/src/metadata/runtime_bindings.rs
@@ -13,7 +13,7 @@ use melior::{
     ir::{
         attribute::{FlatSymbolRefAttribute, StringAttribute, TypeAttribute},
         r#type::{FunctionType, IntegerType},
-        Attribute, Block, Identifier, Location, Module, OperationRef, Region, Value,
+        Attribute, Block, BlockLike, Identifier, Location, Module, OperationRef, Region, Value,
     },
     Context,
 };

diff --git a/src/types/array.rs b/src/types/array.rs
@@ -38,13 +38,16 @@ use cairo_lang_sierra::{
     },
     program_registry::ProgramRegistry,
 };
-use melior::dialect::{arith::CmpiPredicate, func, scf};
 use melior::ir::Region;
 use melior::{
     dialect::{arith, llvm},
     ir::{r#type::IntegerType, Block, Location, Module, Type},
     Context,
 };
+use melior::{
+    dialect::{arith::CmpiPredicate, func, scf},
+    ir::BlockLike,
+};
 
 /// Build the MLIR type.
 ///

diff --git a/src/types/box.rs b/src/types/box.rs
@@ -31,7 +31,10 @@ use cairo_lang_sierra::{
 };
 use melior::{
     dialect::{func, llvm, ods},
-    ir::{attribute::IntegerAttribute, r#type::IntegerType, Block, Location, Module, Region, Type},
+    ir::{
+        attribute::IntegerAttribute, r#type::IntegerType, Block, BlockLike, Location, Module,
+        Region, Type,
+    },
     Context,
 };