Skip to content

Commit 7c62bb2

Browse files
fshcheglovCommit Queue
authored andcommitted
Remove element_flags library.
All modifiers are directly written using write/read modifiers, so encoding and decoding using flags is no longer necessary. Change-Id: I8a58f14e0b7639293984745044dbedf6a6be2c1d Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/443361 Reviewed-by: Konstantin Shcheglov <[email protected]> Reviewed-by: Paul Berry <[email protected]> Commit-Queue: Paul Berry <[email protected]>
1 parent 50c1087 commit 7c62bb2

File tree

5 files changed

+14
-481
lines changed

5 files changed

+14
-481
lines changed

pkg/analyzer/lib/src/dart/analysis/driver.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ testFineAfterLibraryAnalyzerHook;
109109
// TODO(scheglov): Clean up the list of implicitly analyzed files.
110110
class AnalysisDriver {
111111
/// The version of data format, should be incremented on every format change.
112-
static const int DATA_VERSION = 509;
112+
static const int DATA_VERSION = 510;
113113

114114
/// The number of exception contexts allowed to write. Once this field is
115115
/// zero, we stop writing any new exception contexts in this process.

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5695,9 +5695,6 @@ class LibraryElementImpl extends ElementImpl
56955695
// TODO(scheglov): replace with `LibraryName` or something.
56965696
int nameLength;
56975697

5698-
@override
5699-
bool isSynthetic = false;
5700-
57015698
@override
57025699
List<ClassElementImpl> classes = [];
57035700

@@ -5897,6 +5894,15 @@ class LibraryElementImpl extends ElementImpl
58975894
return DartUriResolver.isDartUri(uri);
58985895
}
58995896

5897+
@override
5898+
bool get isSynthetic {
5899+
return hasModifier(Modifier.SYNTHETIC);
5900+
}
5901+
5902+
set isSynthetic(bool isSynthetic) {
5903+
setModifier(Modifier.SYNTHETIC, isSynthetic);
5904+
}
5905+
59005906
@override
59015907
ElementKind get kind => ElementKind.LIBRARY;
59025908

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import 'package:analyzer/src/generated/utilities_dart.dart';
2626
import 'package:analyzer/src/summary2/ast_binary_reader.dart';
2727
import 'package:analyzer/src/summary2/ast_binary_tag.dart';
2828
import 'package:analyzer/src/summary2/data_reader.dart';
29-
import 'package:analyzer/src/summary2/element_flags.dart';
3029
import 'package:analyzer/src/summary2/export.dart';
3130
import 'package:analyzer/src/summary2/informative_data.dart';
3231
import 'package:analyzer/src/summary2/linked_element_factory.dart';
@@ -146,7 +145,7 @@ class LibraryReader {
146145
_libraryElement.reference = _reference;
147146

148147
// Read the rest of non-resolution data for the library.
149-
LibraryElementFlags.read(_reader, _libraryElement);
148+
_libraryElement.readModifiers(_reader);
150149
_libraryElement.languageVersion = _readLanguageVersion();
151150

152151
_libraryElement.exportedReferences = _reader.readTypedList(
@@ -1084,7 +1083,7 @@ class LibraryReader {
10841083
);
10851084
}
10861085
idFragmentMap[id] = element;
1087-
ParameterElementFlags.read(_reader, element);
1086+
element.readModifiers(_reader);
10881087
element.typeParameters = _readTypeParameters();
10891088
element.formalParameters = _readParameters();
10901089
return element;

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import 'package:analyzer/src/error/inference_error.dart';
2020
import 'package:analyzer/src/summary2/ast_binary_tag.dart';
2121
import 'package:analyzer/src/summary2/ast_binary_writer.dart';
2222
import 'package:analyzer/src/summary2/data_writer.dart';
23-
import 'package:analyzer/src/summary2/element_flags.dart';
2423
import 'package:analyzer/src/summary2/export.dart';
2524
import 'package:analyzer/src/summary2/reference.dart';
2625

@@ -101,7 +100,7 @@ class BundleWriter {
101100
// Write non-resolution data for the library.
102101
_sink._writeStringReference(libraryElement.name);
103102
_writeFeatureSet(libraryElement.featureSet);
104-
LibraryElementFlags.write(_sink, libraryElement);
103+
libraryElement.writeModifiers(_sink);
105104
_writeLanguageVersion(libraryElement.languageVersion);
106105
_writeExportedReferences(libraryElement.exportedReferences);
107106
_sink.writeUint30List(libraryElement.nameUnion.mask);
@@ -628,7 +627,7 @@ class BundleWriter {
628627
_sink.writeBool(element.isInitializingFormal);
629628
_sink.writeBool(element.isSuperFormal);
630629
_sink._writeFormalParameterKind(element);
631-
ParameterElementFlags.write(_sink, element);
630+
element.writeModifiers(_sink);
632631

633632
_resolutionSink._writeMetadata(element.metadata);
634633

0 commit comments

Comments
 (0)