Commit 0377bccd authored by bmeurer@chromium.org's avatar bmeurer@chromium.org

Fix and cleanup Map::GeneralizeRepresentation().

TEST=mjsunit/regress/regress-365172-[1-3],mjsunit/field-type-tracking
R=svenpanne@chromium.org

Review URL: https://codereview.chromium.org/259993004

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@21006 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 629725d4
This diff is collapsed.
......@@ -3441,20 +3441,6 @@ class DescriptorArray: public FixedArray {
// array.
inline void Append(Descriptor* desc);
static Handle<DescriptorArray> Merge(Handle<Map> left_map,
int verbatim,
int valid,
int new_size,
int modify_index,
StoreMode store_mode,
Handle<Map> right_map)
V8_WARN_UNUSED_RESULT;
bool IsMoreGeneralThan(int verbatim,
int valid,
int new_size,
DescriptorArray* other);
static Handle<DescriptorArray> CopyUpTo(Handle<DescriptorArray> desc,
int enumeration_index,
int slack = 0);
......@@ -6733,7 +6719,6 @@ class Map: public HeapObject {
void DeprecateTransitionTree();
void DeprecateTarget(Name* key, DescriptorArray* new_descriptors);
Map* FindUpdatedMap(int verbatim, int length, DescriptorArray* descriptors);
Map* FindLastMatchMap(int verbatim, int length, DescriptorArray* descriptors);
void UpdateDescriptor(int descriptor_number, Descriptor* desc);
......
......@@ -66,6 +66,7 @@ class Descriptor BASE_EMBEDDED {
details_(attributes, type, representation, field_index) { }
friend class DescriptorArray;
friend class Map;
};
......
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