| 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 820 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 831 | 831 |
| 832 if (!result->IsProperty()) { | 832 if (!result->IsProperty()) { |
| 833 *attributes = ABSENT; | 833 *attributes = ABSENT; |
| 834 return factory->undefined_value(); | 834 return factory->undefined_value(); |
| 835 } | 835 } |
| 836 *attributes = result->GetAttributes(); | 836 *attributes = result->GetAttributes(); |
| 837 | 837 |
| 838 Handle<Object> value; | 838 Handle<Object> value; |
| 839 switch (result->type()) { | 839 switch (result->type()) { |
| 840 case NORMAL: { | 840 case NORMAL: { |
| 841 DisallowHeapAllocation no_gc; | 841 value = JSObject::GetNormalizedProperty( |
| 842 value = handle(result->holder()->GetNormalizedProperty(result), isolate); | 842 handle(result->holder(), isolate), result); |
| 843 break; | 843 break; |
| 844 } | 844 } |
| 845 case FIELD: | 845 case FIELD: |
| 846 value = JSObject::FastPropertyAt(handle(result->holder(), isolate), | 846 value = JSObject::FastPropertyAt(handle(result->holder(), isolate), |
| 847 result->representation(), | 847 result->representation(), |
| 848 result->GetFieldIndex().field_index()); | 848 result->GetFieldIndex().field_index()); |
| 849 break; | 849 break; |
| 850 case CONSTANT: | 850 case CONSTANT: |
| 851 return handle(result->GetConstant(), isolate); | 851 return handle(result->GetConstant(), isolate); |
| 852 case CALLBACKS: | 852 case CALLBACKS: |
| (...skipping 15669 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 16522 #define ERROR_MESSAGES_TEXTS(C, T) T, | 16522 #define ERROR_MESSAGES_TEXTS(C, T) T, |
| 16523 static const char* error_messages_[] = { | 16523 static const char* error_messages_[] = { |
| 16524 ERROR_MESSAGES_LIST(ERROR_MESSAGES_TEXTS) | 16524 ERROR_MESSAGES_LIST(ERROR_MESSAGES_TEXTS) |
| 16525 }; | 16525 }; |
| 16526 #undef ERROR_MESSAGES_TEXTS | 16526 #undef ERROR_MESSAGES_TEXTS |
| 16527 return error_messages_[reason]; | 16527 return error_messages_[reason]; |
| 16528 } | 16528 } |
| 16529 | 16529 |
| 16530 | 16530 |
| 16531 } } // namespace v8::internal | 16531 } } // namespace v8::internal |
| OLD | NEW |