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

Unified Diff: src/objects.cc

Issue 14756012: Support merging with distinct attributes. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 7 years, 7 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/objects.cc
diff --git a/src/objects.cc b/src/objects.cc
index 12318ba3819357601f919f9c7fcef41d220fcaef..b3c8d55cd81366a953d41a0f488ca2a888671476 100644
--- a/src/objects.cc
+++ b/src/objects.cc
@@ -7291,7 +7291,6 @@ MaybeObject* DescriptorArray::Merge(int verbatim,
Name* key = GetKey(descriptor);
PropertyDetails details = GetDetails(descriptor);
PropertyDetails other_details = other->GetDetails(descriptor);
- ASSERT(details.attributes() == other_details.attributes());
if (details.type() == FIELD || other_details.type() == FIELD ||
(details.type() == CONSTANT_FUNCTION &&
@@ -7301,7 +7300,7 @@ MaybeObject* DescriptorArray::Merge(int verbatim,
details.representation().generalize(other_details.representation());
FieldDescriptor d(key,
current_offset++,
- details.attributes(),
+ other_details.attributes(),
representation);
result->Set(descriptor, &d, witness);
} else {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698