Skip to content

[std] Slightly improve Map/Set by caching some props #1578

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 13, 2020
Merged

[std] Slightly improve Map/Set by caching some props #1578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
594fcd2
slightly imptove Map/Set by caching some props
MaxGraey Dec 13, 2020
2288fce
renaming
MaxGraey Dec 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions std/assembly/map.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,9 @@ export class Map<K,V> {
changetype<usize>(this.buckets) + <usize>(hashCode & this.bucketsMask) * BUCKET_SIZE
);
while (entry) {
if (!(entry.taggedNext & EMPTY) && entry.key == key) return entry;
entry = changetype<MapEntry<K,V>>(entry.taggedNext & ~EMPTY);
let taggedNext = entry.taggedNext;
if (!(taggedNext & EMPTY) && entry.key == key) return entry;
entry = changetype<MapEntry<K,V>>(taggedNext & ~EMPTY);
}
return null;
}
Expand Down Expand Up @@ -177,9 +178,10 @@ export class Map<K,V> {
let oldEntry = changetype<MapEntry<K,V>>(oldPtr);
if (!(oldEntry.taggedNext & EMPTY)) {
let newEntry = changetype<MapEntry<K,V>>(newPtr);
newEntry.key = oldEntry.key;
let oldEntryKey = oldEntry.key;
newEntry.key = oldEntryKey;
newEntry.value = oldEntry.value;
let newBucketIndex = HASH<K>(oldEntry.key) & newBucketsMask;
let newBucketIndex = HASH<K>(oldEntryKey) & newBucketsMask;
let newBucketPtrBase = changetype<usize>(newBuckets) + <usize>newBucketIndex * BUCKET_SIZE;
newEntry.taggedNext = load<usize>(newBucketPtrBase);
store<usize>(newBucketPtrBase, newPtr);
Expand Down
10 changes: 6 additions & 4 deletions std/assembly/set.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,9 @@ export class Set<T> {
changetype<usize>(this.buckets) + <usize>(hashCode & this.bucketsMask) * BUCKET_SIZE
);
while (entry) {
if (!(entry.taggedNext & EMPTY) && entry.key == key) return entry;
entry = changetype<SetEntry<T>>(entry.taggedNext & ~EMPTY);
let taggedNext = entry.taggedNext;
if (!(taggedNext & EMPTY) && entry.key == key) return entry;
entry = changetype<SetEntry<T>>(taggedNext & ~EMPTY);
}
return null;
}
Expand Down Expand Up @@ -157,8 +158,9 @@ export class Set<T> {
let oldEntry = changetype<SetEntry<T>>(oldPtr); // unmanaged!
if (!(oldEntry.taggedNext & EMPTY)) {
let newEntry = changetype<SetEntry<T>>(newPtr); // unmanaged!
newEntry.key = oldEntry.key;
let newBucketIndex = HASH<T>(oldEntry.key) & newBucketsMask;
let oldEntryKey = oldEntry.key;
newEntry.key = oldEntryKey;
let newBucketIndex = HASH<T>(oldEntryKey) & newBucketsMask;
let newBucketPtrBase = changetype<usize>(newBuckets) + <usize>newBucketIndex * BUCKET_SIZE;
newEntry.taggedNext = load<usize>(newBucketPtrBase);
store<usize>(newBucketPtrBase, newPtr);
Expand Down
Loading