Resolve types in get_implicit_precedence. (#5827)

starkware-libs · Jun 19, 2024 · 80c2f17 · 80c2f17
1 parent 4646ad8
commit 80c2f17
Show file tree

Hide file tree

Showing 26 changed files with 119 additions and 116 deletions.
diff --git a/corelib/src/lib.cairo b/corelib/src/lib.cairo
@@ -103,9 +103,6 @@ pub mod boolean;
 
 pub mod circuit;
 
-/// TODO(ilya): Remove the following once implicits lookup is fixed.
-use circuit::{AddMod, MulMod, RangeCheck96};
-
 /// General purpose implicits.
 pub extern type RangeCheck;
 pub extern type SegmentArena;

diff --git a/crates/cairo-lang-semantic/src/diagnostic_test_data/not_found b/crates/cairo-lang-semantic/src/diagnostic_test_data/not_found
@@ -63,7 +63,7 @@ fn foo() {}
 //! > function_body
 
 //! > expected_diagnostics
-error: Unknown type.
+error: Type not found.
  --> lib.cairo:1:23
 #[implicit_precedence(MissingBuiltin1, MissingBuiltin2)]
                       ^*************^
diff --git a/crates/cairo-lang-semantic/src/items/extern_function.rs b/crates/cairo-lang-semantic/src/items/extern_function.rs
@@ -186,7 +186,8 @@ pub fn priv_extern_function_declaration_data(
         }
     }
 
-    let (_, implicit_precedence_attr) = get_implicit_precedence(db, &mut diagnostics, &attributes);
+    let (_, implicit_precedence_attr) =
+        get_implicit_precedence(&mut diagnostics, &mut resolver, &attributes);
     if let Some(attr) = implicit_precedence_attr {
         diagnostics
             .report(attr.stable_ptr.untyped(), ImplicitPrecedenceAttrForExternFunctionNotAllowed);

diff --git a/crates/cairo-lang-semantic/src/items/free_function.rs b/crates/cairo-lang-semantic/src/items/free_function.rs
@@ -164,7 +164,8 @@ pub fn priv_free_function_declaration_data(
 
     forbid_inline_always_with_impl_generic_param(&mut diagnostics, &generic_params, &inline_config);
 
-    let (implicit_precedence, _) = get_implicit_precedence(db, &mut diagnostics, &attributes);
+    let (implicit_precedence, _) =
+        get_implicit_precedence(&mut diagnostics, &mut resolver, &attributes);
 
     // Check fully resolved.
     let inference = &mut resolver.inference();

diff --git a/crates/cairo-lang-semantic/src/items/function_with_body.rs b/crates/cairo-lang-semantic/src/items/function_with_body.rs
@@ -5,18 +5,19 @@ use cairo_lang_diagnostics::{DiagnosticAdded, Diagnostics, Maybe, ToMaybe};
 use cairo_lang_proc_macros::DebugWithDb;
 use cairo_lang_syntax::attribute::consts::{IMPLICIT_PRECEDENCE_ATTR, INLINE_ATTR};
 use cairo_lang_syntax::attribute::structured::{Attribute, AttributeArg, AttributeArgVariant};
-use cairo_lang_syntax::node::{ast, TypedStablePtr, TypedSyntaxNode};
+use cairo_lang_syntax::node::{ast, TypedStablePtr};
 use cairo_lang_utils::unordered_hash_map::UnorderedHashMap;
-use cairo_lang_utils::Upcast;
+use cairo_lang_utils::{try_extract_matches, Upcast};
 use id_arena::Arena;
 use itertools::Itertools;
 
 use super::functions::InlineConfiguration;
-use crate::corelib::try_get_core_ty_by_name;
 use crate::db::SemanticGroup;
-use crate::diagnostic::{SemanticDiagnosticKind, SemanticDiagnostics, SemanticDiagnosticsBuilder};
+use crate::diagnostic::{
+    NotFoundItemType, SemanticDiagnosticKind, SemanticDiagnostics, SemanticDiagnosticsBuilder,
+};
 use crate::items::functions::ImplicitPrecedence;
-use crate::resolve::ResolverData;
+use crate::resolve::{ResolvedConcreteItem, Resolver, ResolverData};
 use crate::{semantic, ExprId, PatternId, SemanticDiagnostic, TypeId};
 
 // === Declaration ===
@@ -314,12 +315,10 @@ pub fn get_inline_config(
 /// If there is no implicit precedence influencing attribute, then this function returns
 /// [ImplicitPrecedence::UNSPECIFIED].
 pub fn get_implicit_precedence<'a>(
-    db: &dyn SemanticGroup,
     diagnostics: &mut SemanticDiagnostics,
+    resolver: &mut Resolver<'_>,
     attributes: &'a [Attribute],
 ) -> (ImplicitPrecedence, Option<&'a Attribute>) {
-    let syntax_db = db.upcast();
-
     let mut attributes = attributes.iter().rev().filter(|attr| attr.id == IMPLICIT_PRECEDENCE_ATTR);
 
     // Pick the last attribute if any.
@@ -345,9 +344,13 @@ pub fn get_implicit_precedence<'a>(
                     ));
                 };
 
-                let type_name = path.as_syntax_node().get_text_without_trivia(syntax_db);
-                try_get_core_ty_by_name(db, type_name.into(), vec![])
-                    .map_err(|kind| diagnostics.report(value, kind))
+                resolver.resolve_concrete_path(diagnostics, path, NotFoundItemType::Type).and_then(
+                    |resolved_item: crate::resolve::ResolvedConcreteItem| {
+                        try_extract_matches!(resolved_item, ResolvedConcreteItem::Type).ok_or_else(
+                            || diagnostics.report(value, SemanticDiagnosticKind::UnknownType),
+                        )
+                    },
+                )
             }
 
             _ => Err(diagnostics

diff --git a/crates/cairo-lang-semantic/src/items/imp.rs b/crates/cairo-lang-semantic/src/items/imp.rs
@@ -2038,6 +2038,10 @@ pub fn priv_impl_function_declaration_data(
         &mut environment,
     );
 
+    let attributes = function_syntax.attributes(syntax_db).structurize(syntax_db);
+    let (implicit_precedence, _) =
+        get_implicit_precedence(&mut diagnostics, &mut resolver, &attributes);
+
     let inference = &mut resolver.inference();
     // Check fully resolved.
     inference.finalize(&mut diagnostics, function_syntax.stable_ptr().untyped());
@@ -2054,14 +2058,10 @@ pub fn priv_impl_function_declaration_data(
         },
     );
 
-    let attributes = function_syntax.attributes(syntax_db).structurize(syntax_db);
-
     let inline_config = get_inline_config(db, &mut diagnostics, &attributes)?;
 
     forbid_inline_always_with_impl_generic_param(&mut diagnostics, &generic_params, &inline_config);
 
-    let (implicit_precedence, _) = get_implicit_precedence(db, &mut diagnostics, &attributes);
-
     let signature = inference.rewrite(signature).no_err();
     let generic_params = inference.rewrite(generic_params).no_err();
 

diff --git a/crates/cairo-lang-semantic/src/items/trt.rs b/crates/cairo-lang-semantic/src/items/trt.rs
@@ -1160,10 +1160,11 @@ pub fn priv_trait_function_declaration_data(
     );
 
     let attributes = function_syntax.attributes(syntax_db).structurize(syntax_db);
-    let resolver_data = Arc::new(resolver.data);
 
     let inline_config = get_inline_config(db, &mut diagnostics, &attributes)?;
-    let (implicit_precedence, _) = get_implicit_precedence(db, &mut diagnostics, &attributes);
+    let (implicit_precedence, _) =
+        get_implicit_precedence(&mut diagnostics, &mut resolver, &attributes);
+    let resolver_data = Arc::new(resolver.data);
 
     Ok(FunctionDeclarationData {
         diagnostics: diagnostics.build(),

diff --git a/crates/cairo-lang-starknet/src/plugin/consts.rs b/crates/cairo-lang-starknet/src/plugin/consts.rs
@@ -65,12 +65,12 @@ pub(super) const IMPLICIT_PRECEDENCE: &[&str] = &[
     "Pedersen",
     "RangeCheck",
     "Bitwise",
-    "EcOp",
+    "core::ec::EcOp",
     "Poseidon",
     "SegmentArena",
-    "RangeCheck96",
-    "AddMod",
-    "MulMod",
+    "core::circuit::RangeCheck96",
+    "core::circuit::AddMod",
+    "core::circuit::MulMod",
     "GasBuiltin",
     "System",
 ];
diff --git a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/components/component b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/components/component
@@ -714,7 +714,7 @@ pub trait UnsafeNewContractStateTraitForMyImpl<
     fn unsafe_new_contract_state() -> TContractState;
 }
 
-#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)]
+#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)]
 fn __wrapper__MyImpl__get<TContractState, impl X: HasComponent<TContractState>
 , impl TContractStateDrop: Drop<TContractState>, impl UnsafeNewContractState: UnsafeNewContractStateTraitForMyImpl<TContractState>>(mut data: Span::<felt252>) -> Span::<felt252> {
     core::internal::require_implicit::<System>();
@@ -737,7 +737,7 @@ fn __wrapper__MyImpl__get<TContractState, impl X: HasComponent<TContractState>
     core::array::ArrayTrait::span(@arr)
 }
 
-#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)]
+#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)]
 fn __wrapper__MyImpl__set<TContractState, impl X: HasComponent<TContractState>
 , impl TContractStateDrop: Drop<TContractState>, impl UnsafeNewContractState: UnsafeNewContractStateTraitForMyImpl<TContractState>>(mut data: Span::<felt252>) -> Span::<felt252> {
     core::internal::require_implicit::<System>();

diff --git a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/components/embeddable_as b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/components/embeddable_as
@@ -446,7 +446,7 @@ pub trait UnsafeNewContractStateTraitForMyImpl<
     fn unsafe_new_contract_state() -> TContractState;
 }
 
-#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)]
+#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)]
 fn __wrapper__MyImpl__do_nothing<TContractState, impl X: HasComponent<TContractState>, +Drop<TContractState>, impl UnsafeNewContractState: UnsafeNewContractStateTraitForMyImpl<TContractState>>(mut data: Span::<felt252>) -> Span::<felt252> {
     core::internal::require_implicit::<System>();
     core::internal::revoke_ap_tracking();

diff --git a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/contract b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/contract
@@ -135,7 +135,7 @@ use starknet::storage::{
 #[cfg(target: 'test')]
 pub const TEST_CLASS_HASH: felt252 = 0x2cd967636a47442d438bb2596f3c9848f0a831f916f4bb50d807e6eb90df576;
 
-#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)]
+#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)]
 fn __wrapper__get_something(mut data: Span::<felt252>) -> Span::<felt252> {
     core::internal::require_implicit::<System>();
     core::internal::revoke_ap_tracking();
@@ -162,7 +162,7 @@ fn __wrapper__get_something(mut data: Span::<felt252>) -> Span::<felt252> {
     core::array::ArrayTrait::span(@arr)
 }
 
-#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)]
+#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)]
 fn __wrapper__set_something(mut data: Span::<felt252>) -> Span::<felt252> {
     core::internal::require_implicit::<System>();
     core::internal::revoke_ap_tracking();
@@ -188,7 +188,7 @@ fn __wrapper__set_something(mut data: Span::<felt252>) -> Span::<felt252> {
     core::array::ArrayTrait::span(@arr)
 }
 
-#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)]
+#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)]
 fn __wrapper__l1_handler_func(mut data: Span::<felt252>) -> Span::<felt252> {
     core::internal::require_implicit::<System>();
     core::internal::revoke_ap_tracking();
@@ -217,7 +217,7 @@ fn __wrapper__l1_handler_func(mut data: Span::<felt252>) -> Span::<felt252> {
     core::array::ArrayTrait::span(@arr)
 }
 
-#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)]
+#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)]
 fn __wrapper__test_serde(mut data: Span::<felt252>) -> Span::<felt252> {
     core::internal::require_implicit::<System>();
     core::internal::revoke_ap_tracking();