Commit c97237b
deps: cherry-pick a4bddba from upstream V8
Original commit message:
[Runtime] Use platform specific value for JSReceiver::HashMask
This allows us to remove the loop while calculating the hash value and
just use the HashMask as the mask for ComputeIntegerHash. This
previously overflowed on 32-bit systems failing the Smi::IsValid
check.
Bug: v8:6404
Change-Id: I84610a7592fa9d7ce4fa5cef7903bd50b8e8a4df
Reviewed-on: https://chromium-review.googlesource.com/702675
Reviewed-by: Adam Klein <adamk@chromium.org>
Commit-Queue: Sathya Gunasekaran <gsathya@chromium.org>
Cr-Commit-Position: refs/heads/master@{#48319}
PR-URL: #19824
Refs: v8/v8@a4bddba
Fixes: #19769
Reviewed-By: Yang Guo <yangguo@chromium.org>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>1 parent 53b702f commit c97237b
3 files changed
Lines changed: 8 additions & 8 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -11,7 +11,7 @@ | |||
| 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.) | |
| 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); | |
| 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); | |
0 commit comments