starkware-libs
diff --git a/‎corelib/src/test/language_features/const_test.cairo‎
Lines changed: 23 additions & 0 deletions b/‎corelib/src/test/language_features/const_test.cairo‎
Lines changed: 23 additions & 0 deletions
diff --git a/‎crates/cairo-lang-semantic/src/items/constant.rs‎
Lines changed: 1 addition & 5 deletions b/‎crates/cairo-lang-semantic/src/items/constant.rs‎
Lines changed: 1 addition & 5 deletions
diff --git a/‎crates/cairo-lang-semantic/src/substitution.rs‎
Lines changed: 5 additions & 1 deletion b/‎crates/cairo-lang-semantic/src/substitution.rs‎
Lines changed: 5 additions & 1 deletion
@@ -203,6 +203,29 @@ fn test_const_generic_enum_return() {
     assert_eq!(RESULT, Either::Left(7));
 }
 
+trait AssocConst<const N: usize> {
+    const VALUE: usize;
+}
+
+impl AssocConstImpl of AssocConst<7> {
+    const VALUE: usize = 70;
+}
+
+const fn assoc_const_via_generic<const N: usize, impl A: AssocConst<N>>() -> usize {
+    A::VALUE
+}
+
+// Associated-const (impl-constant projection) evaluation in const context: both direct concrete
+// access (evaluated under an empty substitution) and through a generic const fn must yield the
+// concrete value, not an unresolved projection.
+#[test]
+fn test_const_assoc_const() {
+    const DIRECT: usize = AssocConstImpl::VALUE;
+    assert_eq!(DIRECT, 70);
+    const VIA_GENERIC: usize = assoc_const_via_generic::<7, AssocConstImpl>();
+    assert_eq!(VIA_GENERIC, 70);
+}
+
 #[derive(Copy, Drop, PartialEq, Debug)]
 struct Point {
     x: felt252,
 
@@ -1251,11 +1251,7 @@ impl<'a, 'r, 'mt> ConstantEvaluateContext<'a, 'r, 'mt> {
     where
         SubstitutionRewriter<'a, 'w>: SemanticRewriter<Obj, DiagnosticAdded>,
     {
-        if self.generic_substitution.is_empty() {
-            Ok(obj)
-        } else {
-            self.generic_substitution.substitute(self.db, obj)
-        }
+        self.generic_substitution.substitute(self.db, obj)
     }
     /// Compares two const values for value equality, treating `felt252` as a field.
     ///
 
@@ -93,7 +93,11 @@ impl<'db> GenericSubstitution<'db> {
         'db: 'a,
         SubstitutionRewriter<'a, 'r>: SemanticRewriter<Obj, DiagnosticAdded>,
     {
-        SubstitutionRewriter { db, substitution: self }.rewrite(obj)
+        if self.is_empty() {
+            Ok(obj)
+        } else {
+            SubstitutionRewriter { db, substitution: self }.rewrite(obj)
+        }
     }
 }
 impl<'db> Deref for GenericSubstitution<'db> {
Original file line number	Diff line number	Diff line change
`@@ -1251,11 +1251,7 @@ impl<'a, 'r, 'mt> ConstantEvaluateContext<'a, 'r, 'mt> {`
`1251`	`1251`	`where`
`1252`	`1252`	`SubstitutionRewriter<'a, 'w>: SemanticRewriter<Obj, DiagnosticAdded>,`
`1253`	`1253`	`{`
`1254`		`- if self.generic_substitution.is_empty() {`
`1255`		`- Ok(obj)`
`1256`		`- } else {`
`1257`		`- self.generic_substitution.substitute(self.db, obj)`
`1258`		`- }`
	`1254`	`+ self.generic_substitution.substitute(self.db, obj)`
`1259`	`1255`	`}`
`1260`	`1256`	/// Compares two const values for value equality, treating `felt252` as a field.
`1261`	`1257`	`///`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,11 @@ impl<'db> GenericSubstitution<'db> {`
`93`	`93`	`'db: 'a,`
`94`	`94`	`SubstitutionRewriter<'a, 'r>: SemanticRewriter<Obj, DiagnosticAdded>,`
`95`	`95`	`{`
`96`		`- SubstitutionRewriter { db, substitution: self }.rewrite(obj)`
	`96`	`+ if self.is_empty() {`
	`97`	`+ Ok(obj)`
	`98`	`+ } else {`
	`99`	`+ SubstitutionRewriter { db, substitution: self }.rewrite(obj)`
	`100`	`+ }`
`97`	`101`	`}`
`98`	`102`	`}`
`99`	`103`	`impl<'db> Deref for GenericSubstitution<'db> {`