Skip to content

Commit 0c17d7f

Browse files
natebiggsCommit Queue
authored andcommitted
[dart2wasm] Cleanup member and reference serialization.
The return value is unused and previous changes ensure members always exist. Change-Id: I476c11261048b5fe48d0603b899e1dde9235a705 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/419500 Reviewed-by: Martin Kustermann <[email protected]> Commit-Queue: Nate Biggs <[email protected]>
1 parent edf09b5 commit 0c17d7f

File tree

1 file changed

+9
-15
lines changed

1 file changed

+9
-15
lines changed

pkg/dart2wasm/lib/serialization.dart

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,12 @@ class _EntityToIdMapper {
2424
return _ids[cls]!;
2525
}
2626

27-
int? idForMember(Member member) {
28-
return _ids[member];
27+
int idForMember(Member member) {
28+
return _ids[member]!;
2929
}
3030

31-
(int, int)? idForReference(Reference reference) {
32-
final memberId = idForMember(reference.asMember);
33-
if (memberId == null) return null;
34-
return (memberId, _flagForReference(reference));
31+
(int, int) idForReference(Reference reference) {
32+
return (idForMember(reference.asMember), _flagForReference(reference));
3533
}
3634

3735
static int _flagForReference(Reference reference) {
@@ -147,19 +145,15 @@ class DataSerializer {
147145
writeInt(_mapper.idForClass(cls));
148146
}
149147

150-
bool writeMember(Member member) {
148+
void writeMember(Member member) {
151149
final memberId = _mapper.idForMember(member);
152-
if (memberId == null) return false;
153150
writeInt(memberId);
154-
return true;
155151
}
156152

157-
bool writeReference(Reference reference) {
158-
final referenceId = _mapper.idForReference(reference);
159-
if (referenceId == null) return false;
160-
writeInt(referenceId.$1);
161-
writeInt(referenceId.$2);
162-
return true;
153+
void writeReference(Reference reference) {
154+
final (memberId, referenceFlag) = _mapper.idForReference(reference);
155+
writeInt(memberId);
156+
writeInt(referenceFlag);
163157
}
164158

165159
void writeMap<K, V>(Map<K, V> map, void Function(K key) writeKey,

0 commit comments

Comments
 (0)