Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(42)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: src/hydrogen.cc

Issue 1053203007: Revert of Reland "Remove the weak list of views from array buffers" (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/hydrogen.h ('k') | src/hydrogen-instructions.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/hydrogen.cc
diff --git a/src/hydrogen.cc b/src/hydrogen.cc
index e48b170ef2aae9131b9871bcdb5869691c40f69a..1e28ceace21330186672a1287689d1ca416caaf2 100644
--- a/src/hydrogen.cc
+++ b/src/hydrogen.cc
@@ -2427,22 +2427,6 @@
IsFixedTypedArrayElementsKind(elements_kind)) {
HValue* backing_store;
if (IsExternalArrayElementsKind(elements_kind)) {
- NoObservableSideEffectsScope no_effects(this);
- HInstruction* buffer = Add<HLoadNamedField>(
- checked_object, nullptr, HObjectAccess::ForJSArrayBufferViewBuffer());
- HInstruction* flags = Add<HLoadNamedField>(
- buffer, nullptr, HObjectAccess::ForJSArrayBufferFlag());
- HValue* was_neutered_mask =
- Add<HConstant>(1 << JSArrayBuffer::kWasNeuteredBit);
- HValue* was_neutered_test =
- AddUncasted<HBitwise>(Token::BIT_AND, flags, was_neutered_mask);
-
- IfBuilder if_was_neutered(this);
- if_was_neutered.If<HCompareNumericAndBranch>(
- was_neutered_test, graph()->GetConstant0(), Token::NE);
- if_was_neutered.ThenDeopt(Deoptimizer::kOutOfBounds);
- if_was_neutered.End();
-
backing_store = Add<HLoadNamedField>(
elements, nullptr, HObjectAccess::ForExternalArrayExternalPointer());
} else {
@@ -3168,44 +3152,6 @@
HInstruction* index =
Add<HConstant>(static_cast<int32_t>(Context::ARRAY_FUNCTION_INDEX));
return Add<HLoadKeyed>(native_context, index, nullptr, FAST_ELEMENTS);
-}
-
-
-HValue* HGraphBuilder::BuildArrayBufferViewFieldAccessor(HValue* object,
- HValue* checked_object,
- FieldIndex index) {
- NoObservableSideEffectsScope scope(this);
- HObjectAccess access = HObjectAccess::ForObservableJSObjectOffset(
- index.offset(), Representation::Tagged());
- HInstruction* buffer = Add<HLoadNamedField>(
- object, checked_object, HObjectAccess::ForJSArrayBufferViewBuffer());
- HInstruction* field = Add<HLoadNamedField>(object, checked_object, access);
-
- IfBuilder if_has_buffer(this);
- HValue* has_buffer = if_has_buffer.IfNot<HIsSmiAndBranch>(buffer);
- if_has_buffer.Then();
- {
- HInstruction* flags = Add<HLoadNamedField>(
- buffer, has_buffer, HObjectAccess::ForJSArrayBufferFlag());
- HValue* was_neutered_mask =
- Add<HConstant>(1 << JSArrayBuffer::kWasNeuteredBit);
- HValue* was_neutered_test =
- AddUncasted<HBitwise>(Token::BIT_AND, flags, was_neutered_mask);
-
- IfBuilder if_was_neutered(this);
- if_was_neutered.If<HCompareNumericAndBranch>(
- was_neutered_test, graph()->GetConstant0(), Token::NE);
- if_was_neutered.Then();
- Push(graph()->GetConstant0());
- if_was_neutered.Else();
- Push(field);
- if_was_neutered.End();
- }
- if_has_buffer.Else();
- Push(field);
- if_has_buffer.End();
-
- return Pop();
}
@@ -5708,7 +5654,7 @@
Handle<Map> map = property->GetReceiverType();
Handle<String> name = key->AsPropertyName();
- HValue* store;
+ HInstruction* store;
if (map.is_null()) {
// If we don't know the monomorphic type, do a generic store.
CHECK_ALIVE(store = BuildNamedGeneric(
@@ -5726,9 +5672,7 @@
STORE, NULL, literal, name, value));
}
}
- if (store->IsInstruction()) {
- AddInstruction(HInstruction::cast(store));
- }
+ AddInstruction(store);
DCHECK(store->HasObservableSideEffects());
Add<HSimulate>(key->id(), REMOVABLE_SIMULATE);
} else {
@@ -6189,7 +6133,6 @@
bool HOptimizedGraphBuilder::PropertyAccessInfo::CanAccessMonomorphic() {
if (!CanInlinePropertyAccess(map_)) return false;
if (IsJSObjectFieldAccessor()) return IsLoad();
- if (IsJSArrayBufferViewFieldAccessor()) return IsLoad();
if (map_->function_with_prototype() && !map_->has_non_instance_prototype() &&
name_.is_identical_to(isolate()->factory()->prototype_string())) {
return IsLoad();
@@ -6238,18 +6181,6 @@
return true;
}
- if (GetJSArrayBufferViewFieldAccess(&access)) {
- for (int i = 1; i < maps->length(); ++i) {
- PropertyAccessInfo test_info(builder_, access_type_, maps->at(i), name_);
- HObjectAccess test_access = HObjectAccess::ForMap(); // bogus default
- if (!test_info.GetJSArrayBufferViewFieldAccess(&test_access)) {
- return false;
- }
- if (!access.Equals(test_access)) return false;
- }
- return true;
- }
-
// Currently only handle numbers as a polymorphic case.
// TODO(verwaest): Support monomorphic handling of numbers with a HCheckNumber
// instruction.
@@ -6289,20 +6220,19 @@
}
-HValue* HOptimizedGraphBuilder::BuildMonomorphicAccess(
- PropertyAccessInfo* info, HValue* object, HValue* checked_object,
- HValue* value, BailoutId ast_id, BailoutId return_id,
+HInstruction* HOptimizedGraphBuilder::BuildMonomorphicAccess(
+ PropertyAccessInfo* info,
+ HValue* object,
+ HValue* checked_object,
+ HValue* value,
+ BailoutId ast_id,
+ BailoutId return_id,
bool can_inline_accessor) {
+
HObjectAccess access = HObjectAccess::ForMap(); // bogus default
if (info->GetJSObjectFieldAccess(&access)) {
DCHECK(info->IsLoad());
return New<HLoadNamedField>(object, checked_object, access);
- }
-
- if (info->GetJSArrayBufferViewFieldAccess(&access)) {
- DCHECK(info->IsLoad());
- return BuildArrayBufferViewFieldAccessor(
- object, checked_object, FieldIndex::ForInObjectOffset(access.offset()));
}
if (info->name().is_identical_to(isolate()->factory()->prototype_string()) &&
@@ -6454,9 +6384,9 @@
set_current_block(if_true);
- HValue* access =
- BuildMonomorphicAccess(&info, object, dependency, value, ast_id,
- return_id, FLAG_polymorphic_inlining);
+ HInstruction* access = BuildMonomorphicAccess(
+ &info, object, dependency, value, ast_id,
+ return_id, FLAG_polymorphic_inlining);
HValue* result = NULL;
switch (access_type) {
@@ -6471,10 +6401,7 @@
if (access == NULL) {
if (HasStackOverflow()) return;
} else {
- if (access->IsInstruction()) {
- HInstruction* instr = HInstruction::cast(access);
- if (!instr->IsLinked()) AddInstruction(instr);
- }
+ if (!access->IsLinked()) AddInstruction(access);
if (!ast_context()->IsEffect()) Push(result);
}
@@ -6568,13 +6495,13 @@
Handle<String> name = Handle<String>::cast(key->value());
DCHECK(!name.is_null());
- HValue* access = BuildNamedAccess(STORE, ast_id, return_id, expr, object,
- name, value, is_uninitialized);
- if (access == NULL) return;
+ HInstruction* instr = BuildNamedAccess(STORE, ast_id, return_id, expr,
+ object, name, value, is_uninitialized);
+ if (instr == NULL) return;
if (!ast_context()->IsEffect()) Push(value);
- if (access->IsInstruction()) AddInstruction(HInstruction::cast(access));
- if (access->HasObservableSideEffects()) {
+ AddInstruction(instr);
+ if (instr->HasObservableSideEffects()) {
Add<HSimulate>(ast_id, REMOVABLE_SIMULATE);
}
if (!ast_context()->IsEffect()) Drop(1);
@@ -7323,18 +7250,16 @@
constant = isolate()->factory()->InternalizeString(
Handle<String>::cast(constant));
}
- HValue* access =
+ HInstruction* instr =
BuildNamedAccess(access_type, ast_id, return_id, expr, obj,
Handle<String>::cast(constant), val, false);
- if (access == NULL || access->IsPhi() ||
- HInstruction::cast(access)->IsLinked()) {
+ if (instr == NULL || instr->IsLinked()) {
*has_side_effects = false;
} else {
- HInstruction* instr = HInstruction::cast(access);
AddInstruction(instr);
*has_side_effects = instr->HasObservableSideEffects();
}
- return access;
+ return instr;
}
}
@@ -7493,9 +7418,14 @@
}
-HValue* HOptimizedGraphBuilder::BuildNamedAccess(
- PropertyAccessType access, BailoutId ast_id, BailoutId return_id,
- Expression* expr, HValue* object, Handle<String> name, HValue* value,
+HInstruction* HOptimizedGraphBuilder::BuildNamedAccess(
+ PropertyAccessType access,
+ BailoutId ast_id,
+ BailoutId return_id,
+ Expression* expr,
+ HValue* object,
+ Handle<String> name,
+ HValue* value,
bool is_uninitialized) {
SmallMapList* maps;
ComputeReceiverTypes(expr, object, &maps, zone());
@@ -7551,11 +7481,9 @@
Handle<String> name = expr->key()->AsLiteral()->AsPropertyName();
HValue* object = Pop();
- HValue* value = BuildNamedAccess(LOAD, ast_id, expr->LoadId(), expr, object,
- name, NULL, expr->IsUninitialized());
- if (value == NULL) return;
- if (value->IsPhi()) return ast_context()->ReturnValue(value);
- instr = HInstruction::cast(value);
+ instr = BuildNamedAccess(LOAD, ast_id, expr->LoadId(), expr,
+ object, name, NULL, expr->IsUninitialized());
+ if (instr == NULL) return;
if (instr->IsLinked()) return ast_context()->ReturnValue(instr);
} else {
@@ -9689,11 +9617,20 @@
Add<HStoreNamedField>(
obj,
HObjectAccess::ForJSArrayBufferViewBuffer(), buffer);
+ HObjectAccess weak_first_view_access =
+ HObjectAccess::ForJSArrayBufferWeakFirstView();
+ Add<HStoreNamedField>(
+ obj, HObjectAccess::ForJSArrayBufferViewWeakNext(),
+ Add<HLoadNamedField>(buffer, nullptr, weak_first_view_access));
+ Add<HStoreNamedField>(buffer, weak_first_view_access, obj);
} else {
Add<HStoreNamedField>(
obj,
HObjectAccess::ForJSArrayBufferViewBuffer(),
Add<HConstant>(static_cast<int32_t>(0)));
+ Add<HStoreNamedField>(obj,
+ HObjectAccess::ForJSArrayBufferViewWeakNext(),
+ graph()->GetConstantUndefined());
}
}
@@ -9989,40 +9926,34 @@
void HOptimizedGraphBuilder::GenerateArrayBufferViewGetByteLength(
CallRuntime* expr) {
- NoObservableSideEffectsScope scope(this);
DCHECK(expr->arguments()->length() == 1);
CHECK_ALIVE(VisitForValue(expr->arguments()->at(0)));
- HValue* view = Pop();
-
- return ast_context()->ReturnValue(BuildArrayBufferViewFieldAccessor(
- view, nullptr,
- FieldIndex::ForInObjectOffset(JSArrayBufferView::kByteLengthOffset)));
+ HValue* buffer = Pop();
+ HInstruction* result = New<HLoadNamedField>(
+ buffer, nullptr, HObjectAccess::ForJSArrayBufferViewByteLength());
+ return ast_context()->ReturnInstruction(result, expr->id());
}
void HOptimizedGraphBuilder::GenerateArrayBufferViewGetByteOffset(
CallRuntime* expr) {
- NoObservableSideEffectsScope scope(this);
DCHECK(expr->arguments()->length() == 1);
CHECK_ALIVE(VisitForValue(expr->arguments()->at(0)));
- HValue* view = Pop();
-
- return ast_context()->ReturnValue(BuildArrayBufferViewFieldAccessor(
- view, nullptr,
- FieldIndex::ForInObjectOffset(JSArrayBufferView::kByteOffsetOffset)));
+ HValue* buffer = Pop();
+ HInstruction* result = New<HLoadNamedField>(
+ buffer, nullptr, HObjectAccess::ForJSArrayBufferViewByteOffset());
+ return ast_context()->ReturnInstruction(result, expr->id());
}
void HOptimizedGraphBuilder::GenerateTypedArrayGetLength(
CallRuntime* expr) {
- NoObservableSideEffectsScope scope(this);
DCHECK(expr->arguments()->length() == 1);
CHECK_ALIVE(VisitForValue(expr->arguments()->at(0)));
- HValue* view = Pop();
-
- return ast_context()->ReturnValue(BuildArrayBufferViewFieldAccessor(
- view, nullptr,
- FieldIndex::ForInObjectOffset(JSTypedArray::kLengthOffset)));
+ HValue* buffer = Pop();
+ HInstruction* result = New<HLoadNamedField>(
+ buffer, nullptr, HObjectAccess::ForJSTypedArrayLength());
+ return ast_context()->ReturnInstruction(result, expr->id());
}
« no previous file with comments | « src/hydrogen.h ('k') | src/hydrogen-instructions.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698