Commit 823a221a authored by jameslahm's avatar jameslahm Committed by V8 LUCI CQ

[web-snapshot] Allocate Context after setting up ScopeInfo

... in DeserializeContexts.

Allocate the context before filling the scope info with the correct
variable name may cause DCHECK failure in TorqueGeneratedClassVerifiers::ScopeInfoVerify.
This CL changes the context variables serialization order from
"name, value, name, value" to "name, name... value, value...".
And only allocate and fill the context after setting up the correct
scope info.

Bug: v8:12832
Change-Id: I6e91aa867a528b7ffcae85de0f2364d0f9ea1bd7
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3607374Reviewed-by: 's avatarMarja Hölttä <marja@chromium.org>
Commit-Queue: 王澳 <wangao.james@bytedance.com>
Cr-Commit-Position: refs/heads/main@{#80184}
parent fa1caae9
...@@ -925,6 +925,7 @@ void WebSnapshotSerializer::SerializeClass(Handle<JSFunction> function) { ...@@ -925,6 +925,7 @@ void WebSnapshotSerializer::SerializeClass(Handle<JSFunction> function) {
// - Variable count // - Variable count
// - For each variable: // - For each variable:
// - String id (name) // - String id (name)
// - For each variable:
// - Serialized value // - Serialized value
void WebSnapshotSerializer::SerializeContext(Handle<Context> context) { void WebSnapshotSerializer::SerializeContext(Handle<Context> context) {
uint32_t parent_context_id = 0; uint32_t parent_context_id = 0;
...@@ -953,6 +954,8 @@ void WebSnapshotSerializer::SerializeContext(Handle<Context> context) { ...@@ -953,6 +954,8 @@ void WebSnapshotSerializer::SerializeContext(Handle<Context> context) {
// TODO(v8:11525): support parameters // TODO(v8:11525): support parameters
// TODO(v8:11525): distinguish variable modes // TODO(v8:11525): distinguish variable modes
WriteStringId(handle(it->name(), isolate_), context_serializer_); WriteStringId(handle(it->name(), isolate_), context_serializer_);
}
for (auto it : ScopeInfo::IterateLocalNames(scope_info)) {
Handle<Object> value( Handle<Object> value(
context->get(scope_info->ContextHeaderLength() + it->index()), context->get(scope_info->ContextHeaderLength() + it->index()),
isolate_); isolate_);
...@@ -1644,21 +1647,6 @@ void WebSnapshotDeserializer::DeserializeContexts() { ...@@ -1644,21 +1647,6 @@ void WebSnapshotDeserializer::DeserializeContexts() {
parent_context = handle(isolate_->context(), isolate_); parent_context = handle(isolate_->context(), isolate_);
} }
// Allocate the FunctionContext after setting up the ScopeInfo to avoid
// pointing to a ScopeInfo which is not set up yet.
Handle<Context> context;
switch (context_type) {
case ContextType::FUNCTION:
context = factory()->NewFunctionContext(parent_context, scope_info);
break;
case ContextType::BLOCK:
context = factory()->NewBlockContext(parent_context, scope_info);
break;
default:
Throw("Unsupported context type");
return;
}
const int local_names_container_size = const int local_names_container_size =
has_inlined_local_names ? variable_count : 1; has_inlined_local_names ? variable_count : 1;
const int context_local_base = ScopeInfo::kVariablePartIndex; const int context_local_base = ScopeInfo::kVariablePartIndex;
...@@ -1696,7 +1684,24 @@ void WebSnapshotDeserializer::DeserializeContexts() { ...@@ -1696,7 +1684,24 @@ void WebSnapshotDeserializer::DeserializeContexts() {
ScopeInfo::IsStaticFlagBit::encode(IsStaticFlag::kNotStatic); ScopeInfo::IsStaticFlagBit::encode(IsStaticFlag::kNotStatic);
scope_info->set(context_local_info_base + variable_index, scope_info->set(context_local_info_base + variable_index,
Smi::FromInt(info)); Smi::FromInt(info));
}
// Allocate the FunctionContext after setting up the ScopeInfo to avoid
// pointing to a ScopeInfo which is not set up yet.
Handle<Context> context;
switch (context_type) {
case ContextType::FUNCTION:
context = factory()->NewFunctionContext(parent_context, scope_info);
break;
case ContextType::BLOCK:
context = factory()->NewBlockContext(parent_context, scope_info);
break;
default:
Throw("Unsupported context type");
return;
}
for (int variable_index = 0;
variable_index < static_cast<int>(variable_count); ++variable_index) {
int context_index = scope_info->ContextHeaderLength() + variable_index; int context_index = scope_info->ContextHeaderLength() + variable_index;
Object value = ReadValue(context, context_index); Object value = ReadValue(context, context_index);
context->set(context_index, value); context->set(context_index, value);
......
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