AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[builtins] Replace placeholders in constants table

Browse Source 
During builtins generation, parts of the builtins table may be filled
with placeholder code objects.

This CL ensures that such placeholders are replaced by the real
builtin object during finalization of the builtins constants table.

Bug: v8:6666
Change-Id: I3a2635b29b37690fd7e950b9f38d500704671afb
Reviewed-on: https://chromium-review.googlesource.com/934241
Reviewed-by: Yang Guo <yangguo@chromium.org>
Commit-Queue: Jakob Gruber <jgruber@chromium.org>
Cr-Commit-Position: refs/heads/master@{#51498}
This commit is contained in:
jgruber 2018-02-23 10:06:49 +01:00 committed by Commit Bot
parent 64cee29718
commit de9a101d20
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/builtins/constants-table-builder.cc
View File

@ -54,10 +54,19 @@ void BuiltinsConstantsTableBuilder::Finalize() {
Handle<FixedArray> table =
isolate_->factory()->NewFixedArray(map_.size(), TENURED);
Builtins* builtins = isolate_->builtins();
ConstantsMap::IteratableScope it_scope(&map_);
for (auto it = it_scope.begin(); it != it_scope.end(); ++it) {
uint32_t index = *it.entry();
table->set(index, it.key());
Object* value = it.key();
if (value->IsCode() && Code::cast(value)->kind() == Code::BUILTIN) {
// Replace placeholder code objects with the real builtin.
// See also: SetupIsolateDelegate::PopulateWithPlaceholders.
// TODO(jgruber): Deduplicate placeholders and their corresponding
// builtin.
value = builtins->builtin(Code::cast(value)->builtin_index());
}
table->set(index, value);
}
#ifdef DEBUG