TypeofMode replaces TypeofState and ContextualMode.

src/ic/ic.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/v8.h"
 
 #include "src/accessors.h"
 #include "src/api.h"
 #include "src/arguments.h"
 #include "src/base/bits.h"
@@ skipping 717 matching lines @@
         PatchCache(name, stub.GetCode());
       }
       return result;
     }
   }
 
   // Named lookup in the object.
   LookupIterator it(object, name);
   LookupForRead(&it);
 
-  if (it.IsFound() || !IsUndeclaredGlobal(object)) {
+  if (it.IsFound() || typeof_mode() == INSIDE_TYPEOF) {

[Toon Verwaest, 2015/07/10 15:41:31]

typeof_mode() == INSIDE_TYPEOF is not the same as !IsUndeclaredGlobal(object).
You basically want
it.IsFound() || typeof_mode() == INSIDE_TYPEOF || !object->IsGlobalObject(). If
there was no failing test (seems unlikely?) please add one.

[Igor Sheludko, 2015/07/13 12:17:09]

Done.

     // Update inline cache and stub cache.
     if (use_ic) UpdateCaches(&it);
 
     // Get the property.
     Handle<Object> result;
 
     ASSIGN_RETURN_ON_EXCEPTION(
         isolate(), result, Object::GetProperty(&it, language_mode()), Object);
     if (it.IsFound()) {
       return result;
-    } else if (!IsUndeclaredGlobal(object)) {
+    } else if (typeof_mode() == INSIDE_TYPEOF) {

[Toon Verwaest, 2015/07/10 15:41:31]

Same here.

[Igor Sheludko, 2015/07/13 12:17:09]

Done.

       LOG(isolate(), SuspectReadEvent(*name, *object));
       return result;
     }
   }
   return ReferenceError(name);
 }
 
 
 static bool AddOneReceiverMapIfMissing(MapHandleList* receiver_maps,
                                        Handle<Map> new_receiver_map) {
@@ skipping 2222 matching lines @@
   if (done) return *result;
   return isolate->heap()->no_interceptor_result_sentinel();
 }
 
 
 static Object* ThrowReferenceError(Isolate* isolate, Name* name) {
   // If the load is non-contextual, just return the undefined result.
   // Note that both keyed and non-keyed loads may end up here.
   HandleScope scope(isolate);
   LoadIC ic(IC::NO_EXTRA_FRAME, isolate, true);
-  if (ic.contextual_mode() != CONTEXTUAL) {
+  if (ic.typeof_mode() == INSIDE_TYPEOF) {
     return isolate->heap()->undefined_value();
   }
 
   // Throw a reference error.
   Handle<Name> name_handle(name);
   THROW_NEW_ERROR_RETURN_FAILURE(
       isolate, NewReferenceError(MessageTemplate::kNotDefined, name_handle));
 }
 
 
@@ skipping 102 matching lines @@
 static const Address IC_utilities[] = {
 #define ADDR(name) FUNCTION_ADDR(name),
     IC_UTIL_LIST(ADDR) NULL
 #undef ADDR
 };
 
 
 Address IC::AddressFromUtilityId(IC::UtilityId id) { return IC_utilities[id]; }
 }  // namespace internal
 }  // namespace v8