Shared, Rust: Ensure that the constraints in satisfiesConstraintType are in relevantConstraint

Author: paldepind

shared/typeinference/codeql/typeinference/internal/TypeInference.qll

@@ -989,7 +989,7 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
           path = prefix0.append(suffix)
         )
         or
-        tt.getTypeAt(TypePath::nil()) = constraint and
+        hasTypeConstraint(tt, constraint, constraint) and
         t = tt.getTypeAt(path)
       }
     }
@@ -1279,6 +1279,15 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
           SatisfiesConstraint<RelevantAccess, SatisfiesConstraintInput>::satisfiesConstraintType(MkRelevantAccess(a,
               target, apos, prefix), constraint, path, t)
         }
+
+        predicate satisfiesConstraintTypeRestricted(
+          Access a, Declaration target, AccessPosition apos, TypePath prefix, Type constraint,
+          TypePath path, Type t
+        ) {
+          SatisfiesConstraint<RelevantAccess, SatisfiesConstraintInput>::satisfiesConstraintType(MkRelevantAccess(a,
+              target, apos, prefix), constraint, path, t) and
+          relevantAccessConstraint(a, target, apos, prefix, constraint)
+        }
       }
 
       /**