[turbofan] Introduce SerializationPolicy enum
This improves overall readability by replacing bool arguments. Bug: v8:7790 Change-Id: I02f8f43088497c9503f253788ee5e0015c7edc2d Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1730991 Commit-Queue: Georg Neis <neis@chromium.org> Reviewed-by: Maya Lekova <mslekova@chromium.org> Cr-Commit-Position: refs/heads/master@{#63032}
This commit is contained in:
parent
5a624dc465
commit
6d31360757
@ -964,7 +964,8 @@ BytecodeGraphBuilder::BytecodeGraphBuilder(
|
||||
bytecode_analysis_(broker_->GetBytecodeAnalysis(
|
||||
bytecode_array.object(), osr_offset,
|
||||
flags & BytecodeGraphBuilderFlag::kAnalyzeEnvironmentLiveness,
|
||||
!FLAG_concurrent_inlining)),
|
||||
FLAG_concurrent_inlining ? SerializationPolicy::kAssumeSerialized
|
||||
: SerializationPolicy::kSerializeIfNeeded)),
|
||||
environment_(nullptr),
|
||||
osr_(!osr_offset.IsNone()),
|
||||
currently_peeled_loop_offset_(-1),
|
||||
|
@ -35,6 +35,8 @@ namespace compiler {
|
||||
// For a store during literal creation, do not walk up the prototype chain.
|
||||
enum class AccessMode { kLoad, kStore, kStoreInLiteral, kHas };
|
||||
|
||||
enum class SerializationPolicy { kAssumeSerialized, kSerializeIfNeeded };
|
||||
|
||||
enum class OddballType : uint8_t {
|
||||
kNone, // Not an Oddball.
|
||||
kBoolean, // True or False.
|
||||
@ -134,8 +136,9 @@ class V8_EXPORT_PRIVATE ObjectRef {
|
||||
|
||||
// Return the element at key {index} if {index} is known to be an own data
|
||||
// property of the object that is non-writable and non-configurable.
|
||||
base::Optional<ObjectRef> GetOwnConstantElement(uint32_t index,
|
||||
bool serialize = false) const;
|
||||
base::Optional<ObjectRef> GetOwnConstantElement(
|
||||
uint32_t index, SerializationPolicy policy =
|
||||
SerializationPolicy::kAssumeSerialized) const;
|
||||
|
||||
Isolate* isolate() const;
|
||||
|
||||
@ -244,7 +247,8 @@ class JSObjectRef : public JSReceiverRef {
|
||||
// if {index} is known to be an own data property of the object.
|
||||
base::Optional<ObjectRef> GetOwnDataProperty(
|
||||
Representation field_representation, FieldIndex index,
|
||||
bool serialize = false) const;
|
||||
SerializationPolicy policy =
|
||||
SerializationPolicy::kAssumeSerialized) const;
|
||||
FixedArrayBaseRef elements() const;
|
||||
void SerializeElements();
|
||||
void EnsureElementsTenured();
|
||||
@ -339,10 +343,14 @@ class ContextRef : public HeapObjectRef {
|
||||
// followed. If {depth} != 0 on function return, then it only got
|
||||
// partway to the desired depth. If {serialize} is true, then
|
||||
// {previous} will cache its findings.
|
||||
ContextRef previous(size_t* depth, bool serialize = false) const;
|
||||
ContextRef previous(size_t* depth,
|
||||
SerializationPolicy policy =
|
||||
SerializationPolicy::kAssumeSerialized) const;
|
||||
|
||||
// Only returns a value if the index is valid for this ContextRef.
|
||||
base::Optional<ObjectRef> get(int index, bool serialize = false) const;
|
||||
base::Optional<ObjectRef> get(
|
||||
int index, SerializationPolicy policy =
|
||||
SerializationPolicy::kAssumeSerialized) const;
|
||||
|
||||
// We only serialize the ScopeInfo if certain Promise
|
||||
// builtins are called.
|
||||
@ -602,8 +610,9 @@ class FunctionTemplateInfoRef : public HeapObjectRef {
|
||||
void SerializeCallCode();
|
||||
base::Optional<CallHandlerInfoRef> call_code() const;
|
||||
|
||||
HolderLookupResult LookupHolderOfExpectedType(MapRef receiver_map,
|
||||
bool serialize);
|
||||
HolderLookupResult LookupHolderOfExpectedType(
|
||||
MapRef receiver_map,
|
||||
SerializationPolicy policy = SerializationPolicy::kAssumeSerialized);
|
||||
};
|
||||
|
||||
class FixedArrayBaseRef : public HeapObjectRef {
|
||||
@ -670,8 +679,9 @@ class JSArrayRef : public JSObjectRef {
|
||||
|
||||
// Return the element at key {index} if the array has a copy-on-write elements
|
||||
// storage and {index} is known to be an own data property.
|
||||
base::Optional<ObjectRef> GetOwnCowElement(uint32_t index,
|
||||
bool serialize = false) const;
|
||||
base::Optional<ObjectRef> GetOwnCowElement(
|
||||
uint32_t index, SerializationPolicy policy =
|
||||
SerializationPolicy::kAssumeSerialized) const;
|
||||
};
|
||||
|
||||
class ScopeInfoRef : public HeapObjectRef {
|
||||
@ -716,8 +726,9 @@ class V8_EXPORT_PRIVATE SharedFunctionInfoRef : public HeapObjectRef {
|
||||
// Template objects may not be created at compilation time. This method
|
||||
// wraps the retrieval of the template object and creates it if
|
||||
// necessary.
|
||||
JSArrayRef GetTemplateObject(ObjectRef description, FeedbackVectorRef vector,
|
||||
FeedbackSlot slot, bool serialize = false);
|
||||
JSArrayRef GetTemplateObject(
|
||||
ObjectRef description, FeedbackVectorRef vector, FeedbackSlot slot,
|
||||
SerializationPolicy policy = SerializationPolicy::kAssumeSerialized);
|
||||
|
||||
void SerializeFunctionTemplateInfo();
|
||||
base::Optional<FunctionTemplateInfoRef> function_template_info() const;
|
||||
@ -786,8 +797,9 @@ class JSGlobalProxyRef : public JSObjectRef {
|
||||
// If {serialize} is true:
|
||||
// Like above but potentially access the heap and serialize the necessary
|
||||
// information.
|
||||
base::Optional<PropertyCellRef> GetPropertyCell(NameRef const& name,
|
||||
bool serialize = false) const;
|
||||
base::Optional<PropertyCellRef> GetPropertyCell(
|
||||
NameRef const& name, SerializationPolicy policy =
|
||||
SerializationPolicy::kAssumeSerialized) const;
|
||||
};
|
||||
|
||||
class CodeRef : public HeapObjectRef {
|
||||
|
@ -2941,8 +2941,7 @@ Reduction JSCallReducer::ReduceCallApiFunction(
|
||||
|
||||
// See if we can constant-fold the compatible receiver checks.
|
||||
HolderLookupResult api_holder =
|
||||
function_template_info.LookupHolderOfExpectedType(first_receiver_map,
|
||||
false);
|
||||
function_template_info.LookupHolderOfExpectedType(first_receiver_map);
|
||||
if (api_holder.lookup == CallOptimization::kHolderNotFound)
|
||||
return inference.NoChange();
|
||||
|
||||
@ -2972,8 +2971,7 @@ Reduction JSCallReducer::ReduceCallApiFunction(
|
||||
for (size_t i = 1; i < receiver_maps.size(); ++i) {
|
||||
MapRef receiver_map(broker(), receiver_maps[i]);
|
||||
HolderLookupResult holder_i =
|
||||
function_template_info.LookupHolderOfExpectedType(receiver_map,
|
||||
false);
|
||||
function_template_info.LookupHolderOfExpectedType(receiver_map);
|
||||
|
||||
if (api_holder.lookup != holder_i.lookup) return inference.NoChange();
|
||||
if (!(api_holder.holder.has_value() && holder_i.holder.has_value()))
|
||||
|
@ -283,11 +283,13 @@ class JSObjectData : public JSReceiverData {
|
||||
return object_create_map_;
|
||||
}
|
||||
|
||||
ObjectData* GetOwnConstantElement(JSHeapBroker* broker, uint32_t index,
|
||||
bool serialize);
|
||||
ObjectData* GetOwnDataProperty(JSHeapBroker* broker,
|
||||
Representation representation,
|
||||
FieldIndex field_index, bool serialize);
|
||||
ObjectData* GetOwnConstantElement(
|
||||
JSHeapBroker* broker, uint32_t index,
|
||||
SerializationPolicy policy = SerializationPolicy::kAssumeSerialized);
|
||||
ObjectData* GetOwnDataProperty(
|
||||
JSHeapBroker* broker, Representation representation,
|
||||
FieldIndex field_index,
|
||||
SerializationPolicy policy = SerializationPolicy::kAssumeSerialized);
|
||||
|
||||
// This method is only used to assert our invariants.
|
||||
bool cow_or_empty_elements_tenured() const;
|
||||
@ -369,12 +371,12 @@ ObjectRef GetOwnDataPropertyFromHeap(JSHeapBroker* broker,
|
||||
|
||||
ObjectData* JSObjectData::GetOwnConstantElement(JSHeapBroker* broker,
|
||||
uint32_t index,
|
||||
bool serialize) {
|
||||
SerializationPolicy policy) {
|
||||
for (auto const& p : own_constant_elements_) {
|
||||
if (p.first == index) return p.second;
|
||||
}
|
||||
|
||||
if (!serialize) {
|
||||
if (policy == SerializationPolicy::kAssumeSerialized) {
|
||||
TRACE_MISSING(broker, "knowledge about index " << index << " on " << this);
|
||||
return nullptr;
|
||||
}
|
||||
@ -389,11 +391,11 @@ ObjectData* JSObjectData::GetOwnConstantElement(JSHeapBroker* broker,
|
||||
ObjectData* JSObjectData::GetOwnDataProperty(JSHeapBroker* broker,
|
||||
Representation representation,
|
||||
FieldIndex field_index,
|
||||
bool serialize) {
|
||||
SerializationPolicy policy) {
|
||||
auto p = own_properties_.find(field_index.property_index());
|
||||
if (p != own_properties_.end()) return p->second;
|
||||
|
||||
if (!serialize) {
|
||||
if (policy == SerializationPolicy::kAssumeSerialized) {
|
||||
TRACE_MISSING(broker, "knowledge about property with index "
|
||||
<< field_index.property_index() << " on "
|
||||
<< this);
|
||||
@ -581,12 +583,15 @@ class ContextData : public HeapObjectData {
|
||||
|
||||
// {previous} will return the closest valid context possible to desired
|
||||
// {depth}, decrementing {depth} for each previous link successfully followed.
|
||||
// If {serialize} is true, it will serialize contexts along the way.
|
||||
ContextData* previous(JSHeapBroker* broker, size_t* depth, bool serialize);
|
||||
ContextData* previous(
|
||||
JSHeapBroker* broker, size_t* depth,
|
||||
SerializationPolicy policy = SerializationPolicy::kAssumeSerialized);
|
||||
|
||||
// Returns nullptr if the slot index isn't valid or wasn't serialized
|
||||
// (unless {serialize} is true).
|
||||
ObjectData* GetSlot(JSHeapBroker* broker, int index, bool serialize);
|
||||
// Returns nullptr if the slot index isn't valid or wasn't serialized,
|
||||
// unless {policy} is {kSerializeIfNeeded}.
|
||||
ObjectData* GetSlot(
|
||||
JSHeapBroker* broker, int index,
|
||||
SerializationPolicy policy = SerializationPolicy::kAssumeSerialized);
|
||||
|
||||
private:
|
||||
ZoneMap<int, ObjectData*> slots_;
|
||||
@ -598,10 +603,11 @@ ContextData::ContextData(JSHeapBroker* broker, ObjectData** storage,
|
||||
: HeapObjectData(broker, storage, object), slots_(broker->zone()) {}
|
||||
|
||||
ContextData* ContextData::previous(JSHeapBroker* broker, size_t* depth,
|
||||
bool serialize) {
|
||||
SerializationPolicy policy) {
|
||||
if (*depth == 0) return this;
|
||||
|
||||
if (serialize && previous_ == nullptr) {
|
||||
if (policy == SerializationPolicy::kSerializeIfNeeded &&
|
||||
previous_ == nullptr) {
|
||||
TraceScope tracer(broker, this, "ContextData::previous");
|
||||
Handle<Context> context = Handle<Context>::cast(object());
|
||||
Object prev = context->unchecked_previous();
|
||||
@ -612,20 +618,20 @@ ContextData* ContextData::previous(JSHeapBroker* broker, size_t* depth,
|
||||
|
||||
if (previous_ != nullptr) {
|
||||
*depth = *depth - 1;
|
||||
return previous_->previous(broker, depth, serialize);
|
||||
return previous_->previous(broker, depth, policy);
|
||||
}
|
||||
return this;
|
||||
}
|
||||
|
||||
ObjectData* ContextData::GetSlot(JSHeapBroker* broker, int index,
|
||||
bool serialize) {
|
||||
SerializationPolicy policy) {
|
||||
CHECK_GE(index, 0);
|
||||
auto search = slots_.find(index);
|
||||
if (search != slots_.end()) {
|
||||
return search->second;
|
||||
}
|
||||
|
||||
if (serialize) {
|
||||
if (policy == SerializationPolicy::kSerializeIfNeeded) {
|
||||
Handle<Context> context = Handle<Context>::cast(object());
|
||||
if (index < context->length()) {
|
||||
TraceScope tracer(broker, this, "ContextData::GetSlot");
|
||||
@ -685,8 +691,9 @@ class StringData : public NameData {
|
||||
bool is_external_string() const { return is_external_string_; }
|
||||
bool is_seq_string() const { return is_seq_string_; }
|
||||
|
||||
StringData* GetCharAsString(JSHeapBroker* broker, uint32_t index,
|
||||
bool serialize);
|
||||
StringData* GetCharAsString(
|
||||
JSHeapBroker* broker, uint32_t index,
|
||||
SerializationPolicy policy = SerializationPolicy::kAssumeSerialized);
|
||||
|
||||
private:
|
||||
int const length_;
|
||||
@ -735,14 +742,14 @@ class InternalizedStringData : public StringData {
|
||||
};
|
||||
|
||||
StringData* StringData::GetCharAsString(JSHeapBroker* broker, uint32_t index,
|
||||
bool serialize) {
|
||||
SerializationPolicy policy) {
|
||||
if (index >= static_cast<uint32_t>(length())) return nullptr;
|
||||
|
||||
for (auto const& p : chars_as_strings_) {
|
||||
if (p.first == index) return p.second;
|
||||
}
|
||||
|
||||
if (!serialize) {
|
||||
if (policy == SerializationPolicy::kAssumeSerialized) {
|
||||
TRACE_MISSING(broker, "knowledge about index " << index << " on " << this);
|
||||
return nullptr;
|
||||
}
|
||||
@ -1516,8 +1523,9 @@ class JSArrayData : public JSObjectData {
|
||||
void Serialize(JSHeapBroker* broker);
|
||||
ObjectData* length() const { return length_; }
|
||||
|
||||
ObjectData* GetOwnElement(JSHeapBroker* broker, uint32_t index,
|
||||
bool serialize);
|
||||
ObjectData* GetOwnElement(
|
||||
JSHeapBroker* broker, uint32_t index,
|
||||
SerializationPolicy policy = SerializationPolicy::kAssumeSerialized);
|
||||
|
||||
private:
|
||||
bool serialized_ = false;
|
||||
@ -1546,12 +1554,12 @@ void JSArrayData::Serialize(JSHeapBroker* broker) {
|
||||
}
|
||||
|
||||
ObjectData* JSArrayData::GetOwnElement(JSHeapBroker* broker, uint32_t index,
|
||||
bool serialize) {
|
||||
SerializationPolicy policy) {
|
||||
for (auto const& p : own_elements_) {
|
||||
if (p.first == index) return p.second;
|
||||
}
|
||||
|
||||
if (!serialize) {
|
||||
if (policy == SerializationPolicy::kAssumeSerialized) {
|
||||
TRACE_MISSING(broker, "knowledge about index " << index << " on " << this);
|
||||
return nullptr;
|
||||
}
|
||||
@ -1768,8 +1776,9 @@ class JSGlobalProxyData : public JSObjectData {
|
||||
JSGlobalProxyData(JSHeapBroker* broker, ObjectData** storage,
|
||||
Handle<JSGlobalProxy> object);
|
||||
|
||||
PropertyCellData* GetPropertyCell(JSHeapBroker* broker, NameData* name,
|
||||
bool serialize);
|
||||
PropertyCellData* GetPropertyCell(
|
||||
JSHeapBroker* broker, NameData* name,
|
||||
SerializationPolicy policy = SerializationPolicy::kAssumeSerialized);
|
||||
|
||||
private:
|
||||
// Properties that either
|
||||
@ -1799,15 +1808,14 @@ base::Optional<PropertyCellRef> GetPropertyCellFromHeap(JSHeapBroker* broker,
|
||||
}
|
||||
} // namespace
|
||||
|
||||
PropertyCellData* JSGlobalProxyData::GetPropertyCell(JSHeapBroker* broker,
|
||||
NameData* name,
|
||||
bool serialize) {
|
||||
PropertyCellData* JSGlobalProxyData::GetPropertyCell(
|
||||
JSHeapBroker* broker, NameData* name, SerializationPolicy policy) {
|
||||
CHECK_NOT_NULL(name);
|
||||
for (auto const& p : properties_) {
|
||||
if (p.first == name) return p.second;
|
||||
}
|
||||
|
||||
if (!serialize) {
|
||||
if (policy == SerializationPolicy::kAssumeSerialized) {
|
||||
TRACE_MISSING(broker, "knowledge about global property " << name);
|
||||
return nullptr;
|
||||
}
|
||||
@ -2113,7 +2121,8 @@ bool ObjectRef::equals(const ObjectRef& other) const {
|
||||
|
||||
Isolate* ObjectRef::isolate() const { return broker()->isolate(); }
|
||||
|
||||
ContextRef ContextRef::previous(size_t* depth, bool serialize) const {
|
||||
ContextRef ContextRef::previous(size_t* depth,
|
||||
SerializationPolicy policy) const {
|
||||
DCHECK_NOT_NULL(depth);
|
||||
if (broker()->mode() == JSHeapBroker::kDisabled) {
|
||||
AllowHandleAllocation handle_allocation;
|
||||
@ -2126,10 +2135,11 @@ ContextRef ContextRef::previous(size_t* depth, bool serialize) const {
|
||||
return ContextRef(broker(), handle(current, broker()->isolate()));
|
||||
}
|
||||
ContextData* current = this->data()->AsContext();
|
||||
return ContextRef(broker(), current->previous(broker(), depth, serialize));
|
||||
return ContextRef(broker(), current->previous(broker(), depth, policy));
|
||||
}
|
||||
|
||||
base::Optional<ObjectRef> ContextRef::get(int index, bool serialize) const {
|
||||
base::Optional<ObjectRef> ContextRef::get(int index,
|
||||
SerializationPolicy policy) const {
|
||||
if (broker()->mode() == JSHeapBroker::kDisabled) {
|
||||
AllowHandleAllocation handle_allocation;
|
||||
AllowHandleDereference handle_dereference;
|
||||
@ -2137,7 +2147,7 @@ base::Optional<ObjectRef> ContextRef::get(int index, bool serialize) const {
|
||||
return ObjectRef(broker(), value);
|
||||
}
|
||||
ObjectData* optional_slot =
|
||||
data()->AsContext()->GetSlot(broker(), index, serialize);
|
||||
data()->AsContext()->GetSlot(broker(), index, policy);
|
||||
if (optional_slot != nullptr) {
|
||||
return ObjectRef(broker(), optional_slot);
|
||||
}
|
||||
@ -3083,7 +3093,7 @@ bool FunctionTemplateInfoRef::has_call_code() const {
|
||||
BIMODAL_ACCESSOR_C(FunctionTemplateInfo, bool, accept_any_receiver)
|
||||
|
||||
HolderLookupResult FunctionTemplateInfoRef::LookupHolderOfExpectedType(
|
||||
MapRef receiver_map, bool serialize) {
|
||||
MapRef receiver_map, SerializationPolicy policy) {
|
||||
const HolderLookupResult not_found;
|
||||
|
||||
if (broker()->mode() == JSHeapBroker::kDisabled) {
|
||||
@ -3119,7 +3129,7 @@ HolderLookupResult FunctionTemplateInfoRef::LookupHolderOfExpectedType(
|
||||
if (lookup_it != fti_data->known_receivers().cend()) {
|
||||
return lookup_it->second;
|
||||
}
|
||||
if (!serialize) {
|
||||
if (policy == SerializationPolicy::kAssumeSerialized) {
|
||||
TRACE_BROKER_MISSING(broker(),
|
||||
"holder for receiver with map " << receiver_map);
|
||||
return not_found;
|
||||
@ -3344,7 +3354,7 @@ Maybe<double> ObjectRef::OddballToNumber() const {
|
||||
}
|
||||
|
||||
base::Optional<ObjectRef> ObjectRef::GetOwnConstantElement(
|
||||
uint32_t index, bool serialize) const {
|
||||
uint32_t index, SerializationPolicy policy) const {
|
||||
if (broker()->mode() == JSHeapBroker::kDisabled) {
|
||||
return (IsJSObject() || IsString())
|
||||
? GetOwnElementFromHeap(broker(), object(), index, true)
|
||||
@ -3353,9 +3363,9 @@ base::Optional<ObjectRef> ObjectRef::GetOwnConstantElement(
|
||||
ObjectData* element = nullptr;
|
||||
if (IsJSObject()) {
|
||||
element =
|
||||
data()->AsJSObject()->GetOwnConstantElement(broker(), index, serialize);
|
||||
data()->AsJSObject()->GetOwnConstantElement(broker(), index, policy);
|
||||
} else if (IsString()) {
|
||||
element = data()->AsString()->GetCharAsString(broker(), index, serialize);
|
||||
element = data()->AsString()->GetCharAsString(broker(), index, policy);
|
||||
}
|
||||
if (element == nullptr) return base::nullopt;
|
||||
return ObjectRef(broker(), element);
|
||||
@ -3363,26 +3373,26 @@ base::Optional<ObjectRef> ObjectRef::GetOwnConstantElement(
|
||||
|
||||
base::Optional<ObjectRef> JSObjectRef::GetOwnDataProperty(
|
||||
Representation field_representation, FieldIndex index,
|
||||
bool serialize) const {
|
||||
SerializationPolicy policy) const {
|
||||
if (broker()->mode() == JSHeapBroker::kDisabled) {
|
||||
return GetOwnDataPropertyFromHeap(broker(),
|
||||
Handle<JSObject>::cast(object()),
|
||||
field_representation, index);
|
||||
}
|
||||
ObjectData* property = data()->AsJSObject()->GetOwnDataProperty(
|
||||
broker(), field_representation, index, serialize);
|
||||
broker(), field_representation, index, policy);
|
||||
if (property == nullptr) return base::nullopt;
|
||||
return ObjectRef(broker(), property);
|
||||
}
|
||||
|
||||
base::Optional<ObjectRef> JSArrayRef::GetOwnCowElement(uint32_t index,
|
||||
bool serialize) const {
|
||||
base::Optional<ObjectRef> JSArrayRef::GetOwnCowElement(
|
||||
uint32_t index, SerializationPolicy policy) const {
|
||||
if (broker()->mode() == JSHeapBroker::kDisabled) {
|
||||
if (!object()->elements().IsCowArray()) return base::nullopt;
|
||||
return GetOwnElementFromHeap(broker(), object(), index, false);
|
||||
}
|
||||
|
||||
if (serialize) {
|
||||
if (policy == SerializationPolicy::kSerializeIfNeeded) {
|
||||
data()->AsJSObject()->SerializeElements(broker());
|
||||
} else if (!data()->AsJSObject()->serialized_elements()) {
|
||||
TRACE(broker(), "'elements' on " << this);
|
||||
@ -3391,7 +3401,7 @@ base::Optional<ObjectRef> JSArrayRef::GetOwnCowElement(uint32_t index,
|
||||
if (!elements().map().IsFixedCowArrayMap()) return base::nullopt;
|
||||
|
||||
ObjectData* element =
|
||||
data()->AsJSArray()->GetOwnElement(broker(), index, serialize);
|
||||
data()->AsJSArray()->GetOwnElement(broker(), index, policy);
|
||||
if (element == nullptr) return base::nullopt;
|
||||
return ObjectRef(broker(), element);
|
||||
}
|
||||
@ -3667,10 +3677,9 @@ bool JSFunctionRef::IsSerializedForCompilation() const {
|
||||
shared().IsSerializedForCompilation(feedback_vector());
|
||||
}
|
||||
|
||||
JSArrayRef SharedFunctionInfoRef::GetTemplateObject(ObjectRef description,
|
||||
FeedbackVectorRef vector,
|
||||
FeedbackSlot slot,
|
||||
bool serialize) {
|
||||
JSArrayRef SharedFunctionInfoRef::GetTemplateObject(
|
||||
ObjectRef description, FeedbackVectorRef vector, FeedbackSlot slot,
|
||||
SerializationPolicy policy) {
|
||||
// Look in the feedback vector for the array. A Smi indicates that it's
|
||||
// not yet cached here.
|
||||
ObjectRef candidate = vector.get(slot);
|
||||
@ -3693,7 +3702,7 @@ JSArrayRef SharedFunctionInfoRef::GetTemplateObject(ObjectRef description,
|
||||
JSArrayData* array = data()->AsSharedFunctionInfo()->GetTemplateObject(slot);
|
||||
if (array != nullptr) return JSArrayRef(broker(), array);
|
||||
|
||||
CHECK(serialize);
|
||||
CHECK_EQ(policy, SerializationPolicy::kSerializeIfNeeded);
|
||||
CHECK(broker()->SerializingAllowed());
|
||||
|
||||
Handle<TemplateObjectDescription> tod =
|
||||
@ -3825,13 +3834,13 @@ void FunctionTemplateInfoRef::SerializeCallCode() {
|
||||
}
|
||||
|
||||
base::Optional<PropertyCellRef> JSGlobalProxyRef::GetPropertyCell(
|
||||
NameRef const& name, bool serialize) const {
|
||||
NameRef const& name, SerializationPolicy policy) const {
|
||||
if (broker()->mode() == JSHeapBroker::kDisabled) {
|
||||
return GetPropertyCellFromHeap(broker(), name.object());
|
||||
}
|
||||
PropertyCellData* property_cell_data =
|
||||
data()->AsJSGlobalProxy()->GetPropertyCell(
|
||||
broker(), name.data()->AsName(), serialize);
|
||||
data()->AsJSGlobalProxy()->GetPropertyCell(broker(),
|
||||
name.data()->AsName(), policy);
|
||||
if (property_cell_data == nullptr) return base::nullopt;
|
||||
return PropertyCellRef(broker(), property_cell_data);
|
||||
}
|
||||
@ -4121,7 +4130,8 @@ GlobalAccessFeedback const* JSHeapBroker::ProcessFeedbackForGlobalAccess(
|
||||
}
|
||||
ContextRef context_ref(this, context);
|
||||
if (immutable) {
|
||||
context_ref.get(context_slot_index, true);
|
||||
context_ref.get(context_slot_index,
|
||||
SerializationPolicy::kSerializeIfNeeded);
|
||||
}
|
||||
return new (zone())
|
||||
GlobalAccessFeedback(context_ref, context_slot_index, immutable);
|
||||
@ -4412,7 +4422,7 @@ ForInFeedback const* ProcessedFeedback::AsForIn() const {
|
||||
|
||||
BytecodeAnalysis const& JSHeapBroker::GetBytecodeAnalysis(
|
||||
Handle<BytecodeArray> bytecode_array, BailoutId osr_bailout_id,
|
||||
bool analyze_liveness, bool serialize) {
|
||||
bool analyze_liveness, SerializationPolicy policy) {
|
||||
ObjectData* bytecode_array_data = GetData(bytecode_array);
|
||||
CHECK_NOT_NULL(bytecode_array_data);
|
||||
|
||||
@ -4432,7 +4442,7 @@ BytecodeAnalysis const& JSHeapBroker::GetBytecodeAnalysis(
|
||||
return *it->second;
|
||||
}
|
||||
|
||||
CHECK(serialize);
|
||||
CHECK_EQ(policy, SerializationPolicy::kSerializeIfNeeded);
|
||||
BytecodeAnalysis* analysis = new (zone()) BytecodeAnalysis(
|
||||
bytecode_array, zone(), osr_bailout_id, analyze_liveness);
|
||||
DCHECK_EQ(analysis->osr_bailout_id(), osr_bailout_id);
|
||||
|
@ -129,7 +129,8 @@ class V8_EXPORT_PRIVATE JSHeapBroker {
|
||||
FeedbackSource const& source);
|
||||
BytecodeAnalysis const& GetBytecodeAnalysis(
|
||||
Handle<BytecodeArray> bytecode_array, BailoutId osr_offset,
|
||||
bool analyze_liveness, bool serialize);
|
||||
bool analyze_liveness,
|
||||
SerializationPolicy policy = SerializationPolicy::kAssumeSerialized);
|
||||
|
||||
// Binary, comparison and for-in hints can be fully expressed via
|
||||
// an enum. Insufficient feedback is signaled by <Hint enum>::kNone.
|
||||
|
@ -459,7 +459,8 @@ class SerializerForBackgroundCompilation {
|
||||
void IncorporateJumpTargetEnvironment(int target_offset);
|
||||
|
||||
Handle<BytecodeArray> bytecode_array() const;
|
||||
BytecodeAnalysis const& GetBytecodeAnalysis(bool serialize);
|
||||
BytecodeAnalysis const& GetBytecodeAnalysis(
|
||||
SerializationPolicy policy = SerializationPolicy::kAssumeSerialized);
|
||||
|
||||
JSHeapBroker* broker() const { return broker_; }
|
||||
CompilationDependencies* dependencies() const { return dependencies_; }
|
||||
@ -960,16 +961,17 @@ Handle<BytecodeArray> SerializerForBackgroundCompilation::bytecode_array()
|
||||
}
|
||||
|
||||
BytecodeAnalysis const& SerializerForBackgroundCompilation::GetBytecodeAnalysis(
|
||||
bool serialize) {
|
||||
SerializationPolicy policy) {
|
||||
return broker()->GetBytecodeAnalysis(
|
||||
bytecode_array(), osr_offset(),
|
||||
flags() &
|
||||
SerializerForBackgroundCompilationFlag::kAnalyzeEnvironmentLiveness,
|
||||
serialize);
|
||||
policy);
|
||||
}
|
||||
|
||||
void SerializerForBackgroundCompilation::TraverseBytecode() {
|
||||
BytecodeAnalysis const& bytecode_analysis = GetBytecodeAnalysis(true);
|
||||
BytecodeAnalysis const& bytecode_analysis =
|
||||
GetBytecodeAnalysis(SerializationPolicy::kSerializeIfNeeded);
|
||||
BytecodeArrayRef(broker(), bytecode_array()).SerializeForCompilation();
|
||||
|
||||
BytecodeArrayIterator iterator(bytecode_array());
|
||||
@ -1043,7 +1045,8 @@ void SerializerForBackgroundCompilation::VisitGetTemplateObject(
|
||||
broker(), environment()->function().feedback_vector());
|
||||
SharedFunctionInfoRef shared(broker(), environment()->function().shared());
|
||||
JSArrayRef template_object =
|
||||
shared.GetTemplateObject(description, feedback_vector, slot, true);
|
||||
shared.GetTemplateObject(description, feedback_vector, slot,
|
||||
SerializationPolicy::kSerializeIfNeeded);
|
||||
environment()->accumulator_hints().Clear();
|
||||
environment()->accumulator_hints().AddConstant(template_object.object());
|
||||
}
|
||||
@ -1150,7 +1153,8 @@ void SerializerForBackgroundCompilation::VisitPopContext(
|
||||
void SerializerForBackgroundCompilation::ProcessImmutableLoad(
|
||||
ContextRef const& context_ref, int slot, ContextProcessingMode mode) {
|
||||
DCHECK(mode == kSerializeSlot || mode == kSerializeSlotAndAddToAccumulator);
|
||||
base::Optional<ObjectRef> slot_value = context_ref.get(slot, true);
|
||||
base::Optional<ObjectRef> slot_value =
|
||||
context_ref.get(slot, SerializationPolicy::kSerializeIfNeeded);
|
||||
|
||||
// Also, put the object into the constant hints for the accumulator.
|
||||
if (mode == kSerializeSlotAndAddToAccumulator && slot_value.has_value()) {
|
||||
@ -1171,7 +1175,8 @@ void SerializerForBackgroundCompilation::ProcessContextAccess(
|
||||
// Walk this context to the given depth and serialize the slot found.
|
||||
ContextRef context_ref(broker(), x);
|
||||
size_t remaining_depth = depth;
|
||||
context_ref = context_ref.previous(&remaining_depth, true);
|
||||
context_ref = context_ref.previous(
|
||||
&remaining_depth, SerializationPolicy::kSerializeIfNeeded);
|
||||
if (remaining_depth == 0 && mode != kIgnoreSlot) {
|
||||
ProcessImmutableLoad(context_ref, slot, mode);
|
||||
}
|
||||
@ -1181,7 +1186,8 @@ void SerializerForBackgroundCompilation::ProcessContextAccess(
|
||||
if (x.distance <= static_cast<unsigned int>(depth)) {
|
||||
ContextRef context_ref(broker(), x.context);
|
||||
size_t remaining_depth = depth - x.distance;
|
||||
context_ref = context_ref.previous(&remaining_depth, true);
|
||||
context_ref = context_ref.previous(
|
||||
&remaining_depth, SerializationPolicy::kSerializeIfNeeded);
|
||||
if (remaining_depth == 0 && mode != kIgnoreSlot) {
|
||||
ProcessImmutableLoad(context_ref, slot, mode);
|
||||
}
|
||||
@ -1477,7 +1483,8 @@ void SerializerForBackgroundCompilation::VisitCallJSRuntime(
|
||||
// BytecodeGraphBuilder::VisitCallJSRuntime needs the {runtime_index}
|
||||
// slot in the native context to be serialized.
|
||||
const int runtime_index = iterator->GetNativeContextIndexOperand(0);
|
||||
broker()->native_context().get(runtime_index, true);
|
||||
broker()->native_context().get(runtime_index,
|
||||
SerializationPolicy::kSerializeIfNeeded);
|
||||
}
|
||||
|
||||
Hints SerializerForBackgroundCompilation::RunChildSerializer(
|
||||
@ -1701,14 +1708,12 @@ void SerializerForBackgroundCompilation::ProcessApiCall(
|
||||
|
||||
void SerializerForBackgroundCompilation::ProcessReceiverMapForApiCall(
|
||||
FunctionTemplateInfoRef target, Handle<Map> receiver) {
|
||||
if (receiver->is_access_check_needed()) {
|
||||
return;
|
||||
if (!receiver->is_access_check_needed()) {
|
||||
MapRef receiver_map(broker(), receiver);
|
||||
TRACE_BROKER(broker(), "Serializing holder for target:" << target);
|
||||
target.LookupHolderOfExpectedType(receiver_map,
|
||||
SerializationPolicy::kSerializeIfNeeded);
|
||||
}
|
||||
|
||||
MapRef receiver_map(broker(), receiver);
|
||||
TRACE_BROKER(broker(), "Serializing holder for target:" << target);
|
||||
|
||||
target.LookupHolderOfExpectedType(receiver_map, true);
|
||||
}
|
||||
|
||||
void SerializerForBackgroundCompilation::ProcessBuiltinCall(
|
||||
@ -1872,7 +1877,8 @@ PropertyAccessInfo SerializerForBackgroundCompilation::ProcessMapForRegExpTest(
|
||||
// The property is on the prototype chain.
|
||||
JSObjectRef holder_ref(broker(), holder);
|
||||
holder_ref.GetOwnDataProperty(ai_exec.field_representation(),
|
||||
ai_exec.field_index(), true);
|
||||
ai_exec.field_index(),
|
||||
SerializationPolicy::kSerializeIfNeeded);
|
||||
}
|
||||
return ai_exec;
|
||||
}
|
||||
@ -1890,7 +1896,8 @@ void SerializerForBackgroundCompilation::ProcessHintsForRegExpTest(
|
||||
// The property is on the object itself.
|
||||
JSObjectRef holder_ref(broker(), regexp);
|
||||
holder_ref.GetOwnDataProperty(ai_exec.field_representation(),
|
||||
ai_exec.field_index(), true);
|
||||
ai_exec.field_index(),
|
||||
SerializationPolicy::kSerializeIfNeeded);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1983,7 +1990,7 @@ void SerializerForBackgroundCompilation::VisitSwitchOnSmiNoFeedback(
|
||||
|
||||
void SerializerForBackgroundCompilation::VisitSwitchOnGeneratorState(
|
||||
interpreter::BytecodeArrayIterator* iterator) {
|
||||
for (const auto& target : GetBytecodeAnalysis(false).resume_jump_targets()) {
|
||||
for (const auto& target : GetBytecodeAnalysis().resume_jump_targets()) {
|
||||
ContributeToJumpTargetEnvironment(target.target_offset());
|
||||
}
|
||||
}
|
||||
@ -2291,12 +2298,14 @@ void SerializerForBackgroundCompilation::ProcessKeyedPropertyAccess(
|
||||
// TODO(neis): Do this for integer-HeapNumbers too?
|
||||
if (key_ref.IsSmi() && key_ref.AsSmi() >= 0) {
|
||||
base::Optional<ObjectRef> element =
|
||||
receiver_ref.GetOwnConstantElement(key_ref.AsSmi(), true);
|
||||
receiver_ref.GetOwnConstantElement(
|
||||
key_ref.AsSmi(), SerializationPolicy::kSerializeIfNeeded);
|
||||
if (!element.has_value() && receiver_ref.IsJSArray()) {
|
||||
// We didn't find a constant element, but if the receiver is a
|
||||
// cow-array we can exploit the fact that any future write to the
|
||||
// element will replace the whole elements storage.
|
||||
receiver_ref.AsJSArray().GetOwnCowElement(key_ref.AsSmi(), true);
|
||||
receiver_ref.AsJSArray().GetOwnCowElement(
|
||||
key_ref.AsSmi(), SerializationPolicy::kSerializeIfNeeded);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -2314,8 +2323,8 @@ SerializerForBackgroundCompilation::ProcessMapForNamedPropertyAccess(
|
||||
base::Optional<JSObjectRef> receiver) {
|
||||
// For JSNativeContextSpecialization::ReduceNamedAccess.
|
||||
if (receiver_map.IsMapOfCurrentGlobalProxy()) {
|
||||
broker()->native_context().global_proxy_object().GetPropertyCell(name,
|
||||
true);
|
||||
broker()->native_context().global_proxy_object().GetPropertyCell(
|
||||
name, SerializationPolicy::kSerializeIfNeeded);
|
||||
}
|
||||
|
||||
AccessInfoFactory access_info_factory(broker(), dependencies(),
|
||||
@ -2360,9 +2369,9 @@ SerializerForBackgroundCompilation::ProcessMapForNamedPropertyAccess(
|
||||
}
|
||||
|
||||
if (holder.has_value()) {
|
||||
base::Optional<ObjectRef> constant(
|
||||
holder->GetOwnDataProperty(access_info.field_representation(),
|
||||
access_info.field_index(), true));
|
||||
base::Optional<ObjectRef> constant(holder->GetOwnDataProperty(
|
||||
access_info.field_representation(), access_info.field_index(),
|
||||
SerializationPolicy::kSerializeIfNeeded));
|
||||
if (constant.has_value()) {
|
||||
environment()->accumulator_hints().AddConstant(constant->object());
|
||||
}
|
||||
@ -2398,7 +2407,8 @@ void SerializerForBackgroundCompilation::ProcessNamedPropertyAccess(
|
||||
}
|
||||
// For JSNativeContextSpecialization::ReduceNamedAccessFromNexus.
|
||||
if (object.equals(global_proxy)) {
|
||||
global_proxy.GetPropertyCell(name, true);
|
||||
global_proxy.GetPropertyCell(name,
|
||||
SerializationPolicy::kSerializeIfNeeded);
|
||||
}
|
||||
// For JSNativeContextSpecialization::ReduceJSLoadNamed.
|
||||
if (mode == AccessMode::kLoad && object.IsJSFunction() &&
|
||||
@ -2489,7 +2499,8 @@ void SerializerForBackgroundCompilation::ProcessConstantForInstanceOf(
|
||||
JSObjectRef holder_ref = found_on_proto ? JSObjectRef(broker(), holder)
|
||||
: constructor.AsJSObject();
|
||||
base::Optional<ObjectRef> constant = holder_ref.GetOwnDataProperty(
|
||||
access_info.field_representation(), access_info.field_index(), true);
|
||||
access_info.field_representation(), access_info.field_index(),
|
||||
SerializationPolicy::kSerializeIfNeeded);
|
||||
CHECK(constant.has_value());
|
||||
if (constant->IsJSFunction()) {
|
||||
JSFunctionRef function = constant->AsJSFunction();
|
||||
|
Loading…
Reference in New Issue
Block a user