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>
This commit is contained in:
parent
25b4d875ed
commit
0ba74dbcc6
1
deps/v8/BUILD.gn
vendored
1
deps/v8/BUILD.gn
vendored
@ -1717,6 +1717,7 @@ v8_source_set("v8_base") {
|
||||
"src/objects/dictionary.h",
|
||||
"src/objects/frame-array-inl.h",
|
||||
"src/objects/frame-array.h",
|
||||
"src/objects/hash-table-inl.h",
|
||||
"src/objects/hash-table.h",
|
||||
"src/objects/literal-objects.cc",
|
||||
"src/objects/literal-objects.h",
|
||||
|
2
deps/v8/src/objects-body-descriptors.h
vendored
2
deps/v8/src/objects-body-descriptors.h
vendored
@ -99,7 +99,7 @@ class FixedBodyDescriptor final : public BodyDescriptorBase {
|
||||
|
||||
template <typename StaticVisitor>
|
||||
static inline void IterateBody(HeapObject* obj, int object_size) {
|
||||
IterateBody(obj);
|
||||
IterateBody<StaticVisitor>(obj);
|
||||
}
|
||||
};
|
||||
|
||||
|
1
deps/v8/src/objects-inl.h
vendored
1
deps/v8/src/objects-inl.h
vendored
@ -31,6 +31,7 @@
|
||||
#include "src/lookup-cache-inl.h"
|
||||
#include "src/lookup.h"
|
||||
#include "src/objects.h"
|
||||
#include "src/objects/hash-table-inl.h"
|
||||
#include "src/objects/literal-objects.h"
|
||||
#include "src/objects/module-info.h"
|
||||
#include "src/objects/regexp-match-info.h"
|
||||
|
34
deps/v8/src/objects/hash-table-inl.h
vendored
Normal file
34
deps/v8/src/objects/hash-table-inl.h
vendored
Normal file
@ -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_
|
20
deps/v8/src/objects/hash-table.h
vendored
20
deps/v8/src/objects/hash-table.h
vendored
@ -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(
|
||||
|
1
deps/v8/src/v8.gyp
vendored
1
deps/v8/src/v8.gyp
vendored
@ -1118,6 +1118,7 @@
|
||||
'objects/dictionary.h',
|
||||
'objects/frame-array.h',
|
||||
'objects/frame-array-inl.h',
|
||||
'objects/hash-table-inl.h',
|
||||
'objects/hash-table.h',
|
||||
'objects/literal-objects.cc',
|
||||
'objects/literal-objects.h',
|
||||
|
Loading…
x
Reference in New Issue
Block a user