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

Side by Side Diff: src/objects.cc

Issue 14200035: Rollback of r13728 in 3.17 branch. (Closed) Base URL: https://v8.googlecode.com/svn/branches/3.17
Patch Set: Created 7 years, 8 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/json-parser.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 4578 matching lines...) Expand 10 before | Expand all | Expand 10 after
4589 } 4589 }
4590 4590
4591 // Do not use inline caching if the object is a non-global object 4591 // Do not use inline caching if the object is a non-global object
4592 // that requires access checks. 4592 // that requires access checks.
4593 if (IsAccessCheckNeeded()) { 4593 if (IsAccessCheckNeeded()) {
4594 result->DisallowCaching(); 4594 result->DisallowCaching();
4595 } 4595 }
4596 4596
4597 JSObject* js_object = JSObject::cast(this); 4597 JSObject* js_object = JSObject::cast(this);
4598 4598
4599 // Check __proto__ before interceptor.
4600 if (name->Equals(heap->Proto_symbol()) && !IsJSContextExtensionObject()) {
4601 result->ConstantResult(js_object);
4602 return;
4603 }
4604
4599 // Check for lookup interceptor except when bootstrapping. 4605 // Check for lookup interceptor except when bootstrapping.
4600 if (js_object->HasNamedInterceptor() && 4606 if (js_object->HasNamedInterceptor() &&
4601 !heap->isolate()->bootstrapper()->IsActive()) { 4607 !heap->isolate()->bootstrapper()->IsActive()) {
4602 result->InterceptorResult(js_object); 4608 result->InterceptorResult(js_object);
4603 return; 4609 return;
4604 } 4610 }
4605 4611
4606 js_object->LocalLookupRealNamedProperty(name, result); 4612 js_object->LocalLookupRealNamedProperty(name, result);
4607 if (result->IsFound() || !search_hidden_prototypes) return; 4613 if (result->IsFound() || !search_hidden_prototypes) return;
4608 4614
(...skipping 9379 matching lines...) Expand 10 before | Expand all | Expand 10 after
13988 set_year(Smi::FromInt(year), SKIP_WRITE_BARRIER); 13994 set_year(Smi::FromInt(year), SKIP_WRITE_BARRIER);
13989 set_month(Smi::FromInt(month), SKIP_WRITE_BARRIER); 13995 set_month(Smi::FromInt(month), SKIP_WRITE_BARRIER);
13990 set_day(Smi::FromInt(day), SKIP_WRITE_BARRIER); 13996 set_day(Smi::FromInt(day), SKIP_WRITE_BARRIER);
13991 set_weekday(Smi::FromInt(weekday), SKIP_WRITE_BARRIER); 13997 set_weekday(Smi::FromInt(weekday), SKIP_WRITE_BARRIER);
13992 set_hour(Smi::FromInt(hour), SKIP_WRITE_BARRIER); 13998 set_hour(Smi::FromInt(hour), SKIP_WRITE_BARRIER);
13993 set_min(Smi::FromInt(min), SKIP_WRITE_BARRIER); 13999 set_min(Smi::FromInt(min), SKIP_WRITE_BARRIER);
13994 set_sec(Smi::FromInt(sec), SKIP_WRITE_BARRIER); 14000 set_sec(Smi::FromInt(sec), SKIP_WRITE_BARRIER);
13995 } 14001 }
13996 14002
13997 } } // namespace v8::internal 14003 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/json-parser.h ('k') | src/property.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698