Elements. Print SetterElement variable. Change-Id: I829495baba82bc481639185eb3e91a42ffeaaf77 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/442342 Commit-Queue: Konstantin Shcheglov <scheglov@google.com> Reviewed-by: Samuel Rawlins <srawlins@google.com>

diff --git a/pkg/analyzer/test/src/summary/element_text.dart b/pkg/analyzer/test/src/summary/element_text.dart
index 3895abc..ebeafee 100644
--- a/pkg/analyzer/test/src/summary/element_text.dart
+++ b/pkg/analyzer/test/src/summary/element_text.dart

@@ -1518,6 +1518,7 @@
         _writeFormalParameterElement,
       );
       _writeReturnType(e.returnType);
+      _writeElementReference('variable', e.variable);
       // _writeNonSyntheticElement(e);
       // writeLinking();
     });

diff --git a/pkg/analyzer/test/src/summary/elements/class_test.dart b/pkg/analyzer/test/src/summary/elements/class_test.dart
index 855b456..181c979 100644
--- a/pkg/analyzer/test/src/summary/elements/class_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/class_test.dart

@@ -373,6 +373,7 @@
               firstFragment: #F7
               type: dynamic
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 
@@ -441,6 +442,7 @@
               firstFragment: #F7
               type: dynamic
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 
@@ -509,6 +511,7 @@
               firstFragment: #F7
               type: dynamic
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 
@@ -589,6 +592,7 @@
               firstFragment: #F8
               type: dynamic
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 
@@ -669,6 +673,7 @@
               firstFragment: #F8
               type: dynamic
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 
@@ -759,6 +764,7 @@
               firstFragment: #F10
               type: dynamic Function()
           returnType: void
+          variable: <testLibrary>::@class::C::@field::f
 ''');
   }
 
@@ -849,6 +855,7 @@
               firstFragment: #F9
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x::@def::0
         synthetic x
           reference: <testLibrary>::@class::C::@setter::x::@def::1
           firstFragment: #F10
@@ -857,6 +864,7 @@
               firstFragment: #F11
               type: String
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x::@def::1
 ''');
   }
 
@@ -960,6 +968,7 @@
               firstFragment: #F7
               type: num
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 
@@ -1028,6 +1037,7 @@
               firstFragment: #F7
               type: num
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 
@@ -1096,6 +1106,7 @@
               firstFragment: #F7
               type: num
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 
@@ -1164,6 +1175,7 @@
               firstFragment: #F7
               type: dynamic
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 
@@ -1232,6 +1244,7 @@
               firstFragment: #F7
               type: dynamic
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 
@@ -1300,6 +1313,7 @@
               firstFragment: #F7
               type: dynamic
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 
@@ -1368,6 +1382,7 @@
               firstFragment: #F7
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 
@@ -1443,6 +1458,7 @@
               firstFragment: #F7
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 
@@ -1511,6 +1527,7 @@
               firstFragment: #F7
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 
@@ -1586,6 +1603,7 @@
               firstFragment: #F7
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 
@@ -7026,6 +7044,7 @@
               firstFragment: #F6
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::i
 ''');
   }
 
@@ -7193,6 +7212,7 @@
               firstFragment: #F6
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 
@@ -7259,6 +7279,7 @@
               firstFragment: #F6
               type: dynamic
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 
@@ -7338,6 +7359,7 @@
               firstFragment: #F8
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::foo::@def::0
 ''');
   }
 
@@ -7415,6 +7437,7 @@
               firstFragment: #F7
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::foo::@def::0
         foo
           reference: <testLibrary>::@class::C::@setter::foo::@def::1
           firstFragment: #F8
@@ -7423,6 +7446,7 @@
               firstFragment: #F9
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::foo::@def::1
 ''');
   }
 
@@ -7487,6 +7511,7 @@
               firstFragment: #F6
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::i
 ''');
   }
 
@@ -7788,6 +7813,7 @@
               firstFragment: #F7
               type: int
           returnType: void
+          variable: <testLibrary>::@class::A::@field::foo
 ''');
   }
 
@@ -7873,6 +7899,7 @@
               firstFragment: #F7
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::v
     abstract class D
       reference: <testLibrary>::@class::D
       firstFragment: #F8
@@ -7952,6 +7979,7 @@
               firstFragment: #F6
               type: dynamic
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 
@@ -8012,6 +8040,7 @@
               firstFragment: #F6
               type: dynamic
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 
@@ -8072,6 +8101,7 @@
               firstFragment: #F6
               type: num
           returnType: void
+          variable: <testLibrary>::@class::C::@field::v
 ''');
   }
 
@@ -8132,6 +8162,7 @@
               firstFragment: #F6
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::v
 ''');
   }
 
@@ -8208,6 +8239,7 @@
               firstFragment: #F6
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::v
     abstract class D
       reference: <testLibrary>::@class::D
       firstFragment: #F7
@@ -8414,6 +8446,7 @@
               firstFragment: #F6
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::v
 ''');
   }
 
@@ -9409,6 +9442,7 @@
               firstFragment: #F8
               type: Object
           returnType: void
+          variable: <testLibrary>::@class::C::@field::a
         synthetic <null-name>
           reference: <testLibrary>::@class::C::@setter::2
           firstFragment: #F9
@@ -9417,6 +9451,7 @@
               firstFragment: #F10
               type: Object
           returnType: void
+          variable: <testLibrary>::@class::C::@field::0
 ''');
   }
 
@@ -9480,6 +9515,7 @@
               firstFragment: #F6
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::foo
 ''');
   }
 
@@ -9546,6 +9582,7 @@
               firstFragment: #F6
               type: T
           returnType: void
+          variable: <testLibrary>::@class::C::@field::foo
 ''');
   }
 
@@ -9883,6 +9920,7 @@
               firstFragment: #F6
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::i
 ''');
   }
 
@@ -10037,6 +10075,7 @@
               firstFragment: #F6
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::i
 ''');
   }
 
@@ -10102,6 +10141,7 @@
               firstFragment: #F6
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::a
 ''');
   }
 
@@ -10167,6 +10207,7 @@
               firstFragment: #F6
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::foo
 ''');
   }
 
@@ -10318,6 +10359,7 @@
               firstFragment: #F6
               type: Never
           returnType: void
+          variable: <testLibrary>::@class::C::@field::a
 ''');
   }
 
@@ -10378,6 +10420,7 @@
               firstFragment: #F6
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 
@@ -10438,6 +10481,7 @@
               firstFragment: #F6
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 
@@ -10518,6 +10562,7 @@
               firstFragment: #F8
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::i
         synthetic j
           reference: <testLibrary>::@class::C::@setter::j
           firstFragment: #F9
@@ -10526,6 +10571,7 @@
               firstFragment: #F10
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::j
 ''');
   }
 
@@ -10590,6 +10636,7 @@
               firstFragment: #F6
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::foo
 ''');
   }
 
@@ -10654,6 +10701,7 @@
               firstFragment: #F6
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::foo
 ''');
   }
 
@@ -10793,6 +10841,7 @@
               firstFragment: #F9
               type: int
           returnType: void
+          variable: <testLibrary>::@class::B::@field::f
 ''');
   }
 
@@ -10894,6 +10943,7 @@
               firstFragment: #F10
               type: int
           returnType: void
+          variable: <testLibrary>::@class::B::@field::f
 ''');
   }
 
@@ -10998,6 +11048,7 @@
               firstFragment: #F7
               type: int
           returnType: void
+          variable: <testLibrary>::@class::A::@field::b
         a
           reference: <testLibrary>::@class::A::@setter::a
           firstFragment: #F8
@@ -11006,6 +11057,7 @@
               firstFragment: #F9
               type: int
           returnType: void
+          variable: <testLibrary>::@class::A::@field::a
 ''');
   }
 
@@ -11086,6 +11138,7 @@
               firstFragment: #F8
               type: int
           returnType: void
+          variable: <testLibrary>::@class::A::@field::a
 ''');
   }
 
@@ -11719,6 +11772,7 @@
               firstFragment: #F6
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 
@@ -11784,6 +11838,7 @@
               firstFragment: #F6
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 
@@ -15074,6 +15129,7 @@
           firstFragment: #F6
           type: C
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::c
 ''');
   }
 
@@ -15137,6 +15193,7 @@
           firstFragment: #F6
           type: C?
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::c
 ''');
   }
 
@@ -15528,6 +15585,7 @@
               firstFragment: #F5
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 
@@ -15580,6 +15638,7 @@
               firstFragment: #F5
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 
@@ -15632,6 +15691,7 @@
               firstFragment: #F5
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 
@@ -15682,6 +15742,7 @@
               firstFragment: #F5
               type: dynamic
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 
@@ -15732,6 +15793,7 @@
               firstFragment: #F5
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 
@@ -15843,6 +15905,7 @@
               firstFragment: #F6
               type: int
           returnType: void
+          variable: <testLibrary>::@class::A::@field::t
     class B
       reference: <testLibrary>::@class::B
       firstFragment: #F7
@@ -15874,6 +15937,7 @@
               firstFragment: #F12
               type: double
           returnType: void
+          variable: <testLibrary>::@class::B::@field::t
     class C
       reference: <testLibrary>::@class::C
       firstFragment: #F13
@@ -15909,6 +15973,7 @@
               firstFragment: #F19
               type: dynamic
           returnType: void
+          variable: <testLibrary>::@class::D::@field::t
 ''');
   }
 
@@ -15979,6 +16044,7 @@
               firstFragment: #F5
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::f
     abstract class D
       reference: <testLibrary>::@class::D
       firstFragment: #F6
@@ -16001,6 +16067,7 @@
               firstFragment: #F10
               type: int
           returnType: void
+          variable: <testLibrary>::@class::D::@field::f
 ''');
   }
 
@@ -16055,6 +16122,7 @@
               firstFragment: #F5
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::f
 ''');
   }
 
@@ -16105,6 +16173,7 @@
               firstFragment: #F5
               type: dynamic
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 
@@ -16155,6 +16224,7 @@
               firstFragment: #F5
               type: dynamic
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 
@@ -16205,6 +16275,7 @@
               firstFragment: #F5
               type: dynamic
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 
@@ -16255,6 +16326,7 @@
               firstFragment: #F5
               type: dynamic
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 
@@ -16311,6 +16383,7 @@
               firstFragment: #F5
               type: int
           returnType: void
+          variable: <testLibrary>::@class::A::@field::foo
 ''');
   }
 
@@ -16367,6 +16440,7 @@
               firstFragment: #F5
               type: int
           returnType: void
+          variable: <testLibrary>::@class::A::@field::foo
 ''');
   }
 
@@ -16466,6 +16540,7 @@
               firstFragment: #F5
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 
@@ -16519,6 +16594,7 @@
               firstFragment: #F5
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::foo
 ''');
   }
 
@@ -16574,6 +16650,7 @@
               firstFragment: #F5
               type: T
           returnType: void
+          variable: <testLibrary>::@class::C::@field::foo
 ''');
   }
 
@@ -16626,6 +16703,7 @@
               firstFragment: #F5
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 
@@ -16693,6 +16771,7 @@
               firstFragment: #F6
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
         y
           reference: <testLibrary>::@class::C::@setter::y
           firstFragment: #F7
@@ -16701,6 +16780,7 @@
               firstFragment: #F8
               type: dynamic
           returnType: void
+          variable: <testLibrary>::@class::C::@field::y
 ''');
   }
 
@@ -20528,6 +20608,7 @@
               firstFragment: #F13
               type: int
           returnType: void
+          variable: <testLibrary>::@class::E::@field::b
         synthetic x
           reference: <testLibrary>::@class::E::@setter::x
           firstFragment: #F14
@@ -20536,6 +20617,7 @@
               firstFragment: #F15
               type: int
           returnType: void
+          variable: <testLibrary>::@class::E::@field::x
       methods
         f
           reference: <testLibrary>::@class::E::@method::f
@@ -20758,6 +20840,7 @@
               firstFragment: #F7
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::foo
         bar
           reference: <testLibrary>::@class::C::@setter::bar
           firstFragment: #F8
@@ -20766,6 +20849,7 @@
               firstFragment: #F9
               type: dynamic
           returnType: void
+          variable: <testLibrary>::@class::C::@field::bar
 ''');
   }
 
@@ -20820,6 +20904,7 @@
               firstFragment: #F5
               type: dynamic
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 
@@ -20920,6 +21005,7 @@
           firstFragment: #F10
           type: C<int>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::c
     synthetic static v
       reference: <testLibrary>::@setter::v
       firstFragment: #F11
@@ -20928,6 +21014,7 @@
           firstFragment: #F12
           type: void Function()
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::v
 ''');
   }
 }

diff --git a/pkg/analyzer/test/src/summary/elements/duplicate_declaration_test.dart b/pkg/analyzer/test/src/summary/elements/duplicate_declaration_test.dart
index 1ae75a6..d766bb1 100644
--- a/pkg/analyzer/test/src/summary/elements/duplicate_declaration_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/duplicate_declaration_test.dart

@@ -349,6 +349,7 @@
               firstFragment: #F8
               type: int
           returnType: void
+          variable: <testLibrary>::@class::A::@field::foo::@def::0
         synthetic foo
           reference: <testLibrary>::@class::A::@setter::foo::@def::1
           firstFragment: #F9
@@ -357,6 +358,7 @@
               firstFragment: #F10
               type: double
           returnType: void
+          variable: <testLibrary>::@class::A::@field::foo::@def::1
 ''');
   }
 
@@ -851,6 +853,7 @@
               firstFragment: #F6
               type: dynamic
           returnType: void
+          variable: <testLibrary>::@extension::E::@def::1::@field::x
     extension E
       reference: <testLibrary>::@extension::E::@def::2
       firstFragment: #F7
@@ -877,6 +880,7 @@
               firstFragment: #F11
               type: int
           returnType: void
+          variable: <testLibrary>::@extension::E::@def::2::@field::y
 ''');
   }
 
@@ -1187,6 +1191,7 @@
               firstFragment: #F6
               type: dynamic
           returnType: void
+          variable: <testLibrary>::@mixin::A::@def::1::@field::x
     mixin A
       reference: <testLibrary>::@mixin::A::@def::2
       firstFragment: #F7
@@ -1214,6 +1219,7 @@
               firstFragment: #F11
               type: int
           returnType: void
+          variable: <testLibrary>::@mixin::A::@def::2::@field::y
 ''');
   }
 
@@ -1318,6 +1324,7 @@
           firstFragment: #F10
           type: bool
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x::@def::0
     synthetic static x
       reference: <testLibrary>::@setter::x::@def::1
       firstFragment: #F11
@@ -1326,6 +1333,7 @@
           firstFragment: #F12
           type: dynamic
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x::@def::1
     synthetic static x
       reference: <testLibrary>::@setter::x::@def::2
       firstFragment: #F13
@@ -1334,6 +1342,7 @@
           firstFragment: #F14
           type: double
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x::@def::3
 ''');
   }
 
@@ -1430,6 +1439,7 @@
           firstFragment: #F4
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::foo::@def::0
     static foo
       reference: <testLibrary>::@setter::foo::@def::1
       firstFragment: #F5
@@ -1438,6 +1448,7 @@
           firstFragment: #F6
           type: double
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::foo::@def::1
 ''');
   }
 }

diff --git a/pkg/analyzer/test/src/summary/elements/enum_test.dart b/pkg/analyzer/test/src/summary/elements/enum_test.dart
index a6c03fb..899e839 100644
--- a/pkg/analyzer/test/src/summary/elements/enum_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/enum_test.dart

@@ -3621,6 +3621,7 @@
               firstFragment: #F9
               type: int
           returnType: void
+          variable: <testLibrary>::@enum::E::@field::foo
 ''');
   }
 

diff --git a/pkg/analyzer/test/src/summary/elements/extension_test.dart b/pkg/analyzer/test/src/summary/elements/extension_test.dart
index f1d9612..ca4a466 100644
--- a/pkg/analyzer/test/src/summary/elements/extension_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/extension_test.dart

@@ -654,6 +654,7 @@
               firstFragment: #F4
               type: int
           returnType: void
+          variable: <testLibrary>::@extension::E::@field::foo
 ''');
   }
 

diff --git a/pkg/analyzer/test/src/summary/elements/extension_type_test.dart b/pkg/analyzer/test/src/summary/elements/extension_type_test.dart
index 426d63b..7da66f5 100644
--- a/pkg/analyzer/test/src/summary/elements/extension_type_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/extension_type_test.dart

@@ -1797,6 +1797,7 @@
               firstFragment: #F6
               type: double
           returnType: void
+          variable: <testLibrary>::@extensionType::A::@field::foo
 ''');
   }
 

diff --git a/pkg/analyzer/test/src/summary/elements/formal_parameter_test.dart b/pkg/analyzer/test/src/summary/elements/formal_parameter_test.dart
index f3b7309..27c70f6 100644
--- a/pkg/analyzer/test/src/summary/elements/formal_parameter_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/formal_parameter_test.dart

@@ -762,6 +762,7 @@
               firstFragment: #F9
               type: dynamic
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 

diff --git a/pkg/analyzer/test/src/summary/elements/function_type_annotation_test.dart b/pkg/analyzer/test/src/summary/elements/function_type_annotation_test.dart
index afd2709..562f8610 100644
--- a/pkg/analyzer/test/src/summary/elements/function_type_annotation_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/function_type_annotation_test.dart

@@ -60,6 +60,7 @@
           firstFragment: #F4
           type: void Function()
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::f
 ''');
   }
 
@@ -107,6 +108,7 @@
           firstFragment: #F4
           type: void Function()?
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::f
 ''');
   }
 
@@ -297,6 +299,7 @@
           firstFragment: #F4
           type: int Function(int, String)
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::v
 ''');
   }
 
@@ -512,6 +515,7 @@
           firstFragment: #F7
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::v
 ''');
   }
 

diff --git a/pkg/analyzer/test/src/summary/elements/library_export_test.dart b/pkg/analyzer/test/src/summary/elements/library_export_test.dart
index 719cc0e..bf717c3 100644
--- a/pkg/analyzer/test/src/summary/elements/library_export_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/library_export_test.dart

@@ -1335,6 +1335,7 @@
           firstFragment: #F5
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::a
   exportedReferences
     declared <testLibrary>::@getter::a
     declared <testLibrary>::@setter::a

diff --git a/pkg/analyzer/test/src/summary/elements/library_import_test.dart b/pkg/analyzer/test/src/summary/elements/library_import_test.dart
index bf326d1..3806fa0 100644
--- a/pkg/analyzer/test/src/summary/elements/library_import_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/library_import_test.dart

@@ -387,6 +387,7 @@
           firstFragment: #F4
           type: Future<dynamic>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::f
 ''');
   }
 
@@ -482,6 +483,7 @@
           firstFragment: #F4
           type: Future<dynamic>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::f
 ''');
   }
 
@@ -538,6 +540,7 @@
           firstFragment: #F4
           type: C
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::c
 ''');
   }
 
@@ -683,6 +686,7 @@
           firstFragment: #F6
           type: Future<dynamic>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::f
     synthetic static s
       reference: <testLibrary>::@setter::s
       firstFragment: #F7
@@ -691,6 +695,7 @@
           firstFragment: #F8
           type: Stream<dynamic>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::s
 ''');
   }
 
@@ -783,6 +788,7 @@
           firstFragment: #F6
           type: C
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::c
     synthetic static d
       reference: <testLibrary>::@setter::d
       firstFragment: #F7
@@ -791,6 +797,7 @@
           firstFragment: #F8
           type: D
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::d
 ''');
   }
 
@@ -1115,6 +1122,7 @@
           firstFragment: #F4
           type: A
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::v
 ''');
   }
 

diff --git a/pkg/analyzer/test/src/summary/elements/metadata_test.dart b/pkg/analyzer/test/src/summary/elements/metadata_test.dart
index accfab0..73d86db 100644
--- a/pkg/analyzer/test/src/summary/elements/metadata_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/metadata_test.dart

@@ -277,6 +277,7 @@
               firstFragment: #F6
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
   topLevelVariables
     const hasInitializer a
       reference: <testLibrary>::@topLevelVariable::a
@@ -1718,6 +1719,7 @@
               firstFragment: #F6
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
   topLevelVariables
     const hasInitializer a
       reference: <testLibrary>::@topLevelVariable::a
@@ -1833,6 +1835,7 @@
               firstFragment: #F7
               type: dynamic
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
   topLevelVariables
     const hasInitializer a
       reference: <testLibrary>::@topLevelVariable::a
@@ -1951,6 +1954,7 @@
               firstFragment: #F7
               type: dynamic
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
   topLevelVariables
     const hasInitializer a
       reference: <testLibrary>::@topLevelVariable::a
@@ -2170,6 +2174,7 @@
           firstFragment: #F5
           type: dynamic
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::f
 ''');
   }
 
@@ -3234,6 +3239,7 @@
               firstFragment: #F5
               type: dynamic
           returnType: void
+          variable: <testLibrary>::@class::C::@field::m
   topLevelVariables
     const hasInitializer a
       reference: <testLibrary>::@topLevelVariable::a
@@ -3939,6 +3945,7 @@
                     staticType: null
                   element2: <testLibrary>::@getter::foo
           returnType: void
+          variable: <testLibrary>::@class::A::@field::setter
   topLevelVariables
     const hasInitializer foo
       reference: <testLibrary>::@topLevelVariable::foo
@@ -4450,6 +4457,7 @@
               firstFragment: #F10
               type: int
           returnType: void
+          variable: <testLibrary>::@class::A::@field::isStatic
         synthetic isInstance
           reference: <testLibrary>::@class::A::@setter::isInstance
           firstFragment: #F11
@@ -4458,6 +4466,7 @@
               firstFragment: #F12
               type: int
           returnType: void
+          variable: <testLibrary>::@class::A::@field::isInstance
   topLevelVariables
     const hasInitializer foo
       reference: <testLibrary>::@topLevelVariable::foo
@@ -5142,6 +5151,7 @@
                 staticType: null
               element2: <testLibrary>::@getter::foo
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::setter
 ''');
   }
 
@@ -5269,6 +5279,7 @@
           firstFragment: #F8
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::isNotConst
 ''');
   }
 
@@ -5849,6 +5860,7 @@
                 staticType: null
               element2: <testLibrary>::@getter::a
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::foo
 ''');
   }
 
@@ -6113,6 +6125,7 @@
           firstFragment: #F6
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::v
 ''');
   }
 
@@ -6522,6 +6535,7 @@
           firstFragment: #F6
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
 ''');
   }
 

diff --git a/pkg/analyzer/test/src/summary/elements/mixin_test.dart b/pkg/analyzer/test/src/summary/elements/mixin_test.dart
index f641bce..5223987 100644
--- a/pkg/analyzer/test/src/summary/elements/mixin_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/mixin_test.dart

@@ -189,6 +189,7 @@
               firstFragment: #F18
               type: T
           returnType: void
+          variable: <testLibrary>::@mixin::M::@field::f
         s
           reference: <testLibrary>::@mixin::M::@setter::s
           firstFragment: #F19
@@ -197,6 +198,7 @@
               firstFragment: #F20
               type: int
           returnType: void
+          variable: <testLibrary>::@mixin::M::@field::s
       methods
         m
           reference: <testLibrary>::@mixin::M::@method::m
@@ -1484,6 +1486,7 @@
               firstFragment: #F4
               type: int
           returnType: void
+          variable: <testLibrary>::@mixin::M::@field::foo
 ''');
   }
 
@@ -1534,6 +1537,7 @@
               firstFragment: #F4
               type: int
           returnType: void
+          variable: <testLibrary>::@mixin::M::@field::foo
 ''');
   }
 

diff --git a/pkg/analyzer/test/src/summary/elements/non_synthetic_test.dart b/pkg/analyzer/test/src/summary/elements/non_synthetic_test.dart
index 18500d6..ab6ab37 100644
--- a/pkg/analyzer/test/src/summary/elements/non_synthetic_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/non_synthetic_test.dart

@@ -78,6 +78,7 @@
               firstFragment: #F6
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::foo
 ''');
   }
 
@@ -182,6 +183,7 @@
               firstFragment: #F5
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::foo
 ''');
   }
 
@@ -366,6 +368,7 @@
               firstFragment: #F5
               type: int
           returnType: void
+          variable: <testLibrary>::@mixin::M::@field::foo
 ''');
   }
 
@@ -458,6 +461,7 @@
               firstFragment: #F4
               type: int
           returnType: void
+          variable: <testLibrary>::@mixin::M::@field::foo
 ''');
   }
 
@@ -539,6 +543,7 @@
           firstFragment: #F4
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::foo
 ''');
   }
 
@@ -577,6 +582,7 @@
           firstFragment: #F3
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::foo
 ''');
   }
 
@@ -625,6 +631,7 @@
           firstFragment: #F4
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::foo
 ''');
   }
 }

diff --git a/pkg/analyzer/test/src/summary/elements/offsets_test.dart b/pkg/analyzer/test/src/summary/elements/offsets_test.dart
index 3c492ff..497a40b 100644
--- a/pkg/analyzer/test/src/summary/elements/offsets_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/offsets_test.dart

@@ -1021,6 +1021,7 @@
               firstFragment: #F14
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::withInit
         synthetic withoutInit
           reference: <testLibrary>::@class::C::@setter::withoutInit
           firstFragment: #F15
@@ -1029,6 +1030,7 @@
               firstFragment: #F16
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::withoutInit
         synthetic multiWithInit
           reference: <testLibrary>::@class::C::@setter::multiWithInit
           firstFragment: #F17
@@ -1037,6 +1039,7 @@
               firstFragment: #F18
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::multiWithInit
         synthetic multiWithoutInit
           reference: <testLibrary>::@class::C::@setter::multiWithoutInit
           firstFragment: #F19
@@ -1045,6 +1048,7 @@
               firstFragment: #F20
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::multiWithoutInit
         synthetic multiWithInit2
           reference: <testLibrary>::@class::C::@setter::multiWithInit2
           firstFragment: #F21
@@ -1053,6 +1057,7 @@
               firstFragment: #F22
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::multiWithInit2
 ''');
   }
 
@@ -1318,6 +1323,7 @@
               firstFragment: #F24
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::hasDocComment
         synthetic hasDocComment2
           reference: <testLibrary>::@class::C::@setter::hasDocComment2
           firstFragment: #F25
@@ -1326,6 +1332,7 @@
               firstFragment: #F26
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::hasDocComment2
         synthetic hasAnnotation
           reference: <testLibrary>::@class::C::@setter::hasAnnotation
           firstFragment: #F27
@@ -1334,6 +1341,7 @@
               firstFragment: #F28
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::hasAnnotation
         synthetic hasAnnotation2
           reference: <testLibrary>::@class::C::@setter::hasAnnotation2
           firstFragment: #F29
@@ -1342,6 +1350,7 @@
               firstFragment: #F30
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::hasAnnotation2
         synthetic annotationThenComment
           reference: <testLibrary>::@class::C::@setter::annotationThenComment
           firstFragment: #F31
@@ -1350,6 +1359,7 @@
               firstFragment: #F32
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::annotationThenComment
         synthetic annotationThenComment2
           reference: <testLibrary>::@class::C::@setter::annotationThenComment2
           firstFragment: #F33
@@ -1358,6 +1368,7 @@
               firstFragment: #F34
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::annotationThenComment2
         synthetic commentThenAnnotation
           reference: <testLibrary>::@class::C::@setter::commentThenAnnotation
           firstFragment: #F35
@@ -1366,6 +1377,7 @@
               firstFragment: #F36
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::commentThenAnnotation
         synthetic commentThenAnnotation2
           reference: <testLibrary>::@class::C::@setter::commentThenAnnotation2
           firstFragment: #F37
@@ -1374,6 +1386,7 @@
               firstFragment: #F38
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::commentThenAnnotation2
         synthetic commentAroundAnnotation
           reference: <testLibrary>::@class::C::@setter::commentAroundAnnotation
           firstFragment: #F39
@@ -1382,6 +1395,7 @@
               firstFragment: #F40
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::commentAroundAnnotation
         synthetic commentAroundAnnotation2
           reference: <testLibrary>::@class::C::@setter::commentAroundAnnotation2
           firstFragment: #F41
@@ -1390,6 +1404,7 @@
               firstFragment: #F42
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::commentAroundAnnotation2
 ''');
   }
 
@@ -2027,6 +2042,7 @@
           firstFragment: #F12
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::withInit
     synthetic static withoutInit
       reference: <testLibrary>::@setter::withoutInit
       firstFragment: #F13
@@ -2035,6 +2051,7 @@
           firstFragment: #F14
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::withoutInit
     synthetic static multiWithInit
       reference: <testLibrary>::@setter::multiWithInit
       firstFragment: #F15
@@ -2043,6 +2060,7 @@
           firstFragment: #F16
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::multiWithInit
     synthetic static multiWithoutInit
       reference: <testLibrary>::@setter::multiWithoutInit
       firstFragment: #F17
@@ -2051,6 +2069,7 @@
           firstFragment: #F18
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::multiWithoutInit
     synthetic static multiWithInit2
       reference: <testLibrary>::@setter::multiWithInit2
       firstFragment: #F19
@@ -2059,6 +2078,7 @@
           firstFragment: #F20
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::multiWithInit2
 ''');
   }
 
@@ -2499,6 +2519,7 @@
           firstFragment: #F22
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::hasDocComment
     synthetic static hasDocComment2
       reference: <testLibrary>::@setter::hasDocComment2
       firstFragment: #F23
@@ -2507,6 +2528,7 @@
           firstFragment: #F24
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::hasDocComment2
     synthetic static hasAnnotation
       reference: <testLibrary>::@setter::hasAnnotation
       firstFragment: #F25
@@ -2515,6 +2537,7 @@
           firstFragment: #F26
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::hasAnnotation
     synthetic static hasAnnotation2
       reference: <testLibrary>::@setter::hasAnnotation2
       firstFragment: #F27
@@ -2523,6 +2546,7 @@
           firstFragment: #F28
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::hasAnnotation2
     synthetic static annotationThenComment
       reference: <testLibrary>::@setter::annotationThenComment
       firstFragment: #F29
@@ -2531,6 +2555,7 @@
           firstFragment: #F30
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::annotationThenComment
     synthetic static annotationThenComment2
       reference: <testLibrary>::@setter::annotationThenComment2
       firstFragment: #F31
@@ -2539,6 +2564,7 @@
           firstFragment: #F32
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::annotationThenComment2
     synthetic static commentThenAnnotation
       reference: <testLibrary>::@setter::commentThenAnnotation
       firstFragment: #F33
@@ -2547,6 +2573,7 @@
           firstFragment: #F34
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::commentThenAnnotation
     synthetic static commentThenAnnotation2
       reference: <testLibrary>::@setter::commentThenAnnotation2
       firstFragment: #F35
@@ -2555,6 +2582,7 @@
           firstFragment: #F36
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::commentThenAnnotation2
     synthetic static commentAroundAnnotation
       reference: <testLibrary>::@setter::commentAroundAnnotation
       firstFragment: #F37
@@ -2563,6 +2591,7 @@
           firstFragment: #F38
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::commentAroundAnnotation
     synthetic static commentAroundAnnotation2
       reference: <testLibrary>::@setter::commentAroundAnnotation2
       firstFragment: #F39
@@ -2571,6 +2600,7 @@
           firstFragment: #F40
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::commentAroundAnnotation2
 ''');
   }
 
@@ -2764,6 +2794,7 @@
               firstFragment: #F6
               type: int
           returnType: void
+          variable: <testLibrary>::@class::A::@field::foo
 ''');
   }
 
@@ -2917,6 +2948,7 @@
               firstFragment: #F5
               type: int
           returnType: void
+          variable: <testLibrary>::@class::A::@field::foo
 ''');
   }
 

diff --git a/pkg/analyzer/test/src/summary/elements/since_sdk_version_test.dart b/pkg/analyzer/test/src/summary/elements/since_sdk_version_test.dart
index c19144b..c9a9260 100644
--- a/pkg/analyzer/test/src/summary/elements/since_sdk_version_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/since_sdk_version_test.dart

@@ -143,6 +143,7 @@
               firstFragment: #F5
               type: int
           returnType: void
+          variable: dart:foo::@class::A::@field::foo
 ''');
   }
 
@@ -353,6 +354,7 @@
               firstFragment: #F4
               type: int
           returnType: void
+          variable: dart:foo::@class::A::@field::foo
 ''');
   }
 

diff --git a/pkg/analyzer/test/src/summary/elements/top_level_function_test.dart b/pkg/analyzer/test/src/summary/elements/top_level_function_test.dart
index c936e84..8d1c6e1 100644
--- a/pkg/analyzer/test/src/summary/elements/top_level_function_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/top_level_function_test.dart

@@ -1159,6 +1159,7 @@
           firstFragment: #F4
           type: dynamic
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::main
 ''');
   }
 

diff --git a/pkg/analyzer/test/src/summary/elements/top_level_variable_test.dart b/pkg/analyzer/test/src/summary/elements/top_level_variable_test.dart
index 9af6f84..c7deb39 100644
--- a/pkg/analyzer/test/src/summary/elements/top_level_variable_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/top_level_variable_test.dart

@@ -80,6 +80,7 @@
           firstFragment: #F5
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::b
     static a
       reference: <testLibrary>::@setter::a
       firstFragment: #F6
@@ -88,6 +89,7 @@
           firstFragment: #F7
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::a
 ''');
   }
 
@@ -151,6 +153,7 @@
           firstFragment: #F6
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::a
 ''');
   }
 
@@ -482,6 +485,7 @@
           firstFragment: #F4
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
 ''');
   }
 
@@ -529,6 +533,7 @@
           firstFragment: #F4
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
 ''');
   }
 
@@ -571,6 +576,7 @@
           firstFragment: #F3
           type: dynamic
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
 ''');
   }
 
@@ -606,6 +612,7 @@
           firstFragment: #F3
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
 ''');
   }
 
@@ -641,6 +648,7 @@
           firstFragment: #F3
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::f
 ''');
   }
 
@@ -690,6 +698,7 @@
           firstFragment: #F4
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
     static y
       reference: <testLibrary>::@setter::y
       firstFragment: #F5
@@ -698,6 +707,7 @@
           firstFragment: #F6
           type: dynamic
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::y
 ''');
   }
 
@@ -745,6 +755,7 @@
           firstFragment: #F4
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::i
 ''');
   }
 
@@ -793,6 +804,7 @@
           firstFragment: #F4
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
 ''');
   }
 
@@ -841,6 +853,7 @@
           firstFragment: #F4
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
 ''');
   }
 
@@ -910,6 +923,7 @@
           firstFragment: #F6
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::foo::@def::0
     synthetic static foo
       reference: <testLibrary>::@setter::foo::@def::1
       firstFragment: #F7
@@ -918,6 +932,7 @@
           firstFragment: #F8
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::foo::@def::1
 ''');
   }
 
@@ -981,6 +996,7 @@
           firstFragment: #F6
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::foo::@def::0
 ''');
   }
 
@@ -1042,6 +1058,7 @@
           firstFragment: #F5
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::foo::@def::0
     static foo
       reference: <testLibrary>::@setter::foo::@def::1
       firstFragment: #F6
@@ -1050,6 +1067,7 @@
           firstFragment: #F7
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::foo::@def::1
 ''');
   }
 
@@ -1099,6 +1117,7 @@
           firstFragment: #F4
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::foo
 ''');
   }
 
@@ -1144,6 +1163,7 @@
           firstFragment: #F4
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
 ''');
   }
 
@@ -1268,6 +1288,7 @@
           firstFragment: #F4
           type: dynamic
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
 ''');
   }
 
@@ -1390,6 +1411,7 @@
           firstFragment: #F5
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
 ''');
   }
 
@@ -1453,6 +1475,7 @@
           firstFragment: #F4
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
 ''');
   }
 
@@ -1523,6 +1546,7 @@
           firstFragment: #F6
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
 ''');
   }
 
@@ -1582,6 +1606,7 @@
           firstFragment: #F4
           type: dynamic
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
 ''');
   }
 
@@ -1627,6 +1652,7 @@
           firstFragment: #F4
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::v
 ''');
   }
 
@@ -1813,6 +1839,7 @@
           firstFragment: #F8
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
 ''');
   }
 
@@ -1858,6 +1885,7 @@
           firstFragment: #F4
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::v
 ''');
   }
 
@@ -1903,6 +1931,7 @@
           firstFragment: #F4
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
 ''');
   }
 
@@ -1948,6 +1977,7 @@
           firstFragment: #F4
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
 ''');
   }
 
@@ -2044,6 +2074,7 @@
           firstFragment: #F6
           type: Object?
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::a
     synthetic static <null-name>
       reference: <testLibrary>::@setter::2
       firstFragment: #F7
@@ -2052,6 +2083,7 @@
           firstFragment: #F8
           type: Object?
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::0
 ''');
   }
 
@@ -2311,6 +2343,7 @@
           firstFragment: #F5
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
 ''');
   }
 
@@ -2356,6 +2389,7 @@
           firstFragment: #F4
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::v
 ''');
   }
 
@@ -2404,6 +2438,7 @@
           firstFragment: #F4
           type: Never
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::a
 ''');
   }
 
@@ -2452,6 +2487,7 @@
           firstFragment: #F4
           type: dynamic
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::a
 ''');
   }
 
@@ -2590,6 +2626,7 @@
           firstFragment: #F6
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::i
     synthetic static j
       reference: <testLibrary>::@setter::j
       firstFragment: #F7
@@ -2598,6 +2635,7 @@
           firstFragment: #F8
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::j
 ''');
   }
 

diff --git a/pkg/analyzer/test/src/summary/elements/type_alias_test.dart b/pkg/analyzer/test/src/summary/elements/type_alias_test.dart
index 4569f01..879b96a 100644
--- a/pkg/analyzer/test/src/summary/elements/type_alias_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/type_alias_test.dart

@@ -1815,6 +1815,7 @@
                   typeArguments
                     int
           returnType: void
+          variable: <testLibrary>::@class::A::@field::f
   typeAliases
     Foo
       reference: <testLibrary>::@typeAlias::Foo

diff --git a/pkg/analyzer/test/src/summary/elements/type_inference_test.dart b/pkg/analyzer/test/src/summary/elements/type_inference_test.dart
index ac163ff..888968b 100644
--- a/pkg/analyzer/test/src/summary/elements/type_inference_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/type_inference_test.dart

@@ -526,6 +526,7 @@
           firstFragment: #F12
           type: S<B>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::s
 ''');
   }
 
@@ -649,6 +650,7 @@
               firstFragment: #F6
               type: B
           returnType: void
+          variable: <testLibrary>::@class::A::@field::b
     class B
       reference: <testLibrary>::@class::B
       firstFragment: #F7
@@ -678,6 +680,7 @@
               firstFragment: #F12
               type: C
           returnType: void
+          variable: <testLibrary>::@class::B::@field::c
     class C
       reference: <testLibrary>::@class::C
       firstFragment: #F13
@@ -727,6 +730,7 @@
           firstFragment: #F22
           type: A
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::a
     synthetic static x
       reference: <testLibrary>::@setter::x
       firstFragment: #F23
@@ -735,6 +739,7 @@
           firstFragment: #F24
           type: C
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
 ''');
   }
 
@@ -825,6 +830,7 @@
           firstFragment: #F8
           type: Iterable<String>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
     synthetic static y
       reference: <testLibrary>::@setter::y
       firstFragment: #F9
@@ -833,6 +839,7 @@
           firstFragment: #F10
           type: List<int>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::y
     synthetic static z
       reference: <testLibrary>::@setter::z
       firstFragment: #F11
@@ -841,6 +848,7 @@
           firstFragment: #F12
           type: List<String>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::z
 ''');
   }
 
@@ -928,6 +936,7 @@
               firstFragment: #F6
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::p
   topLevelVariables
     hasInitializer x
       reference: <testLibrary>::@topLevelVariable::x
@@ -961,6 +970,7 @@
           firstFragment: #F12
           type: List<C>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
     synthetic static y
       reference: <testLibrary>::@setter::y
       firstFragment: #F13
@@ -969,6 +979,7 @@
           firstFragment: #F14
           type: Iterable<int>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::y
 ''');
   }
 
@@ -1253,6 +1264,7 @@
               firstFragment: #F7
               type: dynamic
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 
@@ -1405,6 +1417,7 @@
           firstFragment: #F9
           type: C<num>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::c
 ''');
   }
 
@@ -1535,6 +1548,7 @@
           firstFragment: #F4
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
   functions
     m
       reference: <testLibrary>::@function::m
@@ -1635,6 +1649,7 @@
           firstFragment: #F8
           type: int Function<T>()?
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::m
     synthetic static n
       reference: <testLibrary>::@setter::n
       firstFragment: #F9
@@ -1643,6 +1658,7 @@
           firstFragment: #F10
           type: int Function<T>()
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::n
     synthetic static x
       reference: <testLibrary>::@setter::x
       firstFragment: #F11
@@ -1651,6 +1667,7 @@
           firstFragment: #F12
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
 ''');
   }
 
@@ -1704,6 +1721,7 @@
           firstFragment: #F4
           type: HashMap<dynamic, dynamic>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::m
 ''');
   }
 
@@ -1814,6 +1832,7 @@
           firstFragment: #F10
           type: dynamic
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::a
     synthetic static b
       reference: <testLibrary>::@setter::b
       firstFragment: #F11
@@ -1822,6 +1841,7 @@
           firstFragment: #F12
           type: dynamic
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::b
     synthetic static c
       reference: <testLibrary>::@setter::c
       firstFragment: #F13
@@ -1830,6 +1850,7 @@
           firstFragment: #F14
           type: dynamic
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::c
     synthetic static d
       reference: <testLibrary>::@setter::d
       firstFragment: #F15
@@ -1838,6 +1859,7 @@
           firstFragment: #F16
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::d
 ''');
   }
 
@@ -1922,6 +1944,7 @@
               type: int Function(String)
                 alias: <testLibrary>::@typeAlias::F
           returnType: void
+          variable: <testLibrary>::@class::C::@field::v
     abstract class D
       reference: <testLibrary>::@class::D
       firstFragment: #F7
@@ -1999,6 +2022,7 @@
           firstFragment: #F4
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
 ''');
   }
 
@@ -2050,6 +2074,7 @@
           firstFragment: #F4
           type: int?
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
 ''');
   }
 
@@ -2101,6 +2126,7 @@
           firstFragment: #F4
           type: void Function()
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
 ''');
   }
 
@@ -2152,6 +2178,7 @@
           firstFragment: #F4
           type: void Function()?
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
 ''');
   }
 
@@ -2249,6 +2276,7 @@
               firstFragment: #F7
               type: Map<T, int>
           returnType: void
+          variable: <testLibrary>::@class::C::@field::v
     abstract class D
       reference: <testLibrary>::@class::D
       firstFragment: #F8
@@ -2338,6 +2366,7 @@
           firstFragment: #F5
           type: dynamic
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::v
   functions
     h
       reference: <testLibrary>::@function::h
@@ -2680,6 +2709,7 @@
           firstFragment: #F4
           type: dynamic
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::v
   functions
     f
       reference: <testLibrary>::@function::f
@@ -2755,6 +2785,7 @@
           firstFragment: #F4
           type: dynamic
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::v
   functions
     f
       reference: <testLibrary>::@function::f
@@ -2844,6 +2875,7 @@
               firstFragment: #F5
               type: int Function(String)
           returnType: void
+          variable: <testLibrary>::@class::C::@field::f
     abstract class D
       reference: <testLibrary>::@class::D
       firstFragment: #F6
@@ -2870,6 +2902,7 @@
                   firstFragment: #F11
                   type: String
           returnType: void
+          variable: <testLibrary>::@class::D::@field::f
 ''');
   }
 
@@ -3032,6 +3065,7 @@
           firstFragment: #F9
           type: A
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::a1
     synthetic static a2
       reference: <testLibrary>::@setter::a2
       firstFragment: #F10
@@ -3040,6 +3074,7 @@
           firstFragment: #F11
           type: A
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::a2
 ''');
   }
 
@@ -3120,6 +3155,7 @@
           firstFragment: #F6
           type: A
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::a1
     synthetic static a2
       reference: <testLibrary>::@setter::a2
       firstFragment: #F7
@@ -3128,6 +3164,7 @@
           firstFragment: #F8
           type: A
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::a2
 ''');
   }
 
@@ -3196,6 +3233,7 @@
           firstFragment: #F4
           type: List<Object Function(int Function(String))>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::v
   functions
     f
       reference: <testLibrary>::@function::f
@@ -3355,6 +3393,7 @@
               firstFragment: #F14
               type: dynamic
           returnType: void
+          variable: <testLibrary>::@class::D::@field::f
 ''');
   }
 
@@ -3456,6 +3495,7 @@
               firstFragment: #F9
               type: A
           returnType: void
+          variable: <testLibrary>::@class::B::@field::a
   topLevelVariables
     hasInitializer c
       reference: <testLibrary>::@topLevelVariable::c
@@ -3478,6 +3518,7 @@
           firstFragment: #F13
           type: double
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::c
 ''');
   }
 
@@ -3549,6 +3590,7 @@
           firstFragment: #F6
           type: int Function()
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::a
     synthetic static b
       reference: <testLibrary>::@setter::b
       firstFragment: #F7
@@ -3557,6 +3599,7 @@
           firstFragment: #F8
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::b
 ''');
   }
 
@@ -3611,6 +3654,7 @@
           firstFragment: #F4
           type: Future<dynamic> Function()
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
 ''');
   }
 
@@ -3658,6 +3702,7 @@
           firstFragment: #F4
           type: int Function(int Function(String))
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
 ''');
   }
 
@@ -3705,6 +3750,7 @@
           firstFragment: #F4
           type: int Function(int Function(String))
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
 ''');
   }
 
@@ -3757,6 +3803,7 @@
           firstFragment: #F4
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::y
 ''');
   }
 
@@ -4003,6 +4050,7 @@
               firstFragment: #F8
               type: T
           returnType: void
+          variable: <testLibrary>::@class::A::@field::value
     class B
       reference: <testLibrary>::@class::B
       firstFragment: #F9
@@ -4032,6 +4080,7 @@
               firstFragment: #F14
               type: A<String>
           returnType: void
+          variable: <testLibrary>::@class::B::@field::a
 ''');
   }
 
@@ -4156,6 +4205,7 @@
               firstFragment: #F8
               type: T
           returnType: void
+          variable: <testLibrary>::@class::A::@field::value
     class alias B
       reference: <testLibrary>::@class::B
       firstFragment: #F9
@@ -4217,6 +4267,7 @@
               firstFragment: #F18
               type: B<int>
           returnType: void
+          variable: <testLibrary>::@class::C::@field::a
   mixins
     mixin M
       reference: <testLibrary>::@mixin::M
@@ -4302,6 +4353,7 @@
               firstFragment: #F8
               type: int
           returnType: void
+          variable: <testLibrary>::@class::A::@field::f
 ''');
   }
 
@@ -4428,6 +4480,7 @@
           firstFragment: #F4
           type: InvalidType
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::v
 ''');
   }
 
@@ -4475,6 +4528,7 @@
           firstFragment: #F4
           type: dynamic Function(dynamic) Function(dynamic)
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
 ''');
   }
 
@@ -4522,6 +4576,7 @@
           firstFragment: #F4
           type: int Function(int) Function(int)
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
 ''');
   }
 
@@ -4569,6 +4624,7 @@
           firstFragment: #F4
           type: dynamic Function([dynamic])
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
 ''');
   }
 
@@ -5048,6 +5104,7 @@
           firstFragment: #F7
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::v
 ''');
   }
 
@@ -5155,6 +5212,7 @@
           firstFragment: #F10
           type: dynamic
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::V2
     synthetic static V
       reference: <testLibrary>::@setter::V
       firstFragment: #F11
@@ -5163,6 +5221,7 @@
           firstFragment: #F12
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::V
   functions
     f
       reference: <testLibrary>::@function::f
@@ -5240,6 +5299,7 @@
           firstFragment: #F6
           type: dynamic
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::V
     synthetic static V2
       reference: <testLibrary>::@setter::V2
       firstFragment: #F7
@@ -5248,6 +5308,7 @@
           firstFragment: #F8
           type: List<dynamic>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::V2
 ''');
   }
 
@@ -5346,6 +5407,7 @@
           firstFragment: #F4
           type: InvalidType
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::v
 ''');
   }
 
@@ -5391,6 +5453,7 @@
           firstFragment: #F4
           type: Never
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::d
 ''');
   }
 
@@ -5464,6 +5527,7 @@
               firstFragment: #F7
               type: T
           returnType: void
+          variable: <testLibrary>::@class::C::@field::t
 ''');
   }
 
@@ -5537,6 +5601,7 @@
               firstFragment: #F7
               type: T?
           returnType: void
+          variable: <testLibrary>::@class::C::@field::t
 ''');
   }
 
@@ -5729,6 +5794,7 @@
           firstFragment: #F17
           type: C
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::c
     synthetic static e
       reference: <testLibrary>::@setter::e
       firstFragment: #F18
@@ -5737,6 +5803,7 @@
           firstFragment: #F19
           type: E
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::e
     synthetic static f
       reference: <testLibrary>::@setter::f
       firstFragment: #F20
@@ -5746,6 +5813,7 @@
           type: dynamic Function()
             alias: <testLibrary>::@typeAlias::F
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::f
 ''');
   }
 
@@ -5948,6 +6016,7 @@
           firstFragment: #F9
           type: C
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::c
     synthetic static e
       reference: <testLibrary>::@setter::e
       firstFragment: #F10
@@ -5956,6 +6025,7 @@
           firstFragment: #F11
           type: E
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::e
     synthetic static f
       reference: <testLibrary>::@setter::f
       firstFragment: #F12
@@ -5965,6 +6035,7 @@
           type: dynamic Function()
             alias: <testLibrary>::@typeAlias::F
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::f
 ''');
   }
 
@@ -6164,6 +6235,7 @@
           firstFragment: #F18
           type: C
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::c
     synthetic static e
       reference: <testLibrary>::@setter::e
       firstFragment: #F19
@@ -6172,6 +6244,7 @@
           firstFragment: #F20
           type: E
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::e
     synthetic static f
       reference: <testLibrary>::@setter::f
       firstFragment: #F21
@@ -6181,6 +6254,7 @@
           type: dynamic Function()
             alias: <testLibrary>::@typeAlias::F
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::f
 ''');
   }
 
@@ -6392,6 +6466,7 @@
           firstFragment: #F19
           type: C
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::c
     synthetic static e
       reference: <testLibrary>::@setter::e
       firstFragment: #F20
@@ -6400,6 +6475,7 @@
           firstFragment: #F21
           type: E
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::e
     synthetic static f
       reference: <testLibrary>::@setter::f
       firstFragment: #F22
@@ -6409,6 +6485,7 @@
           type: dynamic Function()
             alias: <testLibrary>::@typeAlias::F
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::f
 ''');
   }
 
@@ -6609,6 +6686,7 @@
           firstFragment: #F18
           type: C
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::c
     synthetic static e
       reference: <testLibrary>::@setter::e
       firstFragment: #F19
@@ -6617,6 +6695,7 @@
           firstFragment: #F20
           type: E
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::e
     synthetic static f
       reference: <testLibrary>::@setter::f
       firstFragment: #F21
@@ -6626,6 +6705,7 @@
           type: dynamic Function()
             alias: <testLibrary>::@typeAlias::F
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::f
 ''');
   }
 
@@ -6686,6 +6766,7 @@
           firstFragment: #F6
           type: C
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::c
 ''');
   }
 
@@ -6756,6 +6837,7 @@
           firstFragment: #F8
           type: C<int, String>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::c
 ''');
   }
 
@@ -6826,6 +6908,7 @@
           firstFragment: #F8
           type: C<dynamic, dynamic>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::c
 ''');
   }
 
@@ -6947,6 +7030,7 @@
           firstFragment: #F10
           type: E
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::e
 ''');
   }
 
@@ -7040,6 +7124,7 @@
           firstFragment: #F8
           type: C
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::c
     synthetic static e
       reference: <testLibrary>::@setter::e
       firstFragment: #F9
@@ -7048,6 +7133,7 @@
           firstFragment: #F10
           type: E
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::e
     synthetic static f
       reference: <testLibrary>::@setter::f
       firstFragment: #F11
@@ -7057,6 +7143,7 @@
           type: dynamic Function()
             alias: package:test/a.dart::@typeAlias::F
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::f
 ''');
   }
 
@@ -7151,6 +7238,7 @@
           firstFragment: #F8
           type: C
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::c
     synthetic static e
       reference: <testLibrary>::@setter::e
       firstFragment: #F9
@@ -7159,6 +7247,7 @@
           firstFragment: #F10
           type: E
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::e
     synthetic static f
       reference: <testLibrary>::@setter::f
       firstFragment: #F11
@@ -7168,6 +7257,7 @@
           type: dynamic Function()
             alias: package:test/b.dart::@typeAlias::F
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::f
 ''');
   }
 
@@ -7263,6 +7353,7 @@
           firstFragment: #F8
           type: C
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::c
     synthetic static e
       reference: <testLibrary>::@setter::e
       firstFragment: #F9
@@ -7271,6 +7362,7 @@
           firstFragment: #F10
           type: E
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::e
     synthetic static f
       reference: <testLibrary>::@setter::f
       firstFragment: #F11
@@ -7280,6 +7372,7 @@
           type: dynamic Function()
             alias: package:test/c.dart::@typeAlias::F
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::f
 ''');
   }
 
@@ -7375,6 +7468,7 @@
           firstFragment: #F8
           type: C
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::c
     synthetic static e
       reference: <testLibrary>::@setter::e
       firstFragment: #F9
@@ -7383,6 +7477,7 @@
           firstFragment: #F10
           type: E
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::e
     synthetic static f
       reference: <testLibrary>::@setter::f
       firstFragment: #F11
@@ -7392,6 +7487,7 @@
           type: dynamic Function()
             alias: package:test/a/c/c.dart::@typeAlias::F
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::f
 ''');
   }
 
@@ -7486,6 +7582,7 @@
           firstFragment: #F8
           type: C
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::c
     synthetic static e
       reference: <testLibrary>::@setter::e
       firstFragment: #F9
@@ -7494,6 +7591,7 @@
           firstFragment: #F10
           type: E
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::e
     synthetic static f
       reference: <testLibrary>::@setter::f
       firstFragment: #F11
@@ -7503,6 +7601,7 @@
           type: dynamic Function()
             alias: package:test/a/b/b.dart::@typeAlias::F
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::f
 ''');
   }
 
@@ -7597,6 +7696,7 @@
           firstFragment: #F8
           type: C
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::c
     synthetic static e
       reference: <testLibrary>::@setter::e
       firstFragment: #F9
@@ -7605,6 +7705,7 @@
           firstFragment: #F10
           type: E
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::e
     synthetic static f
       reference: <testLibrary>::@setter::f
       firstFragment: #F11
@@ -7614,6 +7715,7 @@
           type: dynamic Function()
             alias: package:test/a.dart::@typeAlias::F
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::f
 ''');
   }
 
@@ -7687,6 +7789,7 @@
           firstFragment: #F6
           type: C1
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::c1
     synthetic static c2
       reference: <testLibrary>::@setter::c2
       firstFragment: #F7
@@ -7695,6 +7798,7 @@
           firstFragment: #F8
           type: C2
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::c2
 ''');
   }
 
@@ -7789,6 +7893,7 @@
           firstFragment: #F8
           type: C
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::c
     synthetic static e
       reference: <testLibrary>::@setter::e
       firstFragment: #F9
@@ -7797,6 +7902,7 @@
           firstFragment: #F10
           type: E
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::e
     synthetic static f
       reference: <testLibrary>::@setter::f
       firstFragment: #F11
@@ -7806,6 +7912,7 @@
           type: dynamic Function()
             alias: package:test/a/b.dart::@typeAlias::F
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::f
 ''');
   }
 
@@ -7899,6 +8006,7 @@
           firstFragment: #F8
           type: C
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::c
     synthetic static e
       reference: <testLibrary>::@setter::e
       firstFragment: #F9
@@ -7907,6 +8015,7 @@
           firstFragment: #F10
           type: E
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::e
     synthetic static f
       reference: <testLibrary>::@setter::f
       firstFragment: #F11
@@ -7916,6 +8025,7 @@
           type: dynamic Function()
             alias: package:test/a.dart::@typeAlias::F
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::f
 ''');
   }
 
@@ -7972,6 +8082,7 @@
           type: dynamic Function()
             alias: <testLibrary>::@typeAlias::F
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::f
 ''');
   }
 
@@ -8049,6 +8160,7 @@
                 int
                 String
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::f
 ''');
   }
 
@@ -8124,6 +8236,7 @@
                 dynamic
                 dynamic
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::f
 ''');
   }
 }

diff --git a/pkg/analyzer/test/src/summary/elements/types_test.dart b/pkg/analyzer/test/src/summary/elements/types_test.dart
index 3d47e03..8db906a 100644
--- a/pkg/analyzer/test/src/summary/elements/types_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/types_test.dart

@@ -124,6 +124,7 @@
           firstFragment: #F4
           type: FutureOr<int>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
 ''');
     var variables = library.topLevelVariables;
     expect(variables, hasLength(1));
@@ -248,6 +249,7 @@
           firstFragment: #F6
           type: FutureOr<int>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
     synthetic static y
       reference: <testLibrary>::@setter::y
       firstFragment: #F7
@@ -256,6 +258,7 @@
           firstFragment: #F8
           type: InvalidType
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::y
   functions
     f
       reference: <testLibrary>::@function::f
@@ -488,6 +491,7 @@
           firstFragment: #F4
           type: int Function()
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::v
 ''');
   }
 
@@ -533,6 +537,7 @@
           firstFragment: #F4
           type: Future<dynamic> Function(dynamic)
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::v
 ''');
   }
 
@@ -584,6 +589,7 @@
           firstFragment: #F4
           type: Future<int> Function(Future<Future<Future<int>>>)
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::v
 ''');
   }
 
@@ -634,6 +640,7 @@
           firstFragment: #F4
           type: Future<int> Function(Future<int>)
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::v
 ''');
   }
 
@@ -684,6 +691,7 @@
           firstFragment: #F4
           type: Future<dynamic> Function(Future<dynamic>)
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::v
 ''');
   }
 
@@ -748,6 +756,7 @@
               firstFragment: #F6
               type: int Function()
           returnType: void
+          variable: <testLibrary>::@class::C::@field::v
 ''');
   }
 
@@ -974,6 +983,7 @@
           firstFragment: #F8
           type: C<num, C<num, dynamic>>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::c
 ''');
   }
 
@@ -1082,6 +1092,7 @@
               firstFragment: #F9
               type: C<C<Object?>>
           returnType: void
+          variable: <testLibrary>::@class::B::@field::c3
   topLevelVariables
     c
       reference: <testLibrary>::@topLevelVariable::c
@@ -1115,6 +1126,7 @@
           firstFragment: #F15
           type: C<C<dynamic>>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::c
     synthetic static c2
       reference: <testLibrary>::@setter::c2
       firstFragment: #F16
@@ -1123,6 +1135,7 @@
           firstFragment: #F17
           type: C<C<Object?>>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::c2
 ''');
   }
 
@@ -1198,6 +1211,7 @@
           firstFragment: #F8
           type: C<C<dynamic, num>, num>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::c
 ''');
   }
 
@@ -1321,6 +1335,7 @@
               typeArguments
                 num
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::f
 ''');
   }
 
@@ -1416,6 +1431,7 @@
           firstFragment: #F11
           type: B<int Function(), A<int Function()>>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::b
 ''');
   }
 
@@ -1488,6 +1504,7 @@
               typeArguments
                 num
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::f
 ''');
   }
 
@@ -1634,6 +1651,7 @@
           firstFragment: #F7
           type: C<num>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::c
 ''');
   }
 
@@ -1704,6 +1722,7 @@
               firstFragment: #F6
               type: List<dynamic>
           returnType: void
+          variable: <testLibrary>::@class::C::@field::v
 ''');
   }
 
@@ -1858,6 +1877,7 @@
           firstFragment: #F4
           type: dynamic
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::V
   functions
     foo
       reference: <testLibrary>::@function::foo
@@ -1929,6 +1949,7 @@
           firstFragment: #F4
           type: C
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::v
 ''');
   }
 
@@ -1985,6 +2006,7 @@
           firstFragment: #F4
           type: C
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::v
 ''');
   }
 
@@ -2045,6 +2067,7 @@
           firstFragment: #F4
           type: C
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::v
 ''');
   }
 
@@ -2436,6 +2459,7 @@
               firstFragment: #F8
               type: int Function(T, U)
           returnType: void
+          variable: <testLibrary>::@class::C::@field::v
   functions
     f
       reference: <testLibrary>::@function::f
@@ -2606,6 +2630,7 @@
           firstFragment: #F4
           type: Map<dynamic, dynamic>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::m
 ''');
   }
 
@@ -2651,6 +2676,7 @@
           firstFragment: #F4
           type: Map<dynamic, int>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::m
 ''');
   }
 
@@ -2696,6 +2722,7 @@
           firstFragment: #F4
           type: Map<String, dynamic>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::m
 ''');
   }
 
@@ -2741,6 +2768,7 @@
           firstFragment: #F4
           type: Map<String, int>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::m
 ''');
   }
 
@@ -2786,6 +2814,7 @@
           firstFragment: #F4
           type: Map<dynamic, dynamic>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::m
 ''');
   }
 
@@ -2831,6 +2860,7 @@
           firstFragment: #F4
           type: dynamic
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::d
 ''');
   }
 
@@ -2876,6 +2906,7 @@
           firstFragment: #F4
           type: InvalidType
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::c
 ''');
   }
 
@@ -2926,6 +2957,7 @@
           firstFragment: #F4
           type: InvalidType
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::c
 ''');
   }
 

diff --git a/pkg/analyzer/test/src/summary/top_level_inference_test.dart b/pkg/analyzer/test/src/summary/top_level_inference_test.dart
index de8dfe1..767f7ec 100644
--- a/pkg/analyzer/test/src/summary/top_level_inference_test.dart
+++ b/pkg/analyzer/test/src/summary/top_level_inference_test.dart

@@ -552,6 +552,7 @@
           firstFragment: #F18
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vPlusIntInt
     synthetic static vPlusIntDouble
       reference: <testLibrary>::@setter::vPlusIntDouble
       firstFragment: #F19
@@ -560,6 +561,7 @@
           firstFragment: #F20
           type: double
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vPlusIntDouble
     synthetic static vPlusDoubleInt
       reference: <testLibrary>::@setter::vPlusDoubleInt
       firstFragment: #F21
@@ -568,6 +570,7 @@
           firstFragment: #F22
           type: double
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vPlusDoubleInt
     synthetic static vPlusDoubleDouble
       reference: <testLibrary>::@setter::vPlusDoubleDouble
       firstFragment: #F23
@@ -576,6 +579,7 @@
           firstFragment: #F24
           type: double
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vPlusDoubleDouble
     synthetic static vMinusIntInt
       reference: <testLibrary>::@setter::vMinusIntInt
       firstFragment: #F25
@@ -584,6 +588,7 @@
           firstFragment: #F26
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vMinusIntInt
     synthetic static vMinusIntDouble
       reference: <testLibrary>::@setter::vMinusIntDouble
       firstFragment: #F27
@@ -592,6 +597,7 @@
           firstFragment: #F28
           type: double
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vMinusIntDouble
     synthetic static vMinusDoubleInt
       reference: <testLibrary>::@setter::vMinusDoubleInt
       firstFragment: #F29
@@ -600,6 +606,7 @@
           firstFragment: #F30
           type: double
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vMinusDoubleInt
     synthetic static vMinusDoubleDouble
       reference: <testLibrary>::@setter::vMinusDoubleDouble
       firstFragment: #F31
@@ -608,6 +615,7 @@
           firstFragment: #F32
           type: double
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vMinusDoubleDouble
 ''');
   }
 
@@ -655,6 +663,7 @@
           firstFragment: #F4
           type: num
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::V
 ''');
   }
 
@@ -744,6 +753,7 @@
           firstFragment: #F8
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::a
     synthetic static t1
       reference: <testLibrary>::@setter::t1
       firstFragment: #F9
@@ -752,6 +762,7 @@
           firstFragment: #F10
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::t1
     synthetic static t2
       reference: <testLibrary>::@setter::t2
       firstFragment: #F11
@@ -760,6 +771,7 @@
           firstFragment: #F12
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::t2
 ''');
   }
 
@@ -849,6 +861,7 @@
           firstFragment: #F8
           type: List<int>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::a
     synthetic static t1
       reference: <testLibrary>::@setter::t1
       firstFragment: #F9
@@ -857,6 +870,7 @@
           firstFragment: #F10
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::t1
     synthetic static t2
       reference: <testLibrary>::@setter::t2
       firstFragment: #F11
@@ -865,6 +879,7 @@
           firstFragment: #F12
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::t2
 ''');
   }
 
@@ -962,6 +977,7 @@
               firstFragment: #F6
               type: int
           returnType: void
+          variable: <testLibrary>::@class::A::@field::f
   topLevelVariables
     hasInitializer a
       reference: <testLibrary>::@topLevelVariable::a
@@ -1006,6 +1022,7 @@
           firstFragment: #F14
           type: A
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::a
     synthetic static t1
       reference: <testLibrary>::@setter::t1
       firstFragment: #F15
@@ -1014,6 +1031,7 @@
           firstFragment: #F16
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::t1
     synthetic static t2
       reference: <testLibrary>::@setter::t2
       firstFragment: #F17
@@ -1022,6 +1040,7 @@
           firstFragment: #F18
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::t2
 ''');
   }
 
@@ -1126,6 +1145,7 @@
               firstFragment: #F6
               type: int
           returnType: void
+          variable: <testLibrary>::@class::I::@field::f
     abstract class C
       reference: <testLibrary>::@class::C
       firstFragment: #F7
@@ -1179,6 +1199,7 @@
           firstFragment: #F16
           type: C
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::c
     synthetic static t1
       reference: <testLibrary>::@setter::t1
       firstFragment: #F17
@@ -1187,6 +1208,7 @@
           firstFragment: #F18
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::t1
     synthetic static t2
       reference: <testLibrary>::@setter::t2
       firstFragment: #F19
@@ -1195,6 +1217,7 @@
           firstFragment: #F20
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::t2
 ''');
   }
 
@@ -1293,6 +1316,7 @@
               firstFragment: #F6
               type: int
           returnType: void
+          variable: <testLibrary>::@class::I::@field::f
     abstract class C
       reference: <testLibrary>::@class::C
       firstFragment: #F7
@@ -1335,6 +1359,7 @@
           firstFragment: #F14
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::t1
     synthetic static t2
       reference: <testLibrary>::@setter::t2
       firstFragment: #F15
@@ -1343,6 +1368,7 @@
           firstFragment: #F16
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::t2
   functions
     getC
       reference: <testLibrary>::@function::getC
@@ -1426,6 +1452,7 @@
           firstFragment: #F6
           type: Future<int> Function()
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::uValue
     synthetic static uFuture
       reference: <testLibrary>::@setter::uFuture
       firstFragment: #F7
@@ -1434,6 +1461,7 @@
           firstFragment: #F8
           type: Future<int> Function()
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::uFuture
   functions
     fValue
       reference: <testLibrary>::@function::fValue
@@ -1574,6 +1602,7 @@
           firstFragment: #F12
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vBitXor
     synthetic static vBitAnd
       reference: <testLibrary>::@setter::vBitAnd
       firstFragment: #F13
@@ -1582,6 +1611,7 @@
           firstFragment: #F14
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vBitAnd
     synthetic static vBitOr
       reference: <testLibrary>::@setter::vBitOr
       firstFragment: #F15
@@ -1590,6 +1620,7 @@
           firstFragment: #F16
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vBitOr
     synthetic static vBitShiftLeft
       reference: <testLibrary>::@setter::vBitShiftLeft
       firstFragment: #F17
@@ -1598,6 +1629,7 @@
           firstFragment: #F18
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vBitShiftLeft
     synthetic static vBitShiftRight
       reference: <testLibrary>::@setter::vBitShiftRight
       firstFragment: #F19
@@ -1606,6 +1638,7 @@
           firstFragment: #F20
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vBitShiftRight
 ''');
   }
 
@@ -1707,6 +1740,7 @@
               firstFragment: #F6
               type: int
           returnType: void
+          variable: <testLibrary>::@class::A::@field::a
       methods
         m
           reference: <testLibrary>::@class::A::@method::m
@@ -1756,6 +1790,7 @@
           firstFragment: #F15
           type: A
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vSetField
     synthetic static vInvokeMethod
       reference: <testLibrary>::@setter::vInvokeMethod
       firstFragment: #F16
@@ -1764,6 +1799,7 @@
           firstFragment: #F17
           type: A
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vInvokeMethod
     synthetic static vBoth
       reference: <testLibrary>::@setter::vBoth
       firstFragment: #F18
@@ -1772,6 +1808,7 @@
           firstFragment: #F19
           type: A
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vBoth
 ''');
   }
 
@@ -2023,6 +2060,7 @@
               firstFragment: #F6
               type: int
           returnType: void
+          variable: <testLibrary>::@class::A::@field::f
     class B
       reference: <testLibrary>::@class::B
       firstFragment: #F7
@@ -2052,6 +2090,7 @@
               firstFragment: #F12
               type: A
           returnType: void
+          variable: <testLibrary>::@class::B::@field::a
     class C
       reference: <testLibrary>::@class::C
       firstFragment: #F13
@@ -2081,6 +2120,7 @@
               firstFragment: #F18
               type: B
           returnType: void
+          variable: <testLibrary>::@class::C::@field::b
     class X
       reference: <testLibrary>::@class::X
       firstFragment: #F19
@@ -2231,6 +2271,7 @@
               firstFragment: #F46
               type: A
           returnType: void
+          variable: <testLibrary>::@class::X::@field::a
         synthetic b
           reference: <testLibrary>::@class::X::@setter::b
           firstFragment: #F47
@@ -2239,6 +2280,7 @@
               firstFragment: #F48
               type: B
           returnType: void
+          variable: <testLibrary>::@class::X::@field::b
         synthetic c
           reference: <testLibrary>::@class::X::@setter::c
           firstFragment: #F49
@@ -2247,6 +2289,7 @@
               firstFragment: #F50
               type: C
           returnType: void
+          variable: <testLibrary>::@class::X::@field::c
         synthetic t01
           reference: <testLibrary>::@class::X::@setter::t01
           firstFragment: #F51
@@ -2255,6 +2298,7 @@
               firstFragment: #F52
               type: int
           returnType: void
+          variable: <testLibrary>::@class::X::@field::t01
         synthetic t02
           reference: <testLibrary>::@class::X::@setter::t02
           firstFragment: #F53
@@ -2263,6 +2307,7 @@
               firstFragment: #F54
               type: int
           returnType: void
+          variable: <testLibrary>::@class::X::@field::t02
         synthetic t03
           reference: <testLibrary>::@class::X::@setter::t03
           firstFragment: #F55
@@ -2271,6 +2316,7 @@
               firstFragment: #F56
               type: int
           returnType: void
+          variable: <testLibrary>::@class::X::@field::t03
         synthetic t11
           reference: <testLibrary>::@class::X::@setter::t11
           firstFragment: #F57
@@ -2279,6 +2325,7 @@
               firstFragment: #F58
               type: int
           returnType: void
+          variable: <testLibrary>::@class::X::@field::t11
         synthetic t12
           reference: <testLibrary>::@class::X::@setter::t12
           firstFragment: #F59
@@ -2287,6 +2334,7 @@
               firstFragment: #F60
               type: int
           returnType: void
+          variable: <testLibrary>::@class::X::@field::t12
         synthetic t13
           reference: <testLibrary>::@class::X::@setter::t13
           firstFragment: #F61
@@ -2295,6 +2343,7 @@
               firstFragment: #F62
               type: int
           returnType: void
+          variable: <testLibrary>::@class::X::@field::t13
         synthetic t21
           reference: <testLibrary>::@class::X::@setter::t21
           firstFragment: #F63
@@ -2303,6 +2352,7 @@
               firstFragment: #F64
               type: int
           returnType: void
+          variable: <testLibrary>::@class::X::@field::t21
         synthetic t22
           reference: <testLibrary>::@class::X::@setter::t22
           firstFragment: #F65
@@ -2311,6 +2361,7 @@
               firstFragment: #F66
               type: int
           returnType: void
+          variable: <testLibrary>::@class::X::@field::t22
         synthetic t23
           reference: <testLibrary>::@class::X::@setter::t23
           firstFragment: #F67
@@ -2319,6 +2370,7 @@
               firstFragment: #F68
               type: int
           returnType: void
+          variable: <testLibrary>::@class::X::@field::t23
   functions
     newA
       reference: <testLibrary>::@function::newA
@@ -2379,6 +2431,7 @@
           firstFragment: #F4
           type: num
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::V
 ''');
   }
 
@@ -2447,6 +2500,7 @@
           firstFragment: #F6
           type: bool
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vEq
     synthetic static vNotEq
       reference: <testLibrary>::@setter::vNotEq
       firstFragment: #F7
@@ -2455,6 +2509,7 @@
           firstFragment: #F8
           type: bool
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vNotEq
 ''');
   }
 
@@ -2523,6 +2578,7 @@
           firstFragment: #F6
           type: dynamic
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::a
     synthetic static b
       reference: <testLibrary>::@setter::b
       firstFragment: #F7
@@ -2531,6 +2587,7 @@
           firstFragment: #F8
           type: dynamic
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::b
 ''');
   }
 
@@ -2578,6 +2635,7 @@
           firstFragment: #F4
           type: dynamic
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::a
 ''');
   }
 
@@ -2667,6 +2725,7 @@
           firstFragment: #F8
           type: List<num>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::a
     synthetic static b0
       reference: <testLibrary>::@setter::b0
       firstFragment: #F9
@@ -2675,6 +2734,7 @@
           firstFragment: #F10
           type: num
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::b0
     synthetic static b1
       reference: <testLibrary>::@setter::b1
       firstFragment: #F11
@@ -2683,6 +2743,7 @@
           firstFragment: #F12
           type: num
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::b1
 ''');
   }
 
@@ -2738,6 +2799,7 @@
           firstFragment: #F4
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
 ''');
   }
 
@@ -2815,6 +2877,7 @@
               firstFragment: #F6
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::f
   topLevelVariables
     hasInitializer x
       reference: <testLibrary>::@topLevelVariable::x
@@ -2837,6 +2900,7 @@
           firstFragment: #F10
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
 ''');
   }
 
@@ -2893,6 +2957,7 @@
           firstFragment: #F4
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
 ''');
   }
 
@@ -2948,6 +3013,7 @@
           firstFragment: #F4
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
 ''');
   }
 
@@ -3025,6 +3091,7 @@
               firstFragment: #F6
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::f
   topLevelVariables
     hasInitializer x
       reference: <testLibrary>::@topLevelVariable::x
@@ -3047,6 +3114,7 @@
           firstFragment: #F10
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
 ''');
   }
 
@@ -3103,6 +3171,7 @@
           firstFragment: #F4
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
 ''');
   }
 
@@ -3188,6 +3257,7 @@
               firstFragment: #F6
               type: int
           returnType: void
+          variable: <testLibrary>::@class::A::@field::f
     class B
       reference: <testLibrary>::@class::B
       firstFragment: #F7
@@ -3217,6 +3287,7 @@
               firstFragment: #F12
               type: int
           returnType: void
+          variable: <testLibrary>::@class::B::@field::t
 ''');
   }
 
@@ -3304,6 +3375,7 @@
               firstFragment: #F6
               type: bool
           returnType: void
+          variable: <testLibrary>::@class::C::@field::b
   topLevelVariables
     c
       reference: <testLibrary>::@topLevelVariable::c
@@ -3337,6 +3409,7 @@
           firstFragment: #F12
           type: C
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::c
     synthetic static x
       reference: <testLibrary>::@setter::x
       firstFragment: #F13
@@ -3345,6 +3418,7 @@
           firstFragment: #F14
           type: bool
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
 ''');
   }
 
@@ -3439,6 +3513,7 @@
               firstFragment: #F6
               type: bool
           returnType: void
+          variable: <testLibrary>::@class::I::@field::b
     abstract class C
       reference: <testLibrary>::@class::C
       firstFragment: #F7
@@ -3481,6 +3556,7 @@
           firstFragment: #F14
           type: C
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::c
     synthetic static x
       reference: <testLibrary>::@setter::x
       firstFragment: #F15
@@ -3489,6 +3565,7 @@
           firstFragment: #F16
           type: bool
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
 ''');
   }
 
@@ -3577,6 +3654,7 @@
               firstFragment: #F6
               type: bool
           returnType: void
+          variable: <testLibrary>::@class::I::@field::b
     abstract class C
       reference: <testLibrary>::@class::C
       firstFragment: #F7
@@ -3608,6 +3686,7 @@
           firstFragment: #F12
           type: bool
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
   functions
     f
       reference: <testLibrary>::@function::f
@@ -3733,6 +3812,7 @@
           firstFragment: #F12
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
     synthetic static y
       reference: <testLibrary>::@setter::y
       firstFragment: #F13
@@ -3741,6 +3821,7 @@
           firstFragment: #F14
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::y
 ''');
   }
 
@@ -3896,6 +3977,7 @@
           firstFragment: #F14
           type: Future<int>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vFuture
     synthetic static v_noParameters_inferredReturnType
       reference: <testLibrary>::@setter::v_noParameters_inferredReturnType
       firstFragment: #F15
@@ -3904,6 +3986,7 @@
           firstFragment: #F16
           type: int Function()
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::v_noParameters_inferredReturnType
     synthetic static v_hasParameter_withType_inferredReturnType
       reference: <testLibrary>::@setter::v_hasParameter_withType_inferredReturnType
       firstFragment: #F17
@@ -3912,6 +3995,7 @@
           firstFragment: #F18
           type: int Function(String)
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::v_hasParameter_withType_inferredReturnType
     synthetic static v_hasParameter_withType_returnParameter
       reference: <testLibrary>::@setter::v_hasParameter_withType_returnParameter
       firstFragment: #F19
@@ -3920,6 +4004,7 @@
           firstFragment: #F20
           type: String Function(String)
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::v_hasParameter_withType_returnParameter
     synthetic static v_async_returnValue
       reference: <testLibrary>::@setter::v_async_returnValue
       firstFragment: #F21
@@ -3928,6 +4013,7 @@
           firstFragment: #F22
           type: Future<int> Function()
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::v_async_returnValue
     synthetic static v_async_returnFuture
       reference: <testLibrary>::@setter::v_async_returnFuture
       firstFragment: #F23
@@ -3936,6 +4022,7 @@
           firstFragment: #F24
           type: Future<int> Function()
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::v_async_returnFuture
 ''');
   }
 
@@ -3984,6 +4071,7 @@
           firstFragment: #F4
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::v
 ''');
   }
 
@@ -4059,6 +4147,7 @@
           firstFragment: #F6
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vHasTypeArgument
     synthetic static vNoTypeArgument
       reference: <testLibrary>::@setter::vNoTypeArgument
       firstFragment: #F7
@@ -4067,6 +4156,7 @@
           firstFragment: #F8
           type: dynamic
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vNoTypeArgument
   functions
     f
       reference: <testLibrary>::@function::f
@@ -4150,6 +4240,7 @@
           firstFragment: #F6
           type: String
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vOkArgumentType
     synthetic static vWrongArgumentType
       reference: <testLibrary>::@setter::vWrongArgumentType
       firstFragment: #F7
@@ -4158,6 +4249,7 @@
           firstFragment: #F8
           type: String
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vWrongArgumentType
   functions
     f
       reference: <testLibrary>::@function::f
@@ -4364,6 +4456,7 @@
               firstFragment: #F8
               type: int
           returnType: void
+          variable: <testLibrary>::@class::A::@field::staticClassVariable
       methods
         static staticClassMethod
           reference: <testLibrary>::@class::A::@method::staticClassMethod
@@ -4501,6 +4594,7 @@
           firstFragment: #F34
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::topLevelVariable
     synthetic static r_topLevelFunction
       reference: <testLibrary>::@setter::r_topLevelFunction
       firstFragment: #F35
@@ -4509,6 +4603,7 @@
           firstFragment: #F36
           type: String Function(int)
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::r_topLevelFunction
     synthetic static r_topLevelVariable
       reference: <testLibrary>::@setter::r_topLevelVariable
       firstFragment: #F37
@@ -4517,6 +4612,7 @@
           firstFragment: #F38
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::r_topLevelVariable
     synthetic static r_topLevelGetter
       reference: <testLibrary>::@setter::r_topLevelGetter
       firstFragment: #F39
@@ -4525,6 +4621,7 @@
           firstFragment: #F40
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::r_topLevelGetter
     synthetic static r_staticClassVariable
       reference: <testLibrary>::@setter::r_staticClassVariable
       firstFragment: #F41
@@ -4533,6 +4630,7 @@
           firstFragment: #F42
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::r_staticClassVariable
     synthetic static r_staticGetter
       reference: <testLibrary>::@setter::r_staticGetter
       firstFragment: #F43
@@ -4541,6 +4639,7 @@
           firstFragment: #F44
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::r_staticGetter
     synthetic static r_staticClassMethod
       reference: <testLibrary>::@setter::r_staticClassMethod
       firstFragment: #F45
@@ -4549,6 +4648,7 @@
           firstFragment: #F46
           type: String Function(int)
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::r_staticClassMethod
     synthetic static instanceOfA
       reference: <testLibrary>::@setter::instanceOfA
       firstFragment: #F47
@@ -4557,6 +4657,7 @@
           firstFragment: #F48
           type: A
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::instanceOfA
     synthetic static r_instanceClassMethod
       reference: <testLibrary>::@setter::r_instanceClassMethod
       firstFragment: #F49
@@ -4565,6 +4666,7 @@
           firstFragment: #F50
           type: String Function(int)
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::r_instanceClassMethod
   functions
     topLevelFunction
       reference: <testLibrary>::@function::topLevelFunction
@@ -4672,6 +4774,7 @@
               firstFragment: #F6
               type: dynamic
           returnType: void
+          variable: <testLibrary>::@class::A::@field::a
     class B
       reference: <testLibrary>::@class::B
       firstFragment: #F7
@@ -4701,6 +4804,7 @@
               firstFragment: #F12
               type: dynamic
           returnType: void
+          variable: <testLibrary>::@class::B::@field::b
   topLevelVariables
     hasInitializer c
       reference: <testLibrary>::@topLevelVariable::c
@@ -4723,6 +4827,7 @@
           firstFragment: #F16
           type: dynamic
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::c
 ''');
   }
 
@@ -4810,6 +4915,7 @@
               firstFragment: #F6
               type: dynamic
           returnType: void
+          variable: <testLibrary>::@class::A::@field::a
   topLevelVariables
     hasInitializer b
       reference: <testLibrary>::@topLevelVariable::b
@@ -4843,6 +4949,7 @@
           firstFragment: #F12
           type: dynamic
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::b
     synthetic static c
       reference: <testLibrary>::@setter::c
       firstFragment: #F13
@@ -4851,6 +4958,7 @@
           firstFragment: #F14
           type: dynamic
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::c
 ''');
   }
 
@@ -5010,6 +5118,7 @@
           firstFragment: #F6
           type: A
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::a
 ''');
   }
 
@@ -5082,6 +5191,7 @@
           firstFragment: #F6
           type: String
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::s
     synthetic static h
       reference: <testLibrary>::@setter::h
       firstFragment: #F7
@@ -5090,6 +5200,7 @@
           firstFragment: #F8
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::h
   functions
     f
       reference: <testLibrary>::@function::f
@@ -5184,6 +5295,7 @@
           firstFragment: #F8
           type: dynamic
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::d
     synthetic static s
       reference: <testLibrary>::@setter::s
       firstFragment: #F9
@@ -5192,6 +5304,7 @@
           firstFragment: #F10
           type: String
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::s
     synthetic static h
       reference: <testLibrary>::@setter::h
       firstFragment: #F11
@@ -5200,6 +5313,7 @@
           firstFragment: #F12
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::h
 ''');
   }
 
@@ -5268,6 +5382,7 @@
           firstFragment: #F6
           type: double
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::a
     synthetic static b
       reference: <testLibrary>::@setter::b
       firstFragment: #F7
@@ -5276,6 +5391,7 @@
           firstFragment: #F8
           type: bool
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::b
 ''');
   }
 
@@ -5414,6 +5530,7 @@
           firstFragment: #F10
           type: List<Object>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vObject
     synthetic static vNum
       reference: <testLibrary>::@setter::vNum
       firstFragment: #F11
@@ -5422,6 +5539,7 @@
           firstFragment: #F12
           type: List<num>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vNum
     synthetic static vNumEmpty
       reference: <testLibrary>::@setter::vNumEmpty
       firstFragment: #F13
@@ -5430,6 +5548,7 @@
           firstFragment: #F14
           type: List<num>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vNumEmpty
     synthetic static vInt
       reference: <testLibrary>::@setter::vInt
       firstFragment: #F15
@@ -5438,6 +5557,7 @@
           firstFragment: #F16
           type: List<int>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vInt
 ''');
   }
 
@@ -5527,6 +5647,7 @@
           firstFragment: #F8
           type: List<int>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vInt
     synthetic static vNum
       reference: <testLibrary>::@setter::vNum
       firstFragment: #F9
@@ -5535,6 +5656,7 @@
           firstFragment: #F10
           type: List<num>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vNum
     synthetic static vObject
       reference: <testLibrary>::@setter::vObject
       firstFragment: #F11
@@ -5543,6 +5665,7 @@
           firstFragment: #F12
           type: List<Object>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vObject
 ''');
   }
 
@@ -5686,6 +5809,7 @@
           firstFragment: #F12
           type: Map<Object, Object>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vObjectObject
     synthetic static vComparableObject
       reference: <testLibrary>::@setter::vComparableObject
       firstFragment: #F13
@@ -5694,6 +5818,7 @@
           firstFragment: #F14
           type: Map<Comparable<int>, Object>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vComparableObject
     synthetic static vNumString
       reference: <testLibrary>::@setter::vNumString
       firstFragment: #F15
@@ -5702,6 +5827,7 @@
           firstFragment: #F16
           type: Map<num, String>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vNumString
     synthetic static vNumStringEmpty
       reference: <testLibrary>::@setter::vNumStringEmpty
       firstFragment: #F17
@@ -5710,6 +5836,7 @@
           firstFragment: #F18
           type: Map<num, String>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vNumStringEmpty
     synthetic static vIntString
       reference: <testLibrary>::@setter::vIntString
       firstFragment: #F19
@@ -5718,6 +5845,7 @@
           firstFragment: #F20
           type: Map<int, String>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vIntString
 ''');
   }
 
@@ -5807,6 +5935,7 @@
           firstFragment: #F8
           type: Map<int, String>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vIntString
     synthetic static vNumString
       reference: <testLibrary>::@setter::vNumString
       firstFragment: #F9
@@ -5815,6 +5944,7 @@
           firstFragment: #F10
           type: Map<num, String>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vNumString
     synthetic static vIntObject
       reference: <testLibrary>::@setter::vIntObject
       firstFragment: #F11
@@ -5823,6 +5953,7 @@
           firstFragment: #F12
           type: Map<int, Object>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vIntObject
 ''');
   }
 
@@ -5966,6 +6097,7 @@
           firstFragment: #F12
           type: bool
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::a
     synthetic static b
       reference: <testLibrary>::@setter::b
       firstFragment: #F13
@@ -5974,6 +6106,7 @@
           firstFragment: #F14
           type: bool
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::b
     synthetic static vEq
       reference: <testLibrary>::@setter::vEq
       firstFragment: #F15
@@ -5982,6 +6115,7 @@
           firstFragment: #F16
           type: bool
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vEq
     synthetic static vAnd
       reference: <testLibrary>::@setter::vAnd
       firstFragment: #F17
@@ -5990,6 +6124,7 @@
           firstFragment: #F18
           type: bool
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vAnd
     synthetic static vOr
       reference: <testLibrary>::@setter::vOr
       firstFragment: #F19
@@ -5998,6 +6133,7 @@
           firstFragment: #F20
           type: bool
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vOr
 ''');
   }
 
@@ -6139,6 +6275,7 @@
           firstFragment: #F12
           type: A
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::instanceOfA
     synthetic static v1
       reference: <testLibrary>::@setter::v1
       firstFragment: #F13
@@ -6147,6 +6284,7 @@
           firstFragment: #F14
           type: String
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::v1
     synthetic static v2
       reference: <testLibrary>::@setter::v2
       firstFragment: #F15
@@ -6155,6 +6293,7 @@
           firstFragment: #F16
           type: String
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::v2
 ''');
   }
 
@@ -6412,6 +6551,7 @@
           firstFragment: #F24
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vModuloIntInt
     synthetic static vModuloIntDouble
       reference: <testLibrary>::@setter::vModuloIntDouble
       firstFragment: #F25
@@ -6420,6 +6560,7 @@
           firstFragment: #F26
           type: double
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vModuloIntDouble
     synthetic static vMultiplyIntInt
       reference: <testLibrary>::@setter::vMultiplyIntInt
       firstFragment: #F27
@@ -6428,6 +6569,7 @@
           firstFragment: #F28
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vMultiplyIntInt
     synthetic static vMultiplyIntDouble
       reference: <testLibrary>::@setter::vMultiplyIntDouble
       firstFragment: #F29
@@ -6436,6 +6578,7 @@
           firstFragment: #F30
           type: double
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vMultiplyIntDouble
     synthetic static vMultiplyDoubleInt
       reference: <testLibrary>::@setter::vMultiplyDoubleInt
       firstFragment: #F31
@@ -6444,6 +6587,7 @@
           firstFragment: #F32
           type: double
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vMultiplyDoubleInt
     synthetic static vMultiplyDoubleDouble
       reference: <testLibrary>::@setter::vMultiplyDoubleDouble
       firstFragment: #F33
@@ -6452,6 +6596,7 @@
           firstFragment: #F34
           type: double
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vMultiplyDoubleDouble
     synthetic static vDivideIntInt
       reference: <testLibrary>::@setter::vDivideIntInt
       firstFragment: #F35
@@ -6460,6 +6605,7 @@
           firstFragment: #F36
           type: double
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vDivideIntInt
     synthetic static vDivideIntDouble
       reference: <testLibrary>::@setter::vDivideIntDouble
       firstFragment: #F37
@@ -6468,6 +6614,7 @@
           firstFragment: #F38
           type: double
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vDivideIntDouble
     synthetic static vDivideDoubleInt
       reference: <testLibrary>::@setter::vDivideDoubleInt
       firstFragment: #F39
@@ -6476,6 +6623,7 @@
           firstFragment: #F40
           type: double
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vDivideDoubleInt
     synthetic static vDivideDoubleDouble
       reference: <testLibrary>::@setter::vDivideDoubleDouble
       firstFragment: #F41
@@ -6484,6 +6632,7 @@
           firstFragment: #F42
           type: double
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vDivideDoubleDouble
     synthetic static vFloorDivide
       reference: <testLibrary>::@setter::vFloorDivide
       firstFragment: #F43
@@ -6492,6 +6641,7 @@
           firstFragment: #F44
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vFloorDivide
 ''');
   }
 
@@ -6581,6 +6731,7 @@
           firstFragment: #F8
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::a
     synthetic static vEq
       reference: <testLibrary>::@setter::vEq
       firstFragment: #F9
@@ -6589,6 +6740,7 @@
           firstFragment: #F10
           type: bool
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vEq
     synthetic static vNotEq
       reference: <testLibrary>::@setter::vNotEq
       firstFragment: #F11
@@ -6597,6 +6749,7 @@
           firstFragment: #F12
           type: bool
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vNotEq
 ''');
   }
 
@@ -6644,6 +6797,7 @@
           firstFragment: #F4
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::V
 ''');
   }
 
@@ -6796,6 +6950,7 @@
           firstFragment: #F14
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vInt
     synthetic static vDouble
       reference: <testLibrary>::@setter::vDouble
       firstFragment: #F15
@@ -6804,6 +6959,7 @@
           firstFragment: #F16
           type: double
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vDouble
     synthetic static vIncInt
       reference: <testLibrary>::@setter::vIncInt
       firstFragment: #F17
@@ -6812,6 +6968,7 @@
           firstFragment: #F18
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vIncInt
     synthetic static vDecInt
       reference: <testLibrary>::@setter::vDecInt
       firstFragment: #F19
@@ -6820,6 +6977,7 @@
           firstFragment: #F20
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vDecInt
     synthetic static vIncDouble
       reference: <testLibrary>::@setter::vIncDouble
       firstFragment: #F21
@@ -6828,6 +6986,7 @@
           firstFragment: #F22
           type: double
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vIncDouble
     synthetic static vDecDouble
       reference: <testLibrary>::@setter::vDecDouble
       firstFragment: #F23
@@ -6836,6 +6995,7 @@
           firstFragment: #F24
           type: double
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vDecDouble
 ''');
   }
 
@@ -6988,6 +7148,7 @@
           firstFragment: #F14
           type: List<int>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vInt
     synthetic static vDouble
       reference: <testLibrary>::@setter::vDouble
       firstFragment: #F15
@@ -6996,6 +7157,7 @@
           firstFragment: #F16
           type: List<double>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vDouble
     synthetic static vIncInt
       reference: <testLibrary>::@setter::vIncInt
       firstFragment: #F17
@@ -7004,6 +7166,7 @@
           firstFragment: #F18
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vIncInt
     synthetic static vDecInt
       reference: <testLibrary>::@setter::vDecInt
       firstFragment: #F19
@@ -7012,6 +7175,7 @@
           firstFragment: #F20
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vDecInt
     synthetic static vIncDouble
       reference: <testLibrary>::@setter::vIncDouble
       firstFragment: #F21
@@ -7020,6 +7184,7 @@
           firstFragment: #F22
           type: double
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vIncDouble
     synthetic static vDecDouble
       reference: <testLibrary>::@setter::vDecDouble
       firstFragment: #F23
@@ -7028,6 +7193,7 @@
           firstFragment: #F24
           type: double
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vDecDouble
 ''');
   }
 
@@ -7180,6 +7346,7 @@
           firstFragment: #F14
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vInt
     synthetic static vDouble
       reference: <testLibrary>::@setter::vDouble
       firstFragment: #F15
@@ -7188,6 +7355,7 @@
           firstFragment: #F16
           type: double
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vDouble
     synthetic static vIncInt
       reference: <testLibrary>::@setter::vIncInt
       firstFragment: #F17
@@ -7196,6 +7364,7 @@
           firstFragment: #F18
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vIncInt
     synthetic static vDecInt
       reference: <testLibrary>::@setter::vDecInt::@def::0
       firstFragment: #F19
@@ -7204,6 +7373,7 @@
           firstFragment: #F20
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vDecInt::@def::0
     synthetic static vIncDouble
       reference: <testLibrary>::@setter::vIncDouble
       firstFragment: #F21
@@ -7212,6 +7382,7 @@
           firstFragment: #F22
           type: double
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vIncDouble
     synthetic static vDecInt
       reference: <testLibrary>::@setter::vDecInt::@def::1
       firstFragment: #F23
@@ -7220,6 +7391,7 @@
           firstFragment: #F24
           type: double
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vDecInt::@def::1
 ''');
   }
 
@@ -7390,6 +7562,7 @@
           firstFragment: #F14
           type: List<int>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vInt
     synthetic static vDouble
       reference: <testLibrary>::@setter::vDouble
       firstFragment: #F15
@@ -7398,6 +7571,7 @@
           firstFragment: #F16
           type: List<double>
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vDouble
     synthetic static vIncInt
       reference: <testLibrary>::@setter::vIncInt
       firstFragment: #F17
@@ -7406,6 +7580,7 @@
           firstFragment: #F18
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vIncInt
     synthetic static vDecInt
       reference: <testLibrary>::@setter::vDecInt::@def::0
       firstFragment: #F19
@@ -7414,6 +7589,7 @@
           firstFragment: #F20
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vDecInt::@def::0
     synthetic static vIncDouble
       reference: <testLibrary>::@setter::vIncDouble
       firstFragment: #F21
@@ -7422,6 +7598,7 @@
           firstFragment: #F22
           type: double
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vIncDouble
     synthetic static vDecInt
       reference: <testLibrary>::@setter::vDecInt::@def::1
       firstFragment: #F23
@@ -7430,6 +7607,7 @@
           firstFragment: #F24
           type: double
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vDecInt::@def::1
 ''');
   }
 
@@ -7477,6 +7655,7 @@
           firstFragment: #F4
           type: bool
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vNot
 ''');
   }
 
@@ -7566,6 +7745,7 @@
           firstFragment: #F8
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vNegateInt
     synthetic static vNegateDouble
       reference: <testLibrary>::@setter::vNegateDouble
       firstFragment: #F9
@@ -7574,6 +7754,7 @@
           firstFragment: #F10
           type: double
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vNegateDouble
     synthetic static vComplement
       reference: <testLibrary>::@setter::vComplement
       firstFragment: #F11
@@ -7582,6 +7763,7 @@
           firstFragment: #F12
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vComplement
 ''');
   }
 
@@ -7674,6 +7856,7 @@
               firstFragment: #F6
               type: D
           returnType: void
+          variable: <testLibrary>::@class::C::@field::d
     class D
       reference: <testLibrary>::@class::D
       firstFragment: #F7
@@ -7703,6 +7886,7 @@
               firstFragment: #F12
               type: int
           returnType: void
+          variable: <testLibrary>::@class::D::@field::i
   topLevelVariables
     final hasInitializer x
       reference: <testLibrary>::@topLevelVariable::x
@@ -7826,6 +8010,7 @@
               firstFragment: #F10
               type: int
           returnType: void
+          variable: <testLibrary>::@class::D::@field::i
   topLevelVariables
     hasInitializer x
       reference: <testLibrary>::@topLevelVariable::x
@@ -7848,6 +8033,7 @@
           firstFragment: #F14
           type: int
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::x
 ''');
   }
 
@@ -7958,6 +8144,7 @@
           firstFragment: #F10
           type: bool
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vLess
     synthetic static vLessOrEqual
       reference: <testLibrary>::@setter::vLessOrEqual
       firstFragment: #F11
@@ -7966,6 +8153,7 @@
           firstFragment: #F12
           type: bool
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vLessOrEqual
     synthetic static vGreater
       reference: <testLibrary>::@setter::vGreater
       firstFragment: #F13
@@ -7974,6 +8162,7 @@
           firstFragment: #F14
           type: bool
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vGreater
     synthetic static vGreaterOrEqual
       reference: <testLibrary>::@setter::vGreaterOrEqual
       firstFragment: #F15
@@ -7982,6 +8171,7 @@
           firstFragment: #F16
           type: bool
       returnType: void
+      variable: <testLibrary>::@topLevelVariable::vGreaterOrEqual
 ''');
   }
 
@@ -8074,6 +8264,7 @@
               firstFragment: #F6
               type: int
           returnType: void
+          variable: <testLibrary>::@class::A::@field::x
     class B
       reference: <testLibrary>::@class::B
       firstFragment: #F7
@@ -8098,6 +8289,7 @@
               firstFragment: #F11
               type: int
           returnType: void
+          variable: <testLibrary>::@class::B::@field::x
 ''');
   }
 
@@ -8177,6 +8369,7 @@
               firstFragment: #F7
               type: int
           returnType: void
+          variable: <testLibrary>::@class::A::@field::f
 ''');
   }
 
@@ -8317,6 +8510,7 @@
               firstFragment: #F10
               type: int
           returnType: void
+          variable: <testLibrary>::@class::A::@field::x
         synthetic y
           reference: <testLibrary>::@class::A::@setter::y
           firstFragment: #F11
@@ -8325,6 +8519,7 @@
               firstFragment: #F12
               type: int
           returnType: void
+          variable: <testLibrary>::@class::A::@field::y
         synthetic z
           reference: <testLibrary>::@class::A::@setter::z
           firstFragment: #F13
@@ -8333,6 +8528,7 @@
               firstFragment: #F14
               type: int
           returnType: void
+          variable: <testLibrary>::@class::A::@field::z
     class B
       reference: <testLibrary>::@class::B
       firstFragment: #F15
@@ -8379,6 +8575,7 @@
               firstFragment: #F23
               type: int
           returnType: void
+          variable: <testLibrary>::@class::B::@field::x
         z
           reference: <testLibrary>::@class::B::@setter::z
           firstFragment: #F24
@@ -8387,6 +8584,7 @@
               firstFragment: #F25
               type: int
           returnType: void
+          variable: <testLibrary>::@class::B::@field::z
 ''');
   }
 
@@ -8472,6 +8670,7 @@
               firstFragment: #F6
               type: dynamic
           returnType: void
+          variable: <testLibrary>::@class::A::@field::x
     class B
       reference: <testLibrary>::@class::B
       firstFragment: #F7
@@ -8503,6 +8702,7 @@
               firstFragment: #F12
               type: dynamic
           returnType: void
+          variable: <testLibrary>::@class::B::@field::x
 ''');
   }
 
@@ -8589,6 +8789,7 @@
               firstFragment: #F6
               type: int?
           returnType: void
+          variable: <testLibrary>::@class::A::@field::foo
     class B
       reference: <testLibrary>::@class::B
       firstFragment: #F7
@@ -8620,6 +8821,7 @@
               firstFragment: #F12
               type: int?
           returnType: void
+          variable: <testLibrary>::@class::B::@field::foo
 ''');
   }
 
@@ -8776,6 +8978,7 @@
               firstFragment: #F11
               type: E
           returnType: void
+          variable: <testLibrary>::@class::A::@field::x
         synthetic y
           reference: <testLibrary>::@class::A::@setter::y
           firstFragment: #F12
@@ -8785,6 +8988,7 @@
               firstFragment: #F13
               type: E
           returnType: void
+          variable: <testLibrary>::@class::A::@field::y
         synthetic z
           reference: <testLibrary>::@class::A::@setter::z
           firstFragment: #F14
@@ -8794,6 +8998,7 @@
               firstFragment: #F15
               type: E
           returnType: void
+          variable: <testLibrary>::@class::A::@field::z
     class B
       reference: <testLibrary>::@class::B
       firstFragment: #F16
@@ -8849,6 +9054,7 @@
               firstFragment: #F25
               type: T
           returnType: void
+          variable: <testLibrary>::@class::B::@field::x
         z
           reference: <testLibrary>::@class::B::@setter::z
           firstFragment: #F26
@@ -8858,6 +9064,7 @@
               firstFragment: #F27
               type: T
           returnType: void
+          variable: <testLibrary>::@class::B::@field::z
 ''');
   }
 
@@ -8943,6 +9150,7 @@
               firstFragment: #F6
               type: dynamic
           returnType: void
+          variable: <testLibrary>::@class::A::@field::x
     class B
       reference: <testLibrary>::@class::B
       firstFragment: #F7
@@ -8974,6 +9182,7 @@
               firstFragment: #F12
               type: dynamic
           returnType: void
+          variable: <testLibrary>::@class::B::@field::x
 ''');
   }
 
@@ -9059,6 +9268,7 @@
               firstFragment: #F6
               type: num
           returnType: void
+          variable: <testLibrary>::@class::A::@field::x
     class B
       reference: <testLibrary>::@class::B
       firstFragment: #F7
@@ -9090,6 +9300,7 @@
               firstFragment: #F12
               type: num
           returnType: void
+          variable: <testLibrary>::@class::B::@field::x
 ''');
   }
 
@@ -9248,6 +9459,7 @@
               firstFragment: #F17
               type: int
           returnType: void
+          variable: <testLibrary>::@class::B::@field::x
         z
           reference: <testLibrary>::@class::B::@setter::z
           firstFragment: #F18
@@ -9256,6 +9468,7 @@
               firstFragment: #F19
               type: int
           returnType: void
+          variable: <testLibrary>::@class::B::@field::z
 ''');
   }
 
@@ -9438,6 +9651,7 @@
               firstFragment: #F19
               type: T
           returnType: void
+          variable: <testLibrary>::@class::B::@field::x
         z
           reference: <testLibrary>::@class::B::@setter::z
           firstFragment: #F20
@@ -9447,6 +9661,7 @@
               firstFragment: #F21
               type: T
           returnType: void
+          variable: <testLibrary>::@class::B::@field::z
 ''');
   }
 
@@ -9533,6 +9748,7 @@
               firstFragment: #F8
               type: num
           returnType: void
+          variable: <testLibrary>::@class::B::@field::foo
 ''');
   }
 
@@ -10170,6 +10386,7 @@
               firstFragment: #F12
               type: String
           returnType: void
+          variable: <testLibrary>::@class::B::@field::x
         abstract y
           reference: <testLibrary>::@class::B::@setter::y
           firstFragment: #F13
@@ -10178,6 +10395,7 @@
               firstFragment: #F14
               type: String
           returnType: void
+          variable: <testLibrary>::@class::B::@field::y
     class C
       reference: <testLibrary>::@class::C
       firstFragment: #F15
@@ -10220,6 +10438,7 @@
               firstFragment: #F22
               type: dynamic
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 
@@ -10323,6 +10542,7 @@
               firstFragment: #F9
               type: String
           returnType: void
+          variable: <testLibrary>::@class::B::@field::x
     class C
       reference: <testLibrary>::@class::C
       firstFragment: #F10
@@ -10452,6 +10672,7 @@
               firstFragment: #F9
               type: String
           returnType: void
+          variable: <testLibrary>::@class::B::@field::x
     class C
       reference: <testLibrary>::@class::C
       firstFragment: #F10
@@ -10477,6 +10698,7 @@
               firstFragment: #F14
               type: String
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 
@@ -10586,6 +10808,7 @@
               firstFragment: #F9
               type: int
           returnType: void
+          variable: <testLibrary>::@class::B::@field::x
     class C
       reference: <testLibrary>::@class::C
       firstFragment: #F10
@@ -10618,6 +10841,7 @@
               firstFragment: #F15
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 
@@ -10721,6 +10945,7 @@
               firstFragment: #F9
               type: int
           returnType: void
+          variable: <testLibrary>::@class::B::@field::x
     class C
       reference: <testLibrary>::@class::C
       firstFragment: #F10
@@ -10849,6 +11074,7 @@
               firstFragment: #F9
               type: int
           returnType: void
+          variable: <testLibrary>::@class::B::@field::x
     class C
       reference: <testLibrary>::@class::C
       firstFragment: #F10
@@ -10874,6 +11100,7 @@
               firstFragment: #F14
               type: int
           returnType: void
+          variable: <testLibrary>::@class::C::@field::x
 ''');
   }
 
@@ -10988,6 +11215,7 @@
               firstFragment: #F7
               type: int
           returnType: void
+          variable: <testLibrary>::@class::A::@field::x
         abstract y
           reference: <testLibrary>::@class::A::@setter::y
           firstFragment: #F8
@@ -10996,6 +11224,7 @@
               firstFragment: #F9
               type: int
           returnType: void
+          variable: <testLibrary>::@class::A::@field::y
         abstract z
           reference: <testLibrary>::@class::A::@setter::z
           firstFragment: #F10
@@ -11004,6 +11233,7 @@
               firstFragment: #F11
               type: int
           returnType: void
+          variable: <testLibrary>::@class::A::@field::z
     class B
       reference: <testLibrary>::@class::B
       firstFragment: #F12
@@ -11050,6 +11280,7 @@
               firstFragment: #F20
               type: int
           returnType: void
+          variable: <testLibrary>::@class::B::@field::x
         z
           reference: <testLibrary>::@class::B::@setter::z
           firstFragment: #F21
@@ -11058,6 +11289,7 @@
               firstFragment: #F22
               type: int
           returnType: void
+          variable: <testLibrary>::@class::B::@field::z
 ''');
   }
 
@@ -11145,6 +11377,7 @@
               firstFragment: #F5
               type: int
           returnType: void
+          variable: <testLibrary>::@class::A::@field::x
     abstract class B
       reference: <testLibrary>::@class::B
       firstFragment: #F6
@@ -11167,6 +11400,7 @@
               firstFragment: #F10
               type: String
           returnType: void
+          variable: <testLibrary>::@class::B::@field::x
     class C
       reference: <testLibrary>::@class::C
       firstFragment: #F11
@@ -11276,6 +11510,7 @@
               firstFragment: #F5
               type: int
           returnType: void
+          variable: <testLibrary>::@class::A::@field::x
     abstract class B
       reference: <testLibrary>::@class::B
       firstFragment: #F6
@@ -11298,6 +11533,7 @@
               firstFragment: #F10
               type: int
           returnType: void
+          variable: <testLibrary>::@class::B::@field::x
     class C
       reference: <testLibrary>::@class::C
       firstFragment: #F11
@@ -11561,6 +11797,7 @@
               firstFragment: #F6
               type: num
           returnType: void
+          variable: <testLibrary>::@class::A::@field::x
     class B
       reference: <testLibrary>::@class::B
       firstFragment: #F7
@@ -11592,6 +11829,7 @@
               firstFragment: #F12
               type: int
           returnType: void
+          variable: <testLibrary>::@class::B::@field::x
 ''');
   }
 
@@ -11675,6 +11913,7 @@
               firstFragment: #F6
               type: num
           returnType: void
+          variable: <testLibrary>::@class::A::@field::x
     class B
       reference: <testLibrary>::@class::B
       firstFragment: #F7
@@ -11699,6 +11938,7 @@
               firstFragment: #F11
               type: int
           returnType: void
+          variable: <testLibrary>::@class::B::@field::x
 ''');
   }
 
@@ -11805,6 +12045,7 @@
               firstFragment: #F10
               type: int
           returnType: void
+          variable: <testLibrary>::@class::A::@field::t1
         synthetic t2
           reference: <testLibrary>::@class::A::@setter::t2
           firstFragment: #F11
@@ -11813,6 +12054,7 @@
               firstFragment: #F12
               type: double
           returnType: void
+          variable: <testLibrary>::@class::A::@field::t2
         synthetic t3
           reference: <testLibrary>::@class::A::@setter::t3
           firstFragment: #F13
@@ -11821,6 +12063,7 @@
               firstFragment: #F14
               type: dynamic
           returnType: void
+          variable: <testLibrary>::@class::A::@field::t3
 ''');
   }
 
@@ -12879,6 +13122,7 @@
               firstFragment: #F6
               type: int
           returnType: void
+          variable: <testLibrary>::@class::A::@field::m
     class B
       reference: <testLibrary>::@class::B
       firstFragment: #F7