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

Unified Diff: src/bootstrapper.cc

Issue 848023002: Store embed-script flag as metadata into snapshot blob. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: addressed comment Created 5 years, 11 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/api.cc ('k') | src/heap/spaces.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/bootstrapper.cc
diff --git a/src/bootstrapper.cc b/src/bootstrapper.cc
index 308f7540692a4b9e89ee387779c1d4282fa6081a..0ece57c91d379892b33bede599b08334bd0c3637 100644
--- a/src/bootstrapper.cc
+++ b/src/bootstrapper.cc
@@ -2578,6 +2578,11 @@ bool Genesis::ConfigureApiObject(Handle<JSObject> object,
void Genesis::TransferNamedProperties(Handle<JSObject> from,
Handle<JSObject> to) {
+ // If JSObject::AddProperty asserts due to already existing property,
+ // it is likely due to both global objects sharing property name(s).
+ // Merging those two global objects is impossible.
+ // The global template must not create properties that already exist
+ // in the snapshotted global object.
if (from->HasFastProperties()) {
Handle<DescriptorArray> descs =
Handle<DescriptorArray>(from->map()->instance_descriptors());
« no previous file with comments | « src/api.cc ('k') | src/heap/spaces.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698