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

Side by Side Diff: src/objects.cc

Issue 23676003: Merge verbatim descriptors from other (the descriptor of the map being updated) rather than this (d… (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 7 years, 3 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | test/mjsunit/regress/regress-merge-descriptors.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 the V8 project authors. All rights reserved. 1 // Copyright 2013 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 7799 matching lines...) Expand 10 before | Expand all | Expand 10 after
7810 ASSERT(result->number_of_descriptors() == new_size); 7810 ASSERT(result->number_of_descriptors() == new_size);
7811 7811
7812 DescriptorArray::WhitenessWitness witness(result); 7812 DescriptorArray::WhitenessWitness witness(result);
7813 7813
7814 int descriptor; 7814 int descriptor;
7815 7815
7816 // 0 -> |verbatim| 7816 // 0 -> |verbatim|
7817 int current_offset = 0; 7817 int current_offset = 0;
7818 for (descriptor = 0; descriptor < verbatim; descriptor++) { 7818 for (descriptor = 0; descriptor < verbatim; descriptor++) {
7819 if (GetDetails(descriptor).type() == FIELD) current_offset++; 7819 if (GetDetails(descriptor).type() == FIELD) current_offset++;
7820 result->CopyFrom(descriptor, this, descriptor, witness); 7820 result->CopyFrom(descriptor, other, descriptor, witness);
7821 } 7821 }
7822 7822
7823 // |verbatim| -> |valid| 7823 // |verbatim| -> |valid|
7824 for (; descriptor < valid; descriptor++) { 7824 for (; descriptor < valid; descriptor++) {
7825 Name* key = GetKey(descriptor); 7825 Name* key = GetKey(descriptor);
7826 PropertyDetails details = GetDetails(descriptor); 7826 PropertyDetails details = GetDetails(descriptor);
7827 PropertyDetails other_details = other->GetDetails(descriptor); 7827 PropertyDetails other_details = other->GetDetails(descriptor);
7828 7828
7829 if (details.type() == FIELD || other_details.type() == FIELD || 7829 if (details.type() == FIELD || other_details.type() == FIELD ||
7830 (store_mode == FORCE_FIELD && descriptor == modify_index) || 7830 (store_mode == FORCE_FIELD && descriptor == modify_index) ||
(...skipping 8170 matching lines...) Expand 10 before | Expand all | Expand 10 after
16001 #define ERROR_MESSAGES_TEXTS(C, T) T, 16001 #define ERROR_MESSAGES_TEXTS(C, T) T,
16002 static const char* error_messages_[] = { 16002 static const char* error_messages_[] = {
16003 ERROR_MESSAGES_LIST(ERROR_MESSAGES_TEXTS) 16003 ERROR_MESSAGES_LIST(ERROR_MESSAGES_TEXTS)
16004 }; 16004 };
16005 #undef ERROR_MESSAGES_TEXTS 16005 #undef ERROR_MESSAGES_TEXTS
16006 return error_messages_[reason]; 16006 return error_messages_[reason];
16007 } 16007 }
16008 16008
16009 16009
16010 } } // namespace v8::internal 16010 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « no previous file | test/mjsunit/regress/regress-merge-descriptors.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698