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

Side by Side Diff: src/objects.cc

Issue 650027: Merge revision 3913 and 3914 to trunk to fix assertion failures. (Closed) Base URL: http://v8.googlecode.com/svn/trunk/
Patch Set: Created 10 years, 10 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 | « no previous file | src/runtime.cc » ('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 2006-2009 the V8 project authors. All rights reserved. 1 // Copyright 2006-2009 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 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 // If the object has an interceptor, try real named properties. 254 // If the object has an interceptor, try real named properties.
255 // No access check in GetPropertyAttributeWithInterceptor. 255 // No access check in GetPropertyAttributeWithInterceptor.
256 LookupResult r; 256 LookupResult r;
257 result->holder()->LookupRealNamedProperty(name, &r); 257 result->holder()->LookupRealNamedProperty(name, &r);
258 if (r.IsProperty()) { 258 if (r.IsProperty()) {
259 return GetPropertyWithFailedAccessCheck(receiver, 259 return GetPropertyWithFailedAccessCheck(receiver,
260 &r, 260 &r,
261 name, 261 name,
262 attributes); 262 attributes);
263 } 263 }
264 break;
264 } 265 }
265 default: 266 default:
266 UNREACHABLE(); 267 UNREACHABLE();
267 } 268 }
268 } 269 }
269 270
270 // No accessible property found. 271 // No accessible property found.
271 *attributes = ABSENT; 272 *attributes = ABSENT;
272 Top::ReportFailedAccessCheck(this, v8::ACCESS_GET); 273 Top::ReportFailedAccessCheck(this, v8::ACCESS_GET);
273 return Heap::undefined_value(); 274 return Heap::undefined_value();
(...skipping 8086 matching lines...) Expand 10 before | Expand all | Expand 10 after
8360 if (break_point_objects()->IsUndefined()) return 0; 8361 if (break_point_objects()->IsUndefined()) return 0;
8361 // Single beak point. 8362 // Single beak point.
8362 if (!break_point_objects()->IsFixedArray()) return 1; 8363 if (!break_point_objects()->IsFixedArray()) return 1;
8363 // Multiple break points. 8364 // Multiple break points.
8364 return FixedArray::cast(break_point_objects())->length(); 8365 return FixedArray::cast(break_point_objects())->length();
8365 } 8366 }
8366 #endif 8367 #endif
8367 8368
8368 8369
8369 } } // namespace v8::internal 8370 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « no previous file | src/runtime.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698