Skip to content

Commit 0f60dc8

Browse files
scheglovCommit Queue
authored andcommitted
Elements. Inline _readFragmentMetadata().
The private helper method `_readFragmentMetadata` has been inlined at all of its call sites within `BundleReader`. This method only contained a single line of code, making it an unnecessary abstraction. Change-Id: Ib429e1cf98c355dda96b91dc36c65754b4c5b8dd Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/445126 Commit-Queue: Konstantin Shcheglov <[email protected]> Reviewed-by: Johnni Winther <[email protected]>
1 parent efd2af0 commit 0f60dc8

File tree

1 file changed

+13
-21
lines changed

1 file changed

+13
-21
lines changed

pkg/analyzer/lib/src/summary2/bundle_reader.dart

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ class LibraryReader {
327327
reader,
328328
fragment.typeParameters,
329329
);
330-
_readFragmentMetadata(fragment, reader);
330+
fragment.metadata = reader._readMetadata();
331331
fragment.supertype = reader._readOptionalInterfaceType();
332332
fragment.mixins = reader._readInterfaceTypeList();
333333
fragment.interfaces = reader._readInterfaceTypeList();
@@ -393,7 +393,7 @@ class LibraryReader {
393393
reader,
394394
fragment.formalParameters,
395395
);
396-
_readFragmentMetadata(fragment, reader);
396+
fragment.metadata = reader._readMetadata();
397397
fragment.constantInitializers = reader.readNodeList();
398398
},
399399
);
@@ -522,7 +522,7 @@ class LibraryReader {
522522
reader,
523523
fragment.typeParameters,
524524
);
525-
_readFragmentMetadata(fragment, reader);
525+
fragment.metadata = reader._readMetadata();
526526
fragment.supertype = reader._readOptionalInterfaceType();
527527
fragment.mixins = reader._readInterfaceTypeList();
528528
fragment.interfaces = reader._readInterfaceTypeList();
@@ -605,7 +605,7 @@ class LibraryReader {
605605
reader,
606606
fragment.typeParameters,
607607
);
608-
_readFragmentMetadata(fragment, reader);
608+
fragment.metadata = reader._readMetadata();
609609
},
610610
);
611611
});
@@ -664,7 +664,7 @@ class LibraryReader {
664664
reader,
665665
fragment.typeParameters,
666666
);
667-
_readFragmentMetadata(fragment, reader);
667+
fragment.metadata = reader._readMetadata();
668668
fragment.interfaces = reader._readInterfaceTypeList();
669669
fragment.typeErasure = reader.readRequiredType();
670670
},
@@ -713,7 +713,7 @@ class LibraryReader {
713713
fragment.element.enclosingElement as InstanceElementImpl;
714714
reader._addTypeParameters2(enclosingElement.typeParameters);
715715

716-
_readFragmentMetadata(fragment, reader);
716+
fragment.metadata = reader._readMetadata();
717717
if (reader.readOptionalExpression() case var initializer?) {
718718
fragment.constantInitializer = initializer;
719719
ConstantContextForExpressionImpl(fragment, initializer);
@@ -754,14 +754,6 @@ class LibraryReader {
754754
return _reader.readUInt30();
755755
}
756756

757-
void _readFragmentMetadata<T extends FragmentImpl>(
758-
T fragment,
759-
ResolutionReader reader,
760-
) {
761-
// TODO(scheglov): inline it
762-
fragment.metadata = reader._readMetadata();
763-
}
764-
765757
String? _readFragmentName() {
766758
return _reader.readOptionalStringReference();
767759
}
@@ -820,7 +812,7 @@ class LibraryReader {
820812
reader,
821813
fragment.formalParameters,
822814
);
823-
_readFragmentMetadata(fragment, reader);
815+
fragment.metadata = reader._readMetadata();
824816
},
825817
);
826818
});
@@ -951,7 +943,7 @@ class LibraryReader {
951943
reader,
952944
fragment.formalParameters,
953945
);
954-
_readFragmentMetadata(fragment, reader);
946+
fragment.metadata = reader._readMetadata();
955947
},
956948
);
957949
});
@@ -1010,7 +1002,7 @@ class LibraryReader {
10101002
reader,
10111003
fragment.typeParameters,
10121004
);
1013-
_readFragmentMetadata(fragment, reader);
1005+
fragment.metadata = reader._readMetadata();
10141006
// _readTypeParameters(reader, fragment.typeParameters);
10151007
fragment.superclassConstraints = reader._readInterfaceTypeList();
10161008
fragment.interfaces = reader._readInterfaceTypeList();
@@ -1138,7 +1130,7 @@ class LibraryReader {
11381130
reader,
11391131
fragment.formalParameters,
11401132
);
1141-
_readFragmentMetadata(fragment, reader);
1133+
fragment.metadata = reader._readMetadata();
11421134
},
11431135
);
11441136
});
@@ -1216,7 +1208,7 @@ class LibraryReader {
12161208
reader,
12171209
fragment.formalParameters,
12181210
);
1219-
_readFragmentMetadata(fragment, reader);
1211+
fragment.metadata = reader._readMetadata();
12201212
},
12211213
);
12221214
});
@@ -1261,7 +1253,7 @@ class LibraryReader {
12611253
},
12621254
readResolution: (fragment, reader) {
12631255
reader.currentLibraryFragment = fragment.libraryFragment;
1264-
_readFragmentMetadata(fragment, reader);
1256+
fragment.metadata = reader._readMetadata();
12651257
if (reader.readOptionalExpression() case var initializer?) {
12661258
fragment.constantInitializer = initializer;
12671259
ConstantContextForExpressionImpl(fragment, initializer);
@@ -1310,7 +1302,7 @@ class LibraryReader {
13101302
reader,
13111303
fragment.typeParameters,
13121304
);
1313-
_readFragmentMetadata(fragment, reader);
1305+
fragment.metadata = reader._readMetadata();
13141306
fragment.aliasedElement = reader._readAliasedElement(unitElement);
13151307
},
13161308
);

0 commit comments

Comments
 (0)