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 4168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4179 name, value, attributes, value_type, mode, extensibility_check); | 4179 name, value, attributes, value_type, mode, extensibility_check); |
4180 } | 4180 } |
4181 | 4181 |
4182 if (lookup.IsFound() && | 4182 if (lookup.IsFound() && |
4183 (lookup.type() == INTERCEPTOR || lookup.type() == CALLBACKS)) { | 4183 (lookup.type() == INTERCEPTOR || lookup.type() == CALLBACKS)) { |
4184 object->LocalLookupRealNamedProperty(*name, &lookup); | 4184 object->LocalLookupRealNamedProperty(*name, &lookup); |
4185 } | 4185 } |
4186 | 4186 |
4187 // Check for accessor in prototype chain removed here in clone. | 4187 // Check for accessor in prototype chain removed here in clone. |
4188 if (!lookup.IsFound()) { | 4188 if (!lookup.IsFound()) { |
| 4189 object->map()->LookupTransition(*object, *name, &lookup); |
| 4190 TransitionFlag flag = lookup.IsFound() |
| 4191 ? OMIT_TRANSITION : INSERT_TRANSITION; |
4189 // Neither properties nor transitions found. | 4192 // Neither properties nor transitions found. |
4190 return AddProperty(object, name, value, attributes, kNonStrictMode, | 4193 return AddProperty(object, name, value, attributes, kNonStrictMode, |
4191 MAY_BE_STORE_FROM_KEYED, extensibility_check, value_type, mode); | 4194 MAY_BE_STORE_FROM_KEYED, extensibility_check, value_type, mode, flag); |
4192 } | 4195 } |
4193 | 4196 |
4194 Handle<Object> old_value = isolate->factory()->the_hole_value(); | 4197 Handle<Object> old_value = isolate->factory()->the_hole_value(); |
4195 PropertyAttributes old_attributes = ABSENT; | 4198 PropertyAttributes old_attributes = ABSENT; |
4196 bool is_observed = FLAG_harmony_observation && | 4199 bool is_observed = FLAG_harmony_observation && |
4197 object->map()->is_observed() && | 4200 object->map()->is_observed() && |
4198 *name != isolate->heap()->hidden_string(); | 4201 *name != isolate->heap()->hidden_string(); |
4199 if (is_observed && lookup.IsProperty()) { | 4202 if (is_observed && lookup.IsProperty()) { |
4200 if (lookup.IsDataProperty()) old_value = | 4203 if (lookup.IsDataProperty()) old_value = |
4201 Object::GetProperty(object, name); | 4204 Object::GetProperty(object, name); |
(...skipping 12204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
16406 #define ERROR_MESSAGES_TEXTS(C, T) T, | 16409 #define ERROR_MESSAGES_TEXTS(C, T) T, |
16407 static const char* error_messages_[] = { | 16410 static const char* error_messages_[] = { |
16408 ERROR_MESSAGES_LIST(ERROR_MESSAGES_TEXTS) | 16411 ERROR_MESSAGES_LIST(ERROR_MESSAGES_TEXTS) |
16409 }; | 16412 }; |
16410 #undef ERROR_MESSAGES_TEXTS | 16413 #undef ERROR_MESSAGES_TEXTS |
16411 return error_messages_[reason]; | 16414 return error_messages_[reason]; |
16412 } | 16415 } |
16413 | 16416 |
16414 | 16417 |
16415 } } // namespace v8::internal | 16418 } } // namespace v8::internal |
OLD | NEW |