OLD | NEW |
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 2602 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2613 PropertyDetails details = descriptors->GetDetails(i); | 2613 PropertyDetails details = descriptors->GetDetails(i); |
2614 PropertyDetails target_details = | 2614 PropertyDetails target_details = |
2615 current->instance_descriptors()->GetDetails(i); | 2615 current->instance_descriptors()->GetDetails(i); |
2616 if (details.attributes() != target_details.attributes()) return NULL; | 2616 if (details.attributes() != target_details.attributes()) return NULL; |
2617 if (details.type() == CALLBACKS) { | 2617 if (details.type() == CALLBACKS) { |
2618 if (target_details.type() != CALLBACKS) return NULL; | 2618 if (target_details.type() != CALLBACKS) return NULL; |
2619 if (descriptors->GetValue(i) != | 2619 if (descriptors->GetValue(i) != |
2620 current->instance_descriptors()->GetValue(i)) { | 2620 current->instance_descriptors()->GetValue(i)) { |
2621 return NULL; | 2621 return NULL; |
2622 } | 2622 } |
| 2623 } else if (target_details.type() == CALLBACKS) { |
| 2624 return NULL; |
2623 } | 2625 } |
2624 } | 2626 } |
2625 | 2627 |
2626 return current; | 2628 return current; |
2627 } | 2629 } |
2628 | 2630 |
2629 | 2631 |
2630 Map* Map::FindLastMatchMap(int verbatim, | 2632 Map* Map::FindLastMatchMap(int verbatim, |
2631 int length, | 2633 int length, |
2632 DescriptorArray* descriptors) { | 2634 DescriptorArray* descriptors) { |
(...skipping 13845 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
16478 #define ERROR_MESSAGES_TEXTS(C, T) T, | 16480 #define ERROR_MESSAGES_TEXTS(C, T) T, |
16479 static const char* error_messages_[] = { | 16481 static const char* error_messages_[] = { |
16480 ERROR_MESSAGES_LIST(ERROR_MESSAGES_TEXTS) | 16482 ERROR_MESSAGES_LIST(ERROR_MESSAGES_TEXTS) |
16481 }; | 16483 }; |
16482 #undef ERROR_MESSAGES_TEXTS | 16484 #undef ERROR_MESSAGES_TEXTS |
16483 return error_messages_[reason]; | 16485 return error_messages_[reason]; |
16484 } | 16486 } |
16485 | 16487 |
16486 | 16488 |
16487 } } // namespace v8::internal | 16489 } } // namespace v8::internal |
OLD | NEW |