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

Side by Side Diff: src/objects-inl.h

Issue 9466047: Handle CALLBACKS correctly in IsProperty functions. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Incorporated review comments. Created 8 years, 9 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 | « src/objects.h ('k') | src/property.h » ('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 2012 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
(...skipping 1970 matching lines...) Expand 10 before | Expand all | Expand 10 after
1981 1981
1982 1982
1983 AccessorDescriptor* DescriptorArray::GetCallbacks(int descriptor_number) { 1983 AccessorDescriptor* DescriptorArray::GetCallbacks(int descriptor_number) {
1984 ASSERT(GetType(descriptor_number) == CALLBACKS); 1984 ASSERT(GetType(descriptor_number) == CALLBACKS);
1985 Foreign* p = Foreign::cast(GetCallbacksObject(descriptor_number)); 1985 Foreign* p = Foreign::cast(GetCallbacksObject(descriptor_number));
1986 return reinterpret_cast<AccessorDescriptor*>(p->foreign_address()); 1986 return reinterpret_cast<AccessorDescriptor*>(p->foreign_address());
1987 } 1987 }
1988 1988
1989 1989
1990 bool DescriptorArray::IsProperty(int descriptor_number) { 1990 bool DescriptorArray::IsProperty(int descriptor_number) {
1991 return IsRealProperty(GetType(descriptor_number)); 1991 Entry entry(this, descriptor_number);
1992 return IsPropertyDescriptor(&entry);
1992 } 1993 }
1993 1994
1994 1995
1995 bool DescriptorArray::IsTransitionOnly(int descriptor_number) { 1996 bool DescriptorArray::IsTransitionOnly(int descriptor_number) {
1996 switch (GetType(descriptor_number)) { 1997 switch (GetType(descriptor_number)) {
1997 case MAP_TRANSITION: 1998 case MAP_TRANSITION:
1998 case CONSTANT_TRANSITION: 1999 case CONSTANT_TRANSITION:
1999 case ELEMENTS_TRANSITION: 2000 case ELEMENTS_TRANSITION:
2000 return true; 2001 return true;
2001 case CALLBACKS: { 2002 case CALLBACKS: {
(...skipping 2922 matching lines...) Expand 10 before | Expand all | Expand 10 after
4924 #undef WRITE_INT_FIELD 4925 #undef WRITE_INT_FIELD
4925 #undef READ_SHORT_FIELD 4926 #undef READ_SHORT_FIELD
4926 #undef WRITE_SHORT_FIELD 4927 #undef WRITE_SHORT_FIELD
4927 #undef READ_BYTE_FIELD 4928 #undef READ_BYTE_FIELD
4928 #undef WRITE_BYTE_FIELD 4929 #undef WRITE_BYTE_FIELD
4929 4930
4930 4931
4931 } } // namespace v8::internal 4932 } } // namespace v8::internal
4932 4933
4933 #endif // V8_OBJECTS_INL_H_ 4934 #endif // V8_OBJECTS_INL_H_
OLDNEW
« no previous file with comments | « src/objects.h ('k') | src/property.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698