Commit 948c1718 authored by Sathya Gunasekaran's avatar Sathya Gunasekaran Committed by Commit Bot

Revert "[csa] disable selected bounds checks for remaining regressions"

This reverts commit c3148664.

Reason for revert: speculative revert for MSAN failure https://ci.chromium.org/p/v8/builders/luci.v8.ci/V8%20Linux%20-%20arm64%20-%20sim%20-%20MSAN/25398

Original change's description:
> [csa] disable selected bounds checks for remaining regressions
> 
> Bug: chromium:932919
> TBR: jarin@chromium.org
> Change-Id: Id1125dcd2978f790af4cf00125bcbb94741d0bf8
> Reviewed-on: https://chromium-review.googlesource.com/c/1480387
> Commit-Queue: Tobias Tebbi <tebbi@chromium.org>
> Reviewed-by: Jaroslav Sevcik <jarin@chromium.org>
> Reviewed-by: Jakob Gruber <jgruber@chromium.org>
> Reviewed-by: Leszek Swirski <leszeks@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#59773}

TBR=jarin@chromium.org,jgruber@chromium.org,leszeks@chromium.org,tebbi@chromium.org

Change-Id: Ib6cb825375725773db73f40ad3b65e084645b568
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: chromium:932919
Reviewed-on: https://chromium-review.googlesource.com/c/1480914Reviewed-by: 's avatarSathya Gunasekaran <gsathya@chromium.org>
Commit-Queue: Sathya Gunasekaran <gsathya@chromium.org>
Cr-Commit-Position: refs/heads/master@{#59777}
parent d439296e
...@@ -539,7 +539,7 @@ TNode<BoolT> BaseCollectionsAssembler::HasInitialCollectionPrototype( ...@@ -539,7 +539,7 @@ TNode<BoolT> BaseCollectionsAssembler::HasInitialCollectionPrototype(
TNode<Object> BaseCollectionsAssembler::LoadAndNormalizeFixedArrayElement( TNode<Object> BaseCollectionsAssembler::LoadAndNormalizeFixedArrayElement(
TNode<FixedArray> elements, TNode<IntPtrT> index) { TNode<FixedArray> elements, TNode<IntPtrT> index) {
TNode<Object> element = UnsafeLoadFixedArrayElement(elements, index); TNode<Object> element = LoadFixedArrayElement(elements, index);
return Select<Object>(IsTheHole(element), [=] { return UndefinedConstant(); }, return Select<Object>(IsTheHole(element), [=] { return UndefinedConstant(); },
[=] { return element; }); [=] { return element; });
} }
...@@ -1003,7 +1003,7 @@ TNode<JSArray> CollectionsBuiltinsAssembler::MapIteratorToList( ...@@ -1003,7 +1003,7 @@ TNode<JSArray> CollectionsBuiltinsAssembler::MapIteratorToList(
CSA_ASSERT(this, InstanceTypeEqual(LoadInstanceType(iterator), CSA_ASSERT(this, InstanceTypeEqual(LoadInstanceType(iterator),
JS_MAP_VALUE_ITERATOR_TYPE)); JS_MAP_VALUE_ITERATOR_TYPE));
TNode<Object> entry_value = TNode<Object> entry_value =
UnsafeLoadFixedArrayElement(table, entry_start_position, LoadFixedArrayElement(table, entry_start_position,
(OrderedHashMap::HashTableStartIndex() + (OrderedHashMap::HashTableStartIndex() +
OrderedHashMap::kValueOffset) * OrderedHashMap::kValueOffset) *
kTaggedSize); kTaggedSize);
...@@ -1410,8 +1410,8 @@ CollectionsBuiltinsAssembler::NextSkipHoles(TNode<TableType> table, ...@@ -1410,8 +1410,8 @@ CollectionsBuiltinsAssembler::NextSkipHoles(TNode<TableType> table,
entry_start_position = IntPtrAdd( entry_start_position = IntPtrAdd(
IntPtrMul(var_index.value(), IntPtrConstant(TableType::kEntrySize)), IntPtrMul(var_index.value(), IntPtrConstant(TableType::kEntrySize)),
number_of_buckets); number_of_buckets);
entry_key = UnsafeLoadFixedArrayElement( entry_key =
table, entry_start_position, LoadFixedArrayElement(table, entry_start_position,
TableType::HashTableStartIndex() * kTaggedSize); TableType::HashTableStartIndex() * kTaggedSize);
Increment(&var_index); Increment(&var_index);
Branch(IsTheHole(entry_key), &loop, &done_loop); Branch(IsTheHole(entry_key), &loop, &done_loop);
...@@ -1534,8 +1534,8 @@ TF_BUILTIN(MapPrototypeSet, CollectionsBuiltinsAssembler) { ...@@ -1534,8 +1534,8 @@ TF_BUILTIN(MapPrototypeSet, CollectionsBuiltinsAssembler) {
TVARIABLE(OrderedHashMap, table_var, table); TVARIABLE(OrderedHashMap, table_var, table);
{ {
// Check we have enough space for the entry. // Check we have enough space for the entry.
number_of_buckets.Bind(SmiUntag(CAST(UnsafeLoadFixedArrayElement( number_of_buckets.Bind(SmiUntag(CAST(
table, OrderedHashMap::NumberOfBucketsIndex())))); LoadFixedArrayElement(table, OrderedHashMap::NumberOfBucketsIndex()))));
STATIC_ASSERT(OrderedHashMap::kLoadFactor == 2); STATIC_ASSERT(OrderedHashMap::kLoadFactor == 2);
Node* const capacity = WordShl(number_of_buckets.value(), 1); Node* const capacity = WordShl(number_of_buckets.value(), 1);
...@@ -1550,7 +1550,7 @@ TF_BUILTIN(MapPrototypeSet, CollectionsBuiltinsAssembler) { ...@@ -1550,7 +1550,7 @@ TF_BUILTIN(MapPrototypeSet, CollectionsBuiltinsAssembler) {
// fields. // fields.
CallRuntime(Runtime::kMapGrow, context, receiver); CallRuntime(Runtime::kMapGrow, context, receiver);
table_var = CAST(LoadObjectField(receiver, JSMap::kTableOffset)); table_var = CAST(LoadObjectField(receiver, JSMap::kTableOffset));
number_of_buckets.Bind(SmiUntag(CAST(UnsafeLoadFixedArrayElement( number_of_buckets.Bind(SmiUntag(CAST(LoadFixedArrayElement(
table_var.value(), OrderedHashMap::NumberOfBucketsIndex())))); table_var.value(), OrderedHashMap::NumberOfBucketsIndex()))));
Node* const new_number_of_elements = SmiUntag(CAST(LoadObjectField( Node* const new_number_of_elements = SmiUntag(CAST(LoadObjectField(
table_var.value(), OrderedHashMap::NumberOfElementsOffset()))); table_var.value(), OrderedHashMap::NumberOfElementsOffset())));
...@@ -1572,28 +1572,24 @@ void CollectionsBuiltinsAssembler::StoreOrderedHashMapNewEntry( ...@@ -1572,28 +1572,24 @@ void CollectionsBuiltinsAssembler::StoreOrderedHashMapNewEntry(
Node* const hash, Node* const number_of_buckets, Node* const occupancy) { Node* const hash, Node* const number_of_buckets, Node* const occupancy) {
Node* const bucket = Node* const bucket =
WordAnd(hash, IntPtrSub(number_of_buckets, IntPtrConstant(1))); WordAnd(hash, IntPtrSub(number_of_buckets, IntPtrConstant(1)));
Node* const bucket_entry = UnsafeLoadFixedArrayElement( Node* const bucket_entry = LoadFixedArrayElement(
table, bucket, OrderedHashMap::HashTableStartIndex() * kTaggedSize); table, bucket, OrderedHashMap::HashTableStartIndex() * kTaggedSize);
// Store the entry elements. // Store the entry elements.
Node* const entry_start = IntPtrAdd( Node* const entry_start = IntPtrAdd(
IntPtrMul(occupancy, IntPtrConstant(OrderedHashMap::kEntrySize)), IntPtrMul(occupancy, IntPtrConstant(OrderedHashMap::kEntrySize)),
number_of_buckets); number_of_buckets);
UnsafeStoreFixedArrayElement( StoreFixedArrayElement(table, entry_start, key, UPDATE_WRITE_BARRIER,
table, entry_start, key, UPDATE_WRITE_BARRIER,
kTaggedSize * OrderedHashMap::HashTableStartIndex()); kTaggedSize * OrderedHashMap::HashTableStartIndex());
UnsafeStoreFixedArrayElement( StoreFixedArrayElement(table, entry_start, value, UPDATE_WRITE_BARRIER,
table, entry_start, value, UPDATE_WRITE_BARRIER,
kTaggedSize * (OrderedHashMap::HashTableStartIndex() + kTaggedSize * (OrderedHashMap::HashTableStartIndex() +
OrderedHashMap::kValueOffset)); OrderedHashMap::kValueOffset));
UnsafeStoreFixedArrayElement( StoreFixedArrayElement(table, entry_start, bucket_entry, SKIP_WRITE_BARRIER,
table, entry_start, bucket_entry, SKIP_WRITE_BARRIER,
kTaggedSize * (OrderedHashMap::HashTableStartIndex() + kTaggedSize * (OrderedHashMap::HashTableStartIndex() +
OrderedHashMap::kChainOffset)); OrderedHashMap::kChainOffset));
// Update the bucket head. // Update the bucket head.
UnsafeStoreFixedArrayElement( StoreFixedArrayElement(table, bucket, SmiTag(occupancy), SKIP_WRITE_BARRIER,
table, bucket, SmiTag(occupancy), SKIP_WRITE_BARRIER,
OrderedHashMap::HashTableStartIndex() * kTaggedSize); OrderedHashMap::HashTableStartIndex() * kTaggedSize);
// Bump the elements count. // Bump the elements count.
...@@ -1708,8 +1704,8 @@ TF_BUILTIN(SetPrototypeAdd, CollectionsBuiltinsAssembler) { ...@@ -1708,8 +1704,8 @@ TF_BUILTIN(SetPrototypeAdd, CollectionsBuiltinsAssembler) {
TVARIABLE(OrderedHashSet, table_var, table); TVARIABLE(OrderedHashSet, table_var, table);
{ {
// Check we have enough space for the entry. // Check we have enough space for the entry.
number_of_buckets.Bind(SmiUntag(CAST(UnsafeLoadFixedArrayElement( number_of_buckets.Bind(SmiUntag(CAST(
table, OrderedHashSet::NumberOfBucketsIndex())))); LoadFixedArrayElement(table, OrderedHashSet::NumberOfBucketsIndex()))));
STATIC_ASSERT(OrderedHashSet::kLoadFactor == 2); STATIC_ASSERT(OrderedHashSet::kLoadFactor == 2);
Node* const capacity = WordShl(number_of_buckets.value(), 1); Node* const capacity = WordShl(number_of_buckets.value(), 1);
...@@ -1724,7 +1720,7 @@ TF_BUILTIN(SetPrototypeAdd, CollectionsBuiltinsAssembler) { ...@@ -1724,7 +1720,7 @@ TF_BUILTIN(SetPrototypeAdd, CollectionsBuiltinsAssembler) {
// fields. // fields.
CallRuntime(Runtime::kSetGrow, context, receiver); CallRuntime(Runtime::kSetGrow, context, receiver);
table_var = CAST(LoadObjectField(receiver, JSMap::kTableOffset)); table_var = CAST(LoadObjectField(receiver, JSMap::kTableOffset));
number_of_buckets.Bind(SmiUntag(CAST(UnsafeLoadFixedArrayElement( number_of_buckets.Bind(SmiUntag(CAST(LoadFixedArrayElement(
table_var.value(), OrderedHashSet::NumberOfBucketsIndex())))); table_var.value(), OrderedHashSet::NumberOfBucketsIndex()))));
Node* const new_number_of_elements = SmiUntag(CAST(LoadObjectField( Node* const new_number_of_elements = SmiUntag(CAST(LoadObjectField(
table_var.value(), OrderedHashSet::NumberOfElementsOffset()))); table_var.value(), OrderedHashSet::NumberOfElementsOffset())));
...@@ -1746,24 +1742,21 @@ void CollectionsBuiltinsAssembler::StoreOrderedHashSetNewEntry( ...@@ -1746,24 +1742,21 @@ void CollectionsBuiltinsAssembler::StoreOrderedHashSetNewEntry(
Node* const number_of_buckets, Node* const occupancy) { Node* const number_of_buckets, Node* const occupancy) {
Node* const bucket = Node* const bucket =
WordAnd(hash, IntPtrSub(number_of_buckets, IntPtrConstant(1))); WordAnd(hash, IntPtrSub(number_of_buckets, IntPtrConstant(1)));
Node* const bucket_entry = UnsafeLoadFixedArrayElement( Node* const bucket_entry = LoadFixedArrayElement(
table, bucket, OrderedHashSet::HashTableStartIndex() * kTaggedSize); table, bucket, OrderedHashSet::HashTableStartIndex() * kTaggedSize);
// Store the entry elements. // Store the entry elements.
Node* const entry_start = IntPtrAdd( Node* const entry_start = IntPtrAdd(
IntPtrMul(occupancy, IntPtrConstant(OrderedHashSet::kEntrySize)), IntPtrMul(occupancy, IntPtrConstant(OrderedHashSet::kEntrySize)),
number_of_buckets); number_of_buckets);
UnsafeStoreFixedArrayElement( StoreFixedArrayElement(table, entry_start, key, UPDATE_WRITE_BARRIER,
table, entry_start, key, UPDATE_WRITE_BARRIER,
kTaggedSize * OrderedHashSet::HashTableStartIndex()); kTaggedSize * OrderedHashSet::HashTableStartIndex());
UnsafeStoreFixedArrayElement( StoreFixedArrayElement(table, entry_start, bucket_entry, SKIP_WRITE_BARRIER,
table, entry_start, bucket_entry, SKIP_WRITE_BARRIER,
kTaggedSize * (OrderedHashSet::HashTableStartIndex() + kTaggedSize * (OrderedHashSet::HashTableStartIndex() +
OrderedHashSet::kChainOffset)); OrderedHashSet::kChainOffset));
// Update the bucket head. // Update the bucket head.
UnsafeStoreFixedArrayElement( StoreFixedArrayElement(table, bucket, SmiTag(occupancy), SKIP_WRITE_BARRIER,
table, bucket, SmiTag(occupancy), SKIP_WRITE_BARRIER,
OrderedHashSet::HashTableStartIndex() * kTaggedSize); OrderedHashSet::HashTableStartIndex() * kTaggedSize);
// Bump the elements count. // Bump the elements count.
...@@ -2341,12 +2334,11 @@ void WeakCollectionsBuiltinsAssembler::AddEntry( ...@@ -2341,12 +2334,11 @@ void WeakCollectionsBuiltinsAssembler::AddEntry(
TNode<Object> key, TNode<Object> value, TNode<IntPtrT> number_of_elements) { TNode<Object> key, TNode<Object> value, TNode<IntPtrT> number_of_elements) {
// See EphemeronHashTable::AddEntry(). // See EphemeronHashTable::AddEntry().
TNode<IntPtrT> value_index = ValueIndexFromKeyIndex(key_index); TNode<IntPtrT> value_index = ValueIndexFromKeyIndex(key_index);
UnsafeStoreFixedArrayElement(table, key_index, key); StoreFixedArrayElement(table, key_index, key);
UnsafeStoreFixedArrayElement(table, value_index, value); StoreFixedArrayElement(table, value_index, value);
// See HashTableBase::ElementAdded(). // See HashTableBase::ElementAdded().
UnsafeStoreFixedArrayElement( StoreFixedArrayElement(table, EphemeronHashTable::kNumberOfElementsIndex,
table, EphemeronHashTable::kNumberOfElementsIndex,
SmiFromIntPtr(number_of_elements), SKIP_WRITE_BARRIER); SmiFromIntPtr(number_of_elements), SKIP_WRITE_BARRIER);
} }
...@@ -2412,8 +2404,7 @@ TNode<IntPtrT> WeakCollectionsBuiltinsAssembler::FindKeyIndex( ...@@ -2412,8 +2404,7 @@ TNode<IntPtrT> WeakCollectionsBuiltinsAssembler::FindKeyIndex(
TNode<IntPtrT> key_index; TNode<IntPtrT> key_index;
{ {
key_index = KeyIndexFromEntry(var_entry.value()); key_index = KeyIndexFromEntry(var_entry.value());
TNode<Object> entry_key = TNode<Object> entry_key = LoadFixedArrayElement(CAST(table), key_index);
UnsafeLoadFixedArrayElement(CAST(table), key_index);
key_compare(entry_key, &if_found); key_compare(entry_key, &if_found);
...@@ -2463,14 +2454,14 @@ TNode<IntPtrT> WeakCollectionsBuiltinsAssembler::KeyIndexFromEntry( ...@@ -2463,14 +2454,14 @@ TNode<IntPtrT> WeakCollectionsBuiltinsAssembler::KeyIndexFromEntry(
TNode<IntPtrT> WeakCollectionsBuiltinsAssembler::LoadNumberOfElements( TNode<IntPtrT> WeakCollectionsBuiltinsAssembler::LoadNumberOfElements(
TNode<EphemeronHashTable> table, int offset) { TNode<EphemeronHashTable> table, int offset) {
TNode<IntPtrT> number_of_elements = SmiUntag(CAST(UnsafeLoadFixedArrayElement( TNode<IntPtrT> number_of_elements = SmiUntag(CAST(LoadFixedArrayElement(
table, EphemeronHashTable::kNumberOfElementsIndex))); table, EphemeronHashTable::kNumberOfElementsIndex)));
return IntPtrAdd(number_of_elements, IntPtrConstant(offset)); return IntPtrAdd(number_of_elements, IntPtrConstant(offset));
} }
TNode<IntPtrT> WeakCollectionsBuiltinsAssembler::LoadNumberOfDeleted( TNode<IntPtrT> WeakCollectionsBuiltinsAssembler::LoadNumberOfDeleted(
TNode<EphemeronHashTable> table, int offset) { TNode<EphemeronHashTable> table, int offset) {
TNode<IntPtrT> number_of_deleted = SmiUntag(CAST(UnsafeLoadFixedArrayElement( TNode<IntPtrT> number_of_deleted = SmiUntag(CAST(LoadFixedArrayElement(
table, EphemeronHashTable::kNumberOfDeletedElementsIndex))); table, EphemeronHashTable::kNumberOfDeletedElementsIndex)));
return IntPtrAdd(number_of_deleted, IntPtrConstant(offset)); return IntPtrAdd(number_of_deleted, IntPtrConstant(offset));
} }
...@@ -2482,8 +2473,8 @@ TNode<EphemeronHashTable> WeakCollectionsBuiltinsAssembler::LoadTable( ...@@ -2482,8 +2473,8 @@ TNode<EphemeronHashTable> WeakCollectionsBuiltinsAssembler::LoadTable(
TNode<IntPtrT> WeakCollectionsBuiltinsAssembler::LoadTableCapacity( TNode<IntPtrT> WeakCollectionsBuiltinsAssembler::LoadTableCapacity(
TNode<EphemeronHashTable> table) { TNode<EphemeronHashTable> table) {
return SmiUntag(CAST( return SmiUntag(
UnsafeLoadFixedArrayElement(table, EphemeronHashTable::kCapacityIndex))); CAST(LoadFixedArrayElement(table, EphemeronHashTable::kCapacityIndex)));
} }
TNode<Word32T> WeakCollectionsBuiltinsAssembler::InsufficientCapacityToAdd( TNode<Word32T> WeakCollectionsBuiltinsAssembler::InsufficientCapacityToAdd(
......
...@@ -1925,9 +1925,9 @@ void RegExpBuiltinsAssembler::RegExpPrototypeMatchBody(Node* const context, ...@@ -1925,9 +1925,9 @@ void RegExpBuiltinsAssembler::RegExpPrototypeMatchBody(Node* const context,
RegExpPrototypeExecBodyWithoutResult(CAST(context), CAST(regexp), RegExpPrototypeExecBodyWithoutResult(CAST(context), CAST(regexp),
string, &if_didnotmatch, true); string, &if_didnotmatch, true);
Node* const match_from = UnsafeLoadFixedArrayElement( Node* const match_from = LoadFixedArrayElement(
match_indices, RegExpMatchInfo::kFirstCaptureIndex); match_indices, RegExpMatchInfo::kFirstCaptureIndex);
Node* const match_to = UnsafeLoadFixedArrayElement( Node* const match_to = LoadFixedArrayElement(
match_indices, RegExpMatchInfo::kFirstCaptureIndex + 1); match_indices, RegExpMatchInfo::kFirstCaptureIndex + 1);
var_match.Bind(CallBuiltin(Builtins::kSubString, context, string, var_match.Bind(CallBuiltin(Builtins::kSubString, context, string,
...@@ -2403,7 +2403,7 @@ void RegExpBuiltinsAssembler::RegExpPrototypeSplitBody(Node* const context, ...@@ -2403,7 +2403,7 @@ void RegExpBuiltinsAssembler::RegExpPrototypeSplitBody(Node* const context,
length, allocation_site, mode); length, allocation_site, mode);
TNode<FixedArray> fixed_array = CAST(LoadElements(result)); TNode<FixedArray> fixed_array = CAST(LoadElements(result));
UnsafeStoreFixedArrayElement(fixed_array, 0, string); StoreFixedArrayElement(fixed_array, 0, string);
Return(result); Return(result);
} }
...@@ -2456,7 +2456,7 @@ void RegExpBuiltinsAssembler::RegExpPrototypeSplitBody(Node* const context, ...@@ -2456,7 +2456,7 @@ void RegExpBuiltinsAssembler::RegExpPrototypeSplitBody(Node* const context,
} }
TNode<FixedArray> match_indices = CAST(match_indices_ho); TNode<FixedArray> match_indices = CAST(match_indices_ho);
TNode<Smi> const match_from = CAST(UnsafeLoadFixedArrayElement( TNode<Smi> const match_from = CAST(LoadFixedArrayElement(
match_indices, RegExpMatchInfo::kFirstCaptureIndex)); match_indices, RegExpMatchInfo::kFirstCaptureIndex));
// We're done if the match starts beyond the string. // We're done if the match starts beyond the string.
...@@ -2466,7 +2466,7 @@ void RegExpBuiltinsAssembler::RegExpPrototypeSplitBody(Node* const context, ...@@ -2466,7 +2466,7 @@ void RegExpBuiltinsAssembler::RegExpPrototypeSplitBody(Node* const context,
BIND(&next); BIND(&next);
} }
TNode<Smi> const match_to = CAST(UnsafeLoadFixedArrayElement( TNode<Smi> const match_to = CAST(LoadFixedArrayElement(
match_indices, RegExpMatchInfo::kFirstCaptureIndex + 1)); match_indices, RegExpMatchInfo::kFirstCaptureIndex + 1));
// Advance index and continue if the match is empty. // Advance index and continue if the match is empty.
......
...@@ -27,7 +27,7 @@ void GrowableFixedArray::Push(TNode<Object> const value) { ...@@ -27,7 +27,7 @@ void GrowableFixedArray::Push(TNode<Object> const value) {
BIND(&store); BIND(&store);
{ {
TNode<FixedArray> const array = var_array_.value(); TNode<FixedArray> const array = var_array_.value();
UnsafeStoreFixedArrayElement(array, length, value); StoreFixedArrayElement(array, length, value);
var_length_ = IntPtrAdd(length, IntPtrConstant(1)); var_length_ = IntPtrAdd(length, IntPtrConstant(1));
} }
......
...@@ -6742,7 +6742,7 @@ TNode<String> CodeStubAssembler::StringFromSingleCharCode(TNode<Int32T> code) { ...@@ -6742,7 +6742,7 @@ TNode<String> CodeStubAssembler::StringFromSingleCharCode(TNode<Int32T> code) {
// cache already. // cache already.
Label if_entryisundefined(this, Label::kDeferred), Label if_entryisundefined(this, Label::kDeferred),
if_entryisnotundefined(this); if_entryisnotundefined(this);
Node* entry = UnsafeLoadFixedArrayElement(cache, code_index); Node* entry = LoadFixedArrayElement(cache, code_index);
Branch(IsUndefined(entry), &if_entryisundefined, &if_entryisnotundefined); Branch(IsUndefined(entry), &if_entryisundefined, &if_entryisnotundefined);
BIND(&if_entryisundefined); BIND(&if_entryisundefined);
...@@ -8414,8 +8414,7 @@ void CodeStubAssembler::NameDictionaryLookup( ...@@ -8414,8 +8414,7 @@ void CodeStubAssembler::NameDictionaryLookup(
TNode<IntPtrT> index = EntryToIndex<Dictionary>(entry); TNode<IntPtrT> index = EntryToIndex<Dictionary>(entry);
*var_name_index = index; *var_name_index = index;
TNode<HeapObject> current = TNode<HeapObject> current = CAST(LoadFixedArrayElement(dictionary, index));
CAST(UnsafeLoadFixedArrayElement(dictionary, index));
GotoIf(WordEqual(current, undefined), if_not_found); GotoIf(WordEqual(current, undefined), if_not_found);
current = LoadName<Dictionary>(current); current = LoadName<Dictionary>(current);
GotoIf(WordEqual(current, unique_name), if_found); GotoIf(WordEqual(current, unique_name), if_found);
...@@ -8526,7 +8525,7 @@ void CodeStubAssembler::NumberDictionaryLookup( ...@@ -8526,7 +8525,7 @@ void CodeStubAssembler::NumberDictionaryLookup(
TNode<IntPtrT> entry = var_entry->value(); TNode<IntPtrT> entry = var_entry->value();
TNode<IntPtrT> index = EntryToIndex<NumberDictionary>(entry); TNode<IntPtrT> index = EntryToIndex<NumberDictionary>(entry);
Node* current = UnsafeLoadFixedArrayElement(dictionary, index); Node* current = LoadFixedArrayElement(dictionary, index);
GotoIf(WordEqual(current, undefined), if_not_found); GotoIf(WordEqual(current, undefined), if_not_found);
Label next_probe(this); Label next_probe(this);
{ {
...@@ -9614,7 +9613,7 @@ void CodeStubAssembler::TryLookupElement(Node* object, Node* map, ...@@ -9614,7 +9613,7 @@ void CodeStubAssembler::TryLookupElement(Node* object, Node* map,
GotoIfNot(UintPtrLessThan(intptr_index, length), &if_oob); GotoIfNot(UintPtrLessThan(intptr_index, length), &if_oob);
TNode<Object> element = UnsafeLoadFixedArrayElement(elements, intptr_index); TNode<Object> element = LoadFixedArrayElement(elements, intptr_index);
TNode<Oddball> the_hole = TheHoleConstant(); TNode<Oddball> the_hole = TheHoleConstant();
Branch(WordEqual(element, the_hole), if_not_found, if_found); Branch(WordEqual(element, the_hole), if_not_found, if_found);
} }
......
...@@ -1027,20 +1027,11 @@ class V8_EXPORT_PRIVATE CodeStubAssembler ...@@ -1027,20 +1027,11 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
CheckBounds::kDebugOnly); CheckBounds::kDebugOnly);
} }
TNode<Object> LoadFixedArrayElement( TNode<Object> LoadFixedArrayElement(TNode<FixedArray> object,
TNode<FixedArray> object, TNode<IntPtrT> index,
LoadSensitivity needs_poisoning,
CheckBounds check_bounds = CheckBounds::kAlways) {
return LoadFixedArrayElement(object, index, 0, INTPTR_PARAMETERS,
needs_poisoning, check_bounds);
}
// This doesn't emit a bounds-check. As part of the security-performance
// tradeoff, only use it if it is performance critical.
TNode<Object> UnsafeLoadFixedArrayElement(TNode<FixedArray> object,
TNode<IntPtrT> index, TNode<IntPtrT> index,
LoadSensitivity needs_poisoning) { LoadSensitivity needs_poisoning) {
return LoadFixedArrayElement(object, index, needs_poisoning, return LoadFixedArrayElement(object, index, 0, INTPTR_PARAMETERS,
CheckBounds::kDebugOnly); needs_poisoning);
} }
TNode<Object> LoadFixedArrayElement( TNode<Object> LoadFixedArrayElement(
...@@ -2622,8 +2613,7 @@ class V8_EXPORT_PRIVATE CodeStubAssembler ...@@ -2622,8 +2613,7 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
template <class Dictionary> template <class Dictionary>
TNode<Smi> GetCapacity(TNode<Dictionary> dictionary) { TNode<Smi> GetCapacity(TNode<Dictionary> dictionary) {
return CAST( return CAST(LoadFixedArrayElement(dictionary, Dictionary::kCapacityIndex));
UnsafeLoadFixedArrayElement(dictionary, Dictionary::kCapacityIndex));
} }
template <class Dictionary> template <class Dictionary>
......
...@@ -1796,14 +1796,13 @@ void AccessorAssembler::EmitElementLoad( ...@@ -1796,14 +1796,13 @@ void AccessorAssembler::EmitElementLoad(
BIND(&if_fast_packed); BIND(&if_fast_packed);
{ {
Comment("fast packed elements"); Comment("fast packed elements");
exit_point->Return( exit_point->Return(LoadFixedArrayElement(CAST(elements), intptr_index));
UnsafeLoadFixedArrayElement(CAST(elements), intptr_index));
} }
BIND(&if_fast_holey); BIND(&if_fast_holey);
{ {
Comment("fast holey elements"); Comment("fast holey elements");
Node* element = UnsafeLoadFixedArrayElement(CAST(elements), intptr_index); Node* element = LoadFixedArrayElement(CAST(elements), intptr_index);
GotoIf(WordEqual(element, TheHoleConstant()), if_hole); GotoIf(WordEqual(element, TheHoleConstant()), if_hole);
exit_point->Return(element); exit_point->Return(element);
} }
......
...@@ -648,8 +648,8 @@ Node* InterpreterAssembler::BytecodeOperandIntrinsicId(int operand_index) { ...@@ -648,8 +648,8 @@ Node* InterpreterAssembler::BytecodeOperandIntrinsicId(int operand_index) {
Node* InterpreterAssembler::LoadConstantPoolEntry(Node* index) { Node* InterpreterAssembler::LoadConstantPoolEntry(Node* index) {
TNode<FixedArray> constant_pool = CAST(LoadObjectField( TNode<FixedArray> constant_pool = CAST(LoadObjectField(
BytecodeArrayTaggedPointer(), BytecodeArray::kConstantPoolOffset)); BytecodeArrayTaggedPointer(), BytecodeArray::kConstantPoolOffset));
return UnsafeLoadFixedArrayElement( return LoadFixedArrayElement(constant_pool, UncheckedCast<IntPtrT>(index),
constant_pool, UncheckedCast<IntPtrT>(index), LoadSensitivity::kCritical); LoadSensitivity::kCritical);
} }
Node* InterpreterAssembler::LoadAndUntagConstantPoolEntry(Node* index) { Node* InterpreterAssembler::LoadAndUntagConstantPoolEntry(Node* index) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment