GeezerVison is showing github.com — deps: cherry-pick a4bddba from upstream V8 · nodejs/node@c97237b
File tree
Expand file treeCollapse file tree
Open diff view settings
Expand file treeCollapse file tree
Open diff view settings
Collapse file
Copy file name to clipboardExpand all lines: deps/v8/include/v8-version.h +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
|
11 | 11 | #define V8_MAJOR_VERSION 6 |
12 | 12 | #define V8_MINOR_VERSION 2 |
13 | 13 | #define V8_BUILD_NUMBER 414 |
14 | | -#define V8_PATCH_LEVEL 50 |
| 14 | +#define V8_PATCH_LEVEL 51 |
15 | 15 |
|
16 | 16 | // Use 1 for candidates and 0 otherwise. |
17 | 17 | // (Boolean macro values are not supported by all preprocessors.) |
|
Collapse file
Copy file name to clipboardExpand all lines: deps/v8/src/objects.cc +2-7Lines changed: 2 additions & 7 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -6368,13 +6368,8 @@ Smi* JSObject::GetOrCreateIdentityHash(Isolate* isolate) { |
6368 | 6368 | return Smi::cast(hash_obj); |
6369 | 6369 | } |
6370 | 6370 |
|
6371 | | - int masked_hash; |
6372 | | - // TODO(gsathya): Remove the loop and pass kHashMask directly to |
6373 | | - // GenerateIdentityHash. |
6374 | | - do { |
6375 | | - int hash = isolate->GenerateIdentityHash(Smi::kMaxValue); |
6376 | | - masked_hash = hash & JSReceiver::kHashMask; |
6377 | | - } while (masked_hash == PropertyArray::kNoHashSentinel); |
| 6371 | + int masked_hash = isolate->GenerateIdentityHash(JSReceiver::kHashMask); |
| 6372 | + DCHECK_NE(PropertyArray::kNoHashSentinel, masked_hash); |
6378 | 6373 |
|
6379 | 6374 | SetIdentityHash(masked_hash); |
6380 | 6375 | return Smi::FromInt(masked_hash); |
|
Collapse file
Copy file name to clipboardExpand all lines: deps/v8/src/objects.h +5Lines changed: 5 additions & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -1954,8 +1954,13 @@ class PropertyArray : public HeapObject { |
1954 | 1954 | typedef BodyDescriptor BodyDescriptorWeak; |
1955 | 1955 |
|
1956 | 1956 | static const int kLengthMask = 0x3ff; |
| 1957 | +#if V8_TARGET_ARCH_64_BIT |
1957 | 1958 | static const int kHashMask = 0x7ffffc00; |
1958 | 1959 | STATIC_ASSERT(kLengthMask + kHashMask == 0x7fffffff); |
| 1960 | +#else |
| 1961 | + static const int kHashMask = 0x3ffffc00; |
| 1962 | + STATIC_ASSERT(kLengthMask + kHashMask == 0x3fffffff); |
| 1963 | +#endif |
1959 | 1964 |
|
1960 | 1965 | static const int kMaxLength = kLengthMask; |
1961 | 1966 | STATIC_ASSERT(kMaxLength > kMaxNumberOfDescriptors); |
|