Split AccessorInfo into DeclaredAccessorInfo and ExecutableAccessorInfo

src/runtime.cc

 // Copyright 2012 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 963 matching lines @@
     Object* prototype = V->GetPrototype();
     if (prototype->IsNull()) return isolate->heap()->false_value();
     if (O == prototype) return isolate->heap()->true_value();
     V = prototype;
   }
 }
 
 
 static bool CheckAccessException(Object* callback,
                                  v8::AccessType access_type) {
-  if (callback->IsAccessorInfo()) {
-    AccessorInfo* info = AccessorInfo::cast(callback);
-    return
-        (access_type == v8::ACCESS_HAS &&
-           (info->all_can_read() || info->all_can_write())) ||
-        (access_type == v8::ACCESS_GET && info->all_can_read()) ||
-        (access_type == v8::ACCESS_SET && info->all_can_write());
+  AccessorInfo* info = 0;

[Sven Panne, 2013/02/07 10:01:03]

Again, this should stay as it is.

+  if (callback->IsExecutableAccessorInfo()) {
+    info = ExecutableAccessorInfo::cast(callback);
+  } else if (callback->IsDeclaredAccessorInfo()) {
+    info = DeclaredAccessorInfo::cast(callback);
+  } else {
+    return false;
   }
-  return false;
+  return
+      (access_type == v8::ACCESS_HAS &&
+         (info->all_can_read() || info->all_can_write())) ||
+      (access_type == v8::ACCESS_GET && info->all_can_read()) ||
+      (access_type == v8::ACCESS_SET && info->all_can_write());
 }
 
 
 template<class Key>
 static bool CheckGenericAccess(
     JSObject* receiver,
     JSObject* holder,
     Key key,
     v8::AccessType access_type,
     bool (Isolate::*mayAccess)(JSObject*, Key, v8::AccessType)) {
@@ skipping 3101 matching lines @@
 
   LookupResult result(isolate);
   js_object->LocalLookupRealNamedProperty(*name, &result);
 
   // Special case for callback properties.
   if (result.IsPropertyCallbacks()) {
     Object* callback = result.GetCallbackObject();
     // To be compatible with Safari we do not change the value on API objects
     // in Object.defineProperty(). Firefox disagrees here, and actually changes
     // the value.
-    if (callback->IsAccessorInfo()) {
+    if (callback->IsExecutableAccessorInfo() ||

[Sven Panne, 2013/02/07 10:01:03]

See comment above.

+        callback->IsDeclaredAccessorInfo()) {
       return isolate->heap()->undefined_value();
     }
     // Avoid redefining foreign callback as data property, just use the stored
     // setter to update the value instead.
     // TODO(mstarzinger): So far this only works if property attributes don't
     // change, this should be fixed once we cleanup the underlying code.
     if (callback->IsForeign() && result.GetAttributes() == attr) {
       return js_object->SetPropertyWithCallback(callback,
                                                 *name,
                                                 *obj_value,
@@ skipping 6016 matching lines @@
           JSObject::cast(result->holder())->FastPropertyAt(
               result->GetFieldIndex().field_index());
       if (value->IsTheHole()) {
         return heap->undefined_value();
       }
       return value;
     case CONSTANT_FUNCTION:
       return result->GetConstantFunction();
     case CALLBACKS: {
       Object* structure = result->GetCallbackObject();
-      if (structure->IsForeign() || structure->IsAccessorInfo()) {
+      if (structure->IsForeign() ||

[Sven Panne, 2013/02/07 10:01:03]

See comment above.

+          structure->IsExecutableAccessorInfo() ||
+          structure->IsDeclaredAccessorInfo()) {
         MaybeObject* maybe_value = result->holder()->GetPropertyWithCallback(
             receiver, structure, name);
         if (!maybe_value->ToObject(&value)) {
           if (maybe_value->IsRetryAfterGC()) return maybe_value;
           ASSERT(maybe_value->IsException());
           maybe_value = heap->isolate()->pending_exception();
           heap->isolate()->clear_pending_exception();
           if (caught_exception != NULL) {
             *caught_exception = true;
           }
@@ skipping 3365 matching lines @@
     // Handle last resort GC and make sure to allow future allocations
     // to grow the heap without causing GCs (if possible).
     isolate->counters()->gc_last_resort_from_js()->Increment();
     isolate->heap()->CollectAllGarbage(Heap::kNoGCFlags,
                                        "Runtime::PerformGC");
   }
 }
 
 
 } }  // namespace v8::internal