Skip to content

deps: cherry-pick b93c80a from v8 upstream #7883

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

Closed
matthewloring wants to merge 4 commits into from
Closed

deps: cherry-pick b93c80a from v8 upstream #7883

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e91f38b
deps: backport e093a04, 09db540 from upstream V8
ofrobots Apr 15, 2016
9277ad6
fixup needed for backport
ofrobots Apr 15, 2016
4945f61
deps: cherry-pick b93c80a from v8 upstream
Jul 12, 2016
132fc1e
deps: backport a76d133 from v8 upstream
Jul 20, 2016
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
Prev Previous commit
Next Next commit
deps: cherry-pick b93c80a from v8 upstream 
Original commit message:

If we can't rehash the backing store for weak sets & maps, do a last
resort GC

BUG=v8:4909
R=hpayer@chromium.org

Committed: https://crrev.com/b93c80a6039c757723e70420ae73375b5d277814
Cr-Commit-Position: refs/heads/master@{#37591}

Fixes: #6180
PR-URL: #7689
Reviewed-By: Matt Loring <mattloring@google.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
  • Loading branch information
Matt Loring committed Oct 5, 2016
commit 4945f615fe2b93cd6f8ed44fd361f2517fd318f8
13 changes: 13 additions & 0 deletions deps/v8/src/objects.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15213,6 +15213,19 @@ Handle<ObjectHashTable> ObjectHashTable::Put(Handle<ObjectHashTable> table,
if ((table->NumberOfDeletedElements() << 1) > table->NumberOfElements()) {
table->Rehash(isolate->factory()->undefined_value());
}
// If we're out of luck, we didn't get a GC recently, and so rehashing
// isn't enough to avoid a crash.
int nof = table->NumberOfElements() + 1;
if (!table->HasSufficientCapacity(nof)) {
int capacity = ObjectHashTable::ComputeCapacity(nof * 2);
if (capacity > ObjectHashTable::kMaxCapacity) {
for (size_t i = 0; i < 2; ++i) {
isolate->heap()->CollectAllGarbage(
Heap::kFinalizeIncrementalMarkingMask, "full object hash table");
}
table->Rehash(isolate->factory()->undefined_value());
}
}

// Check whether the hash table should be extended.
table = EnsureCapacity(table, 1, key);
Expand Down