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

Unified Diff: src/objects.cc

Issue 7109004: Revert "Make instanceof and Object.getPrototypeOf work for proxies, plus a few other tweaks." (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 9 years, 7 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/messages.js ('k') | src/objects-inl.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 47b964e18edd4dd61c29e5b8a08acefb5b551f3f..bf881e99db955d6e88bc4d666e7f0df3f9d194e0 100644
--- a/src/objects.cc
+++ b/src/objects.cc
@@ -638,7 +638,7 @@ Object* Object::GetPrototype() {
// The object is either a number, a string, a boolean,
// a real JS object, or a Harmony proxy.
- if (heap_object->IsJSReceiver()) {
+ if (heap_object->IsJSObject() || heap_object->IsJSProxy()) {
return heap_object->map()->prototype();
}
Heap* heap = heap_object->GetHeap();
@@ -3345,7 +3345,8 @@ void JSObject::LocalLookup(String* name, LookupResult* result) {
}
// Check __proto__ before interceptor.
- if (name->Equals(heap->Proto_symbol()) && !IsJSContextExtensionObject()) {
+ if (name->Equals(heap->Proto_symbol()) &&
+ !IsJSContextExtensionObject()) {
result->ConstantResult(this);
return;
}
« no previous file with comments | « src/messages.js ('k') | src/objects-inl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698