-
Notifications
You must be signed in to change notification settings - Fork 29.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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} Refs: #13517 Fixes: #10388 Refs: #12392 PR-URL: #14004 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
- Loading branch information
1 parent
ed30842
commit 5651a6f
Showing
6 changed files
with
42 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
// Copyright 2017 the V8 project authors. All rights reserved. | ||
// Use of this source code is governed by a BSD-style license that can be | ||
// found in the LICENSE file. | ||
|
||
#ifndef V8_OBJECTS_HASH_TABLE_INL_H_ | ||
#define V8_OBJECTS_HASH_TABLE_INL_H_ | ||
|
||
#include "src/objects/hash-table.h" | ||
|
||
namespace v8 { | ||
namespace internal { | ||
|
||
template <typename Derived, typename Shape, typename Key> | ||
uint32_t HashTable<Derived, Shape, Key>::Hash(Key key) { | ||
if (Shape::UsesSeed) { | ||
return Shape::SeededHash(key, GetHeap()->HashSeed()); | ||
} else { | ||
return Shape::Hash(key); | ||
} | ||
} | ||
|
||
template <typename Derived, typename Shape, typename Key> | ||
uint32_t HashTable<Derived, Shape, Key>::HashForObject(Key key, Object* object) { | ||
if (Shape::UsesSeed) { | ||
return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object); | ||
} else { | ||
return Shape::HashForObject(key, object); | ||
} | ||
} | ||
|
||
} // namespace internal | ||
} // namespace v8 | ||
|
||
#endif // V8_OBJECTS_HASH_TABLE_INL_H_ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters