no snapshot peeling from type_enriched_members key. (#7229)

Author: ilyalesokhin-starkware

crates/cairo-lang-semantic/src/expr/compute.rs

@@ -3039,13 +3039,11 @@ fn get_enriched_type_member_access(
     stable_ptr: ast::ExprPtr,
     accessed_member_name: &str,
 ) -> Maybe<Option<EnrichedTypeMemberAccess>> {
-    let (_, mut long_ty) = peel_snapshots(ctx.db, expr.ty());
-    if matches!(long_ty, TypeLongId::Var(_)) {
-        // Save some work. ignore the result. The error, if any, will be reported later.
-        ctx.resolver.inference().solve().ok();
-        long_ty = ctx.resolver.inference().rewrite(long_ty).no_err();
-    }
-    let (_, long_ty) = peel_snapshots_ex(ctx.db, long_ty);
+    // Run solver to get as much info on the type as possible.
+    // Ignore the result of the `solve()` call - the error, if any, will be
+    // reported later.
+    ctx.resolver.inference().solve().ok();
+    let ty = ctx.reduce_ty(expr.ty());
     let base_var = match &expr.expr {
         Expr::Var(expr_var) => Some(expr_var.var),
         Expr::MemberAccess(ExprMemberAccess { member_path: Some(member_path), .. }) => {
@@ -3056,7 +3054,6 @@ fn get_enriched_type_member_access(
     let is_mut_var = base_var
         .filter(|var_id| matches!(ctx.semantic_defs.get(var_id), Some(var) if var.is_mut()))
         .is_some();
-    let ty = long_ty.clone().intern(ctx.db);
     let key = (ty, is_mut_var);
     let mut enriched_members = match ctx.resolver.type_enriched_members.entry(key) {
         Entry::Occupied(entry) => {
@@ -3074,6 +3071,7 @@ fn get_enriched_type_member_access(
             entry.swap_remove()
         }
         Entry::Vacant(_) => {
+            let (_, long_ty) = peel_snapshots(ctx.db, ty);
             let members =
                 if let TypeLongId::Concrete(ConcreteTypeId::Struct(concrete_struct_id)) = long_ty {
                     let members = ctx.db.concrete_struct_members(concrete_struct_id)?;

crates/cairo-lang-semantic/src/expr/test.rs

@@ -34,6 +34,7 @@ cairo_lang_test_utils::test_file_test!(
         constructor: "constructor",
         closure: "closure",
         coupon: "coupon",
+        deref: "deref",
         enum_: "enum",
         error_propagate: "error_propagate",
         for_: "for",

crates/cairo-lang-semantic/src/expr/test_data/deref

@@ -0,0 +1,59 @@
+//! > different S3 and @S3 derefs.
+
+//! > test_runner_name
+test_function_diagnostics(expect_diagnostics: false)
+
+//! > function
+fn foo() {
+    let s1 = S1 { a: 1, b: 2 };
+    let s2 = S2 { inner: s1, c: 5 };
+    let s3 = S3 { inner: s2 };
+
+    (@s3).a;
+    s3.c;
+}
+
+//! > function_name
+foo
+
+//! > module_code
+#[derive(Drop, Copy)]
+struct S1 {
+    a: usize,
+    b: felt252,
+}
+
+#[derive(Drop, Copy)]
+struct S2 {
+    inner: S1,
+    c: usize,
+}
+
+#[derive(Drop)]
+struct S3 {
+    inner: S2,
+}
+
+
+impl S2Deref of core::ops::Deref<S2> {
+    type Target = S1;
+    fn deref(self: S2) -> S1 {
+        self.inner
+    }
+}
+
+impl S3Deref of core::ops::Deref<S3> {
+    type Target = S2;
+    fn deref(self: S3) -> S2 {
+        self.inner
+    }
+}
+
+impl S3SnapDeref of core::ops::Deref<@S3> {
+    type Target = S1;
+    fn deref(self: @S3) -> S1 {
+        *self.inner.inner
+    }
+}
+
+//! > expected_diagnostics