diff options
| author | Michaël Zasso <targos@protonmail.com> | 2017-06-20 17:06:59 +0200 |
|---|---|---|
| committer | Michaël Zasso <targos@protonmail.com> | 2017-06-23 10:13:36 +0200 |
| commit | 0ba74dbcc6cdbfe7fcb6b3bb1b93dbcfd8dd5451 (patch) | |
| tree | 88408c8e0f55e31be2070ead529f388c889100b6 /deps/v8/src/objects/hash-table.h | |
| parent | 25b4d875ed28939a400f1fa33007bf6e77ef977b (diff) | |
| download | android-node-v8-0ba74dbcc6cdbfe7fcb6b3bb1b93dbcfd8dd5451.tar.gz android-node-v8-0ba74dbcc6cdbfe7fcb6b3bb1b93dbcfd8dd5451.tar.bz2 android-node-v8-0ba74dbcc6cdbfe7fcb6b3bb1b93dbcfd8dd5451.zip | |
deps: backport c0f1ff2 from upstream V8
Original commit message:
Fix GCC 7 build errors
BUG=chromium:691681
R=franzih@chromium.org
Change-Id: Id7e5698487f16dc217a804f6d3f24da7213c72b9
Reviewed-on: https://chromium-review.googlesource.com/530227
Commit-Queue: Toon Verwaest <verwaest@chromium.org>
Reviewed-by: Toon Verwaest <verwaest@chromium.org>
Cr-Commit-Position: refs/heads/master@{#46045}
PR-URL: https://github.com/nodejs/node/pull/13517
Fixes: https://github.com/nodejs/node/issues/10388
Refs: https://github.com/nodejs/node/pull/12392
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'deps/v8/src/objects/hash-table.h')
| -rw-r--r-- | deps/v8/src/objects/hash-table.h | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/deps/v8/src/objects/hash-table.h b/deps/v8/src/objects/hash-table.h index 221598b711..b274d94cd4 100644 --- a/deps/v8/src/objects/hash-table.h +++ b/deps/v8/src/objects/hash-table.h @@ -135,22 +135,10 @@ class HashTable : public HashTableBase { public: typedef Shape ShapeT; - // Wrapper methods - inline uint32_t Hash(Key key) { - if (Shape::UsesSeed) { - return Shape::SeededHash(key, GetHeap()->HashSeed()); - } else { - return Shape::Hash(key); - } - } - - inline uint32_t HashForObject(Key key, Object* object) { - if (Shape::UsesSeed) { - return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object); - } else { - return Shape::HashForObject(key, object); - } - } + // Wrapper methods. Defined in src/objects/hash-table-inl.h + // to break a cycle with src/heap/heap.h + inline uint32_t Hash(Key key); + inline uint32_t HashForObject(Key key, Object* object); // Returns a new HashTable object. MUST_USE_RESULT static Handle<Derived> New( |