ES6 Unscopables

src/contexts.cc

Index: src/contexts.cc
diff --git a/src/contexts.cc b/src/contexts.cc
index cb5e852d7d669c07c8d8b950016defff1572f49c..ad7215ff46d1ad462e614fffe43af7cc93187906 100644
--- a/src/contexts.cc
+++ b/src/contexts.cc
@@ -7,6 +7,7 @@
 #include "src/bootstrapper.h"
 #include "src/debug.h"
 #include "src/scopeinfo.h"
+#include "src/unscopables.h"
 
 namespace v8 {
 namespace internal {
@@ -109,9 +110,13 @@ Handle<Object> Context::Lookup(Handle<String> name,
       if ((flags & FOLLOW_PROTOTYPE_CHAIN) == 0 ||
           object->IsJSContextExtensionObject()) {
         *attributes = JSReceiver::GetOwnPropertyAttributes(object, name);
+      } else if (FLAG_harmony_unscopables && context->IsWithContext()) {
+        LookupIterator it(object, name);
+        *attributes = UnscopableLookup(&it);
       } else {
         *attributes = JSReceiver::GetPropertyAttributes(object, name);
       }
+
       if (isolate->has_pending_exception()) return Handle<Object>();

[arv (Not doing code reviews), 2014/07/25 15:33:26]

Exception is handled here.

[Toon Verwaest, 2014/07/25 18:52:11]

The problem is that it was looking for pending exceptions, but it may just have
been scheduled. Anyway, after my CL that distinction is now irrelevant, and
pending is all you need to care about.

On 2014/07/25 15:33:26, arv wrote:

 
       if (*attributes != ABSENT) {