OLD | NEW |
1 // Copyright 2011 the V8 project authors. All rights reserved. | 1 // Copyright 2012 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 |
11 // with the distribution. | 11 // with the distribution. |
(...skipping 710 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
722 | 722 |
723 if (cache_result) { | 723 if (cache_result) { |
724 indices = isolate->factory()->NewFixedArray(num_enum); | 724 indices = isolate->factory()->NewFixedArray(num_enum); |
725 sort_array2 = isolate->factory()->NewFixedArray(num_enum); | 725 sort_array2 = isolate->factory()->NewFixedArray(num_enum); |
726 } | 726 } |
727 | 727 |
728 Handle<DescriptorArray> descs = | 728 Handle<DescriptorArray> descs = |
729 Handle<DescriptorArray>(object->map()->instance_descriptors(), isolate); | 729 Handle<DescriptorArray>(object->map()->instance_descriptors(), isolate); |
730 | 730 |
731 for (int i = 0; i < descs->number_of_descriptors(); i++) { | 731 for (int i = 0; i < descs->number_of_descriptors(); i++) { |
732 if (descs->IsProperty(i) && !descs->IsDontEnum(i)) { | 732 if (descs->IsProperty(i) && !descs->GetDetails(i).IsDontEnum()) { |
733 storage->set(index, descs->GetKey(i)); | 733 storage->set(index, descs->GetKey(i)); |
734 PropertyDetails details(descs->GetDetails(i)); | 734 PropertyDetails details = descs->GetDetails(i); |
735 sort_array->set(index, Smi::FromInt(details.index())); | 735 sort_array->set(index, Smi::FromInt(details.index())); |
736 if (!indices.is_null()) { | 736 if (!indices.is_null()) { |
737 if (details.type() != FIELD) { | 737 if (details.type() != FIELD) { |
738 indices = Handle<FixedArray>(); | 738 indices = Handle<FixedArray>(); |
739 sort_array2 = Handle<FixedArray>(); | 739 sort_array2 = Handle<FixedArray>(); |
740 } else { | 740 } else { |
741 int field_index = Descriptor::IndexFromValue(descs->GetValue(i)); | 741 int field_index = Descriptor::IndexFromValue(descs->GetValue(i)); |
742 if (field_index >= map->inobject_properties()) { | 742 if (field_index >= map->inobject_properties()) { |
743 field_index = -(field_index - map->inobject_properties() + 1); | 743 field_index = -(field_index - map->inobject_properties() + 1); |
744 } | 744 } |
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
952 do { | 952 do { |
953 failure = false; | 953 failure = false; |
954 len = Utf8LengthHelper( | 954 len = Utf8LengthHelper( |
955 *str, 0, str->length(), false, kRecursionBudget, &failure, &dummy); | 955 *str, 0, str->length(), false, kRecursionBudget, &failure, &dummy); |
956 if (failure) FlattenString(str); | 956 if (failure) FlattenString(str); |
957 } while (failure); | 957 } while (failure); |
958 return len; | 958 return len; |
959 } | 959 } |
960 | 960 |
961 } } // namespace v8::internal | 961 } } // namespace v8::internal |
OLD | NEW |