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

[snapshot] reset JSConstructStub to conform runtime flag

Browse Source 
R=yangguo@chromium.org

Bug: v8:7305, v8:5536
Change-Id: I4750cf392dd60880e75e187a9091f62f9292ffe2
Reviewed-on: https://chromium-review.googlesource.com/866631
Reviewed-by: Yang Guo <yangguo@chromium.org>
Commit-Queue: Yang Guo <yangguo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#50619}
This commit is contained in:
Qingyan Li 2018-01-15 17:52:33 +08:00 committed by Commit Bot
parent 473d747dbe
commit 820211cc90
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/snapshot/deserializer.cc
View File

@ -655,6 +655,24 @@ bool Deserializer<AllocatorT>::ReadData(Object** current, Object** limit,
return true;
}
namespace {
int FixupJSConstructStub(Isolate* isolate, int builtin_id) {
if (isolate->serializer_enabled()) return builtin_id;
if (FLAG_harmony_restrict_constructor_return &&
builtin_id == Builtins::kJSConstructStubGenericUnrestrictedReturn) {
return Builtins::kJSConstructStubGenericRestrictedReturn;
} else if (!FLAG_harmony_restrict_constructor_return &&
builtin_id == Builtins::kJSConstructStubGenericRestrictedReturn) {
return Builtins::kJSConstructStubGenericUnrestrictedReturn;
} else {
return builtin_id;
}
}
} // namespace
template <class AllocatorT>
template <int where, int how, int within, int space_number_if_any>
Object** Deserializer<AllocatorT>::ReadDataCase(Isolate* isolate,
@ -705,7 +723,8 @@ Object** Deserializer<AllocatorT>::ReadDataCase(Isolate* isolate,
emit_write_barrier = isolate->heap()->InNewSpace(new_object);
} else {
DCHECK_EQ(where, kBuiltin);
int builtin_id = MaybeReplaceWithDeserializeLazy(source_.GetInt());
int raw_id = MaybeReplaceWithDeserializeLazy(source_.GetInt());
int builtin_id = FixupJSConstructStub(isolate, raw_id);
new_object = isolate->builtins()->builtin(builtin_id);
emit_write_barrier = false;
}