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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/json-parser.h ('k') | src/property.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/objects.cc
diff --git a/src/objects.cc b/src/objects.cc
index 3a825ec78f08da38d22ea065a7b4f6ead7e205d1..32c2b17fa5708f9952d546fac9290fdd79088b39 100644
--- a/src/objects.cc
+++ b/src/objects.cc
@@ -4596,6 +4596,12 @@ void JSReceiver::LocalLookup(
JSObject* js_object = JSObject::cast(this);
+ // Check __proto__ before interceptor.
+ if (name->Equals(heap->Proto_symbol()) && !IsJSContextExtensionObject()) {
+ result->ConstantResult(js_object);
+ return;
+ }
+
// Check for lookup interceptor except when bootstrapping.
if (js_object->HasNamedInterceptor() &&
!heap->isolate()->bootstrapper()->IsActive()) {
« 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