Mark some of the places we leave V8 via callbacks as transitions to...

src/objects.cc

 // Copyright 2006-2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 183 matching lines @@
     Handle<JSObject> holder_handle(JSObject::cast(holder));
     Handle<String> key(name);
     Handle<Object> fun_data(data->data());
     LOG(ApiNamedPropertyAccess("load", *self, name));
     v8::AccessorInfo info(v8::Utils::ToLocal(self),
                           v8::Utils::ToLocal(fun_data),
                           v8::Utils::ToLocal(holder_handle));
     v8::Handle<v8::Value> result;
     {
       // Leaving JavaScript.
-      VMState state(OTHER);
+      VMState state(EXTERNAL);
       result = call_fun(v8::Utils::ToLocal(key), info);
     }
     RETURN_IF_SCHEDULED_EXCEPTION();
     if (result.IsEmpty()) return Heap::undefined_value();
     return *v8::Utils::OpenHandle(*result);
   }
 
   // __defineGetter__ callback
   if (structure->IsFixedArray()) {
     Object* getter = FixedArray::cast(structure)->get(kGetterIndex);
@@ skipping 1201 matching lines @@
     Handle<Object> data_handle(interceptor->data());
     LOG(ApiNamedPropertyAccess("interceptor-named-set", this, name));
     v8::AccessorInfo info(v8::Utils::ToLocal(this_handle),
                           v8::Utils::ToLocal(data_handle),
                           v8::Utils::ToLocal(this_handle));
     v8::NamedPropertySetter setter =
         v8::ToCData<v8::NamedPropertySetter>(interceptor->setter());
     v8::Handle<v8::Value> result;
     {
       // Leaving JavaScript.
-      VMState state(OTHER);
+      VMState state(EXTERNAL);
       Handle<Object> value_unhole(value->IsTheHole() ?
                                   Heap::undefined_value() :
                                   value);
       result = setter(v8::Utils::ToLocal(name_handle),
                       v8::Utils::ToLocal(value_unhole),
                       info);
     }
     RETURN_IF_SCHEDULED_EXCEPTION();
     if (!result.IsEmpty()) return *value_handle;
   }
@@ skipping 46 matching lines @@
     Handle<JSObject> self(this);
     Handle<JSObject> holder_handle(JSObject::cast(holder));
     Handle<String> key(name);
     Handle<Object> fun_data(data->data());
     LOG(ApiNamedPropertyAccess("store", this, name));
     v8::AccessorInfo info(v8::Utils::ToLocal(self),
                           v8::Utils::ToLocal(fun_data),
                           v8::Utils::ToLocal(holder_handle));
     {
       // Leaving JavaScript.
-      VMState state(OTHER);
+      VMState state(EXTERNAL);
       call_fun(v8::Utils::ToLocal(key),
                v8::Utils::ToLocal(value_handle),
                info);
     }
     RETURN_IF_SCHEDULED_EXCEPTION();
     return *value_handle;
   }
 
   if (structure->IsFixedArray()) {
     Object* setter = FixedArray::cast(structure)->get(kSetterIndex);
@@ skipping 381 matching lines @@
   v8::AccessorInfo info(v8::Utils::ToLocal(receiver_handle),
                         v8::Utils::ToLocal(data_handle),
                         v8::Utils::ToLocal(holder_handle));
   if (!interceptor->query()->IsUndefined()) {
     v8::NamedPropertyQuery query =
         v8::ToCData<v8::NamedPropertyQuery>(interceptor->query());
     LOG(ApiNamedPropertyAccess("interceptor-named-has", *holder_handle, name));
     v8::Handle<v8::Boolean> result;
     {
       // Leaving JavaScript.
-      VMState state(OTHER);
+      VMState state(EXTERNAL);
       result = query(v8::Utils::ToLocal(name_handle), info);
     }
     if (!result.IsEmpty()) {
       // Convert the boolean result to a property attribute
       // specification.
       return result->IsTrue() ? NONE : ABSENT;
     }
   } else if (!interceptor->getter()->IsUndefined()) {
     v8::NamedPropertyGetter getter =
         v8::ToCData<v8::NamedPropertyGetter>(interceptor->getter());
     LOG(ApiNamedPropertyAccess("interceptor-named-get-has", this, name));
     v8::Handle<v8::Value> result;
     {
       // Leaving JavaScript.
-      VMState state(OTHER);
+      VMState state(EXTERNAL);
       result = getter(v8::Utils::ToLocal(name_handle), info);
     }
     if (!result.IsEmpty()) return NONE;
   }
   return holder_handle->GetPropertyAttributePostInterceptor(*receiver_handle,
                                                             *name_handle,
                                                             continue_search);
 }
 
 
@@ skipping 228 matching lines @@
     v8::NamedPropertyDeleter deleter =
         v8::ToCData<v8::NamedPropertyDeleter>(interceptor->deleter());
     Handle<Object> data_handle(interceptor->data());
     LOG(ApiNamedPropertyAccess("interceptor-named-delete", *this_handle, name));
     v8::AccessorInfo info(v8::Utils::ToLocal(this_handle),
                           v8::Utils::ToLocal(data_handle),
                           v8::Utils::ToLocal(this_handle));
     v8::Handle<v8::Boolean> result;
     {
       // Leaving JavaScript.
-      VMState state(OTHER);
+      VMState state(EXTERNAL);
       result = deleter(v8::Utils::ToLocal(name_handle), info);
     }
     RETURN_IF_SCHEDULED_EXCEPTION();
     if (!result.IsEmpty()) {
       ASSERT(result->IsBoolean());
       return *v8::Utils::OpenHandle(*result);
     }
   }
   Object* raw_result = this_handle->DeletePropertyPostInterceptor(*name_handle);
   RETURN_IF_SCHEDULED_EXCEPTION();
@@ skipping 30 matching lines @@
       v8::ToCData<v8::IndexedPropertyDeleter>(interceptor->deleter());
   Handle<JSObject> this_handle(this);
   Handle<Object> data_handle(interceptor->data());
   LOG(ApiIndexedPropertyAccess("interceptor-indexed-delete", this, index));
   v8::AccessorInfo info(v8::Utils::ToLocal(this_handle),
                         v8::Utils::ToLocal(data_handle),
                         v8::Utils::ToLocal(this_handle));
   v8::Handle<v8::Boolean> result;
   {
     // Leaving JavaScript.
-    VMState state(OTHER);
+    VMState state(EXTERNAL);
     result = deleter(index, info);
   }
   RETURN_IF_SCHEDULED_EXCEPTION();
   if (!result.IsEmpty()) {
     ASSERT(result->IsBoolean());
     return *v8::Utils::OpenHandle(*result);
   }
   Object* raw_result = this_handle->DeleteElementPostInterceptor(index);
   RETURN_IF_SCHEDULED_EXCEPTION();
   return raw_result;
@@ skipping 2858 matching lines @@
   v8::AccessorInfo info(v8::Utils::ToLocal(receiver_handle),
                         v8::Utils::ToLocal(data_handle),
                         v8::Utils::ToLocal(holder_handle));
   if (!interceptor->query()->IsUndefined()) {
     v8::IndexedPropertyQuery query =
         v8::ToCData<v8::IndexedPropertyQuery>(interceptor->query());
     LOG(ApiIndexedPropertyAccess("interceptor-indexed-has", this, index));
     v8::Handle<v8::Boolean> result;
     {
       // Leaving JavaScript.
-      VMState state(OTHER);
+      VMState state(EXTERNAL);
       result = query(index, info);
     }
     if (!result.IsEmpty()) return result->IsTrue();
   } else if (!interceptor->getter()->IsUndefined()) {
     v8::IndexedPropertyGetter getter =
         v8::ToCData<v8::IndexedPropertyGetter>(interceptor->getter());
     LOG(ApiIndexedPropertyAccess("interceptor-indexed-has-get", this, index));
     v8::Handle<v8::Value> result;
     {
       // Leaving JavaScript.
-      VMState state(OTHER);
+      VMState state(EXTERNAL);
       result = getter(index, info);
     }
     if (!result.IsEmpty()) return !result->IsUndefined();
   }
   return holder_handle->HasElementPostInterceptor(*receiver_handle, index);
 }
 
 
 bool JSObject::HasLocalElement(uint32_t index) {
   // Check access rights if needed.
@@ skipping 129 matching lines @@
     v8::IndexedPropertySetter setter =
         v8::ToCData<v8::IndexedPropertySetter>(interceptor->setter());
     Handle<Object> data_handle(interceptor->data());
     LOG(ApiIndexedPropertyAccess("interceptor-indexed-set", this, index));
     v8::AccessorInfo info(v8::Utils::ToLocal(this_handle),
                           v8::Utils::ToLocal(data_handle),
                           v8::Utils::ToLocal(this_handle));
     v8::Handle<v8::Value> result;
     {
       // Leaving JavaScript.
-      VMState state(OTHER);
+      VMState state(EXTERNAL);
       result = setter(index, v8::Utils::ToLocal(value_handle), info);
     }
     RETURN_IF_SCHEDULED_EXCEPTION();
     if (!result.IsEmpty()) return *value_handle;
   }
   Object* raw_result =
       this_handle->SetElementPostInterceptor(index, *value_handle);
   RETURN_IF_SCHEDULED_EXCEPTION();
   return raw_result;
 }
@@ skipping 206 matching lines @@
     Handle<Object> data_handle(interceptor->data());
     v8::IndexedPropertyGetter getter =
         v8::ToCData<v8::IndexedPropertyGetter>(interceptor->getter());
     LOG(ApiIndexedPropertyAccess("interceptor-indexed-get", this, index));
     v8::AccessorInfo info(v8::Utils::ToLocal(this_handle),
                           v8::Utils::ToLocal(data_handle),
                           v8::Utils::ToLocal(holder_handle));
     v8::Handle<v8::Value> result;
     {
       // Leaving JavaScript.
-      VMState state(OTHER);
+      VMState state(EXTERNAL);
       result = getter(index, info);
     }
     RETURN_IF_SCHEDULED_EXCEPTION();
     if (!result.IsEmpty()) return *v8::Utils::OpenHandle(*result);
   }
 
   Object* raw_result =
       holder_handle->GetElementPostInterceptor(*this_handle, index);
   RETURN_IF_SCHEDULED_EXCEPTION();
   return raw_result;
@@ skipping 218 matching lines @@
   if (!interceptor->getter()->IsUndefined()) {
     v8::NamedPropertyGetter getter =
         v8::ToCData<v8::NamedPropertyGetter>(interceptor->getter());
     LOG(ApiNamedPropertyAccess("interceptor-named-get", *holder_handle, name));
     v8::AccessorInfo info(v8::Utils::ToLocal(receiver_handle),
                           v8::Utils::ToLocal(data_handle),
                           v8::Utils::ToLocal(holder_handle));
     v8::Handle<v8::Value> result;
     {
       // Leaving JavaScript.
-      VMState state(OTHER);
+      VMState state(EXTERNAL);
       result = getter(v8::Utils::ToLocal(name_handle), info);
     }
     RETURN_IF_SCHEDULED_EXCEPTION();
     if (!result.IsEmpty()) {
       *attributes = NONE;
       return *v8::Utils::OpenHandle(*result);
     }
   }
 
   Object* raw_result = holder_handle->GetPropertyPostInterceptor(
@@ skipping 1650 matching lines @@
   // No break point.
   if (break_point_objects()->IsUndefined()) return 0;
   // Single beak point.
   if (!break_point_objects()->IsFixedArray()) return 1;
   // Multiple break points.
   return FixedArray::cast(break_point_objects())->length();
 }
 
 
 } }  // namespace v8::internal