Fine. Make ancestry helpers ID-tracked; tie members to container

Reclassify `thisOrAncestorMatching()` and `thisOrAncestorOfType()` from
`@trackedDirectlyOpaque` to `@trackedIncludedInId` and remove opaque
`recordOpaqueApiUse` calls. Using these helpers now contributes to the
consumer’s dependency graph through element IDs rather than an opaque
side channel.

Augment manifest matching so members explicitly depend on their
enclosing container:
- Pass the enclosing `instanceElement`/`interfaceElement` into member
  matchers (fields, getters, setters, methods) and constructors.
- Add the container element to the `MatchContext` when a member matches.

This fixes a bug where a member’s ID could stay stable when only the
container changed (e.g., superclass/mixin changes), leading to stale
reuse. When the container’s ID changes, affected members now get new
IDs, ensuring correct invalidation for ancestry-sensitive queries.

Trade-off: this increases invalidation fan-out—more member IDs will
change when a container changes—which can reduce cache reuse and
increase rebuild work. We accept this for correctness; if needed we can
mitigate by making member–container dependencies more selective (e.g.,
depending only on container “interface” stamps that affect member
signatures).

Change-Id: I01259590dc30d9735f0f436a59130d07d0bd9681
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/450101
Reviewed-by: Johnni Winther <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

pkg/analyzer/lib/src/dart/element/element.dart

@@ -1935,12 +1935,8 @@ abstract class ElementImpl implements Element {
   }
 
   @override
-  @trackedDirectlyOpaque
+  @trackedIncludedInId
   Element? thisOrAncestorMatching(bool Function(Element p1) predicate) {
-    globalResultRequirements?.recordOpaqueApiUse(
-      this,
-      'thisOrAncestorMatching',
-    );
     Element? element = this;
     while (element != null && !predicate(element)) {
       element = element.enclosingElement;
@@ -1956,9 +1952,8 @@ abstract class ElementImpl implements Element {
   }
 
   @override
-  @trackedDirectlyOpaque
+  @trackedIncludedInId
   E? thisOrAncestorOfType<E extends Element>() {
-    globalResultRequirements?.recordOpaqueApiUse(this, 'thisOrAncestorOfType');
     Element element = this;
     while (element is! E) {
       var ancestor = element.enclosingElement;
@@ -4603,12 +4598,8 @@ abstract class InstanceElementImpl extends ElementImpl
   }
 
   @override
-  @trackedDirectlyOpaque
+  @trackedIncludedInId
   Element? thisOrAncestorMatching(bool Function(Element) predicate) {
-    globalResultRequirements?.recordOpaqueApiUse(
-      this,
-      'thisOrAncestorMatching',
-    );
     if (predicate(this)) {
       return this;
     }
@@ -4623,9 +4614,8 @@ abstract class InstanceElementImpl extends ElementImpl
   }
 
   @override
-  @trackedDirectlyOpaque
+  @trackedIncludedInId
   E? thisOrAncestorOfType<E extends Element>() {
-    globalResultRequirements?.recordOpaqueApiUse(this, 'thisOrAncestorOfType');
     if (this case E result) {
       return result;
     }

pkg/analyzer/lib/src/fine/library_manifest.dart

@@ -1432,6 +1432,7 @@ class _LibraryMatch {
   }) {
     for (var field in element.fields) {
       if (!_matchInstanceElementField(
+        instanceElement: element,
         instanceItem: item,
         instanceMatchContext: matchContext,
         element: field,
@@ -1442,6 +1443,7 @@ class _LibraryMatch {
 
     for (var method in element.methods) {
       if (!_matchInstanceElementMethod(
+        instanceElement: element,
         instanceItem: item,
         instanceMatchContext: matchContext,
         element: method,
@@ -1452,6 +1454,7 @@ class _LibraryMatch {
 
     for (var getter in element.getters) {
       if (!_matchInstanceElementGetter(
+        instanceElement: element,
         instanceItem: item,
         instanceMatchContext: matchContext,
         element: getter,
@@ -1462,6 +1465,7 @@ class _LibraryMatch {
 
     for (var setter in element.setters) {
       if (!_matchInstanceElementSetter(
+        instanceElement: element,
         instanceItem: item,
         instanceMatchContext: matchContext,
         element: setter,
@@ -1472,6 +1476,7 @@ class _LibraryMatch {
   }
 
   bool _matchInstanceElementField({
+    required InstanceElementImpl instanceElement,
     required InstanceItem instanceItem,
     required MatchContext instanceMatchContext,
     required FieldElementImpl element,
@@ -1491,11 +1496,13 @@ class _LibraryMatch {
       return false;
     }
 
+    matchContext.elements.add(instanceElement);
     _addMatchingElementItem(element, item, matchContext);
     return true;
   }
 
   bool _matchInstanceElementGetter({
+    required InstanceElementImpl instanceElement,
     required InstanceItem instanceItem,
     required MatchContext instanceMatchContext,
     required GetterElementImpl element,
@@ -1515,11 +1522,13 @@ class _LibraryMatch {
       return false;
     }
 
+    matchContext.elements.add(instanceElement);
     _addMatchingElementItem(element, item, matchContext);
     return true;
   }
 
   bool _matchInstanceElementMethod({
+    required InstanceElementImpl instanceElement,
     required InstanceItem instanceItem,
     required MatchContext instanceMatchContext,
     required MethodElementImpl element,
@@ -1539,11 +1548,13 @@ class _LibraryMatch {
       return false;
     }
 
+    matchContext.elements.add(instanceElement);
     _addMatchingElementItem(element, item, matchContext);
     return true;
   }
 
   bool _matchInstanceElementSetter({
+    required InstanceElementImpl instanceElement,
     required InstanceItem instanceItem,
     required MatchContext instanceMatchContext,
     required SetterElementImpl element,
@@ -1563,11 +1574,13 @@ class _LibraryMatch {
       return false;
     }
 
+    matchContext.elements.add(instanceElement);
     _addMatchingElementItem(element, item, matchContext);
     return true;
   }
 
   bool _matchInterfaceElementConstructor({
+    required InterfaceElementImpl interfaceElement,
     required InterfaceItem interfaceItem,
     required MatchContext interfaceMatchContext,
     required ConstructorElementImpl element,
@@ -1587,6 +1600,7 @@ class _LibraryMatch {
       return false;
     }
 
+    matchContext.elements.add(interfaceElement);
     _addMatchingElementItem(element, item, matchContext);
     return true;
   }
@@ -1598,6 +1612,7 @@ class _LibraryMatch {
   }) {
     for (var constructor in interfaceElement.constructors) {
       if (!_matchInterfaceElementConstructor(
+        interfaceElement: interfaceElement,
         interfaceItem: item,
         interfaceMatchContext: matchContext,
         element: constructor,