Restore ExecutableAccessorInfoHandling for now

src/objects.cc

 // Copyright 2013 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 <iomanip>
 #include <sstream>
 
 #include "src/v8.h"
 
 #include "src/accessors.h"
@@ skipping 4115 matching lines @@
 
 
 // static
 void ExecutableAccessorInfo::ClearSetter(Handle<ExecutableAccessorInfo> info) {
   Handle<Object> object = v8::FromCData(info->GetIsolate(), nullptr);
   info->set_setter(*object);
 }
 
 
 MaybeHandle<Object> JSObject::ReconfigureAsDataProperty(
-    LookupIterator* it, Handle<Object> value, PropertyAttributes attributes) {
+    LookupIterator* it, Handle<Object> value, PropertyAttributes attributes,
+    ExecutableAccessorInfoHandling handling) {
   Handle<JSObject> object = Handle<JSObject>::cast(it->GetReceiver());
   bool is_observed = object->map()->is_observed() &&
                      (it->IsElement() ||
                       !it->isolate()->IsInternallyUsedPropertyName(it->name()));
 
   switch (it->state()) {
     case LookupIterator::INTERCEPTOR:
     case LookupIterator::JSPROXY:
     case LookupIterator::NOT_FOUND:
     case LookupIterator::TRANSITION:
     case LookupIterator::ACCESS_CHECK:
       UNREACHABLE();
 
     case LookupIterator::INTEGER_INDEXED_EXOTIC:
       return value;
 
     case LookupIterator::ACCESSOR: {
       PropertyDetails details = it->property_details();
       // Ensure the context isn't changed after calling into accessors.
       AssertNoContextChange ncc(it->isolate());
 
       Handle<Object> accessors = it->GetAccessors();
 
       // Special handling for ExecutableAccessorInfo, which behaves like a
       // data property.
-      if (accessors->IsExecutableAccessorInfo()) {
+      if (accessors->IsExecutableAccessorInfo() &&
+          handling == DONT_FORCE_FIELD) {
         Handle<Object> result;
         ASSIGN_RETURN_ON_EXCEPTION(
             it->isolate(), result,
             JSObject::SetPropertyWithAccessor(it, value, STRICT), Object);
         DCHECK(result->SameValue(*value));
 
         if (details.attributes() == attributes) return value;
 
         // Reconfigure the accessor if attributes mismatch.
         Handle<ExecutableAccessorInfo> new_data = Accessors::CloneAccessor(
@@ skipping 72 matching lines @@
   }
 
   return value;
 }
 
 
 // Reconfigures a property to a data property with attributes, even if it is not
 // reconfigurable.
 MaybeHandle<Object> JSObject::SetOwnPropertyIgnoreAttributes(
     Handle<JSObject> object, Handle<Name> name, Handle<Object> value,
-    PropertyAttributes attributes) {
+    PropertyAttributes attributes, ExecutableAccessorInfoHandling handling) {
   DCHECK(!value->IsTheHole());
   LookupIterator it(object, name, LookupIterator::OWN_SKIP_INTERCEPTOR);
   if (it.state() == LookupIterator::ACCESS_CHECK) {
     if (!it.isolate()->MayAccess(object)) {
       return SetPropertyWithFailedAccessCheck(&it, value, SLOPPY);
     }
     it.Next();
   }
 
   if (it.IsFound()) {
-    return ReconfigureAsDataProperty(&it, value, attributes);
+    return ReconfigureAsDataProperty(&it, value, attributes, handling);
   }
 
   return AddDataProperty(&it, value, attributes, STRICT,
                          CERTAINLY_NOT_STORE_FROM_KEYED);
 }
 
 
 MaybeHandle<Object> JSObject::SetOwnElementIgnoreAttributes(
     Handle<JSObject> object, uint32_t index, Handle<Object> value,
-    PropertyAttributes attributes) {
+    PropertyAttributes attributes, ExecutableAccessorInfoHandling handling) {
   DCHECK(!object->HasExternalArrayElements());
   Isolate* isolate = object->GetIsolate();
   LookupIterator it(isolate, object, index,
                     LookupIterator::OWN_SKIP_INTERCEPTOR);
   if (it.state() == LookupIterator::ACCESS_CHECK) {
     if (!isolate->MayAccess(object)) {
       return SetPropertyWithFailedAccessCheck(&it, value, STRICT);
     }
     it.Next();
   }
 
   if (it.IsFound()) {
-    return ReconfigureAsDataProperty(&it, value, attributes);
+    return ReconfigureAsDataProperty(&it, value, attributes, handling);
   }
 
   return AddDataProperty(&it, value, attributes, STRICT,
                          MAY_BE_STORE_FROM_KEYED);
 }
 
 
 Maybe<PropertyAttributes> JSObject::GetPropertyAttributesWithInterceptor(
     LookupIterator* it) {
   Isolate* isolate = it->isolate();
@@ skipping 12428 matching lines @@
                                             Handle<Object> new_value) {
   if (cell->value() != *new_value) {
     cell->set_value(*new_value);
     Isolate* isolate = cell->GetIsolate();
     cell->dependent_code()->DeoptimizeDependentCodeGroup(
         isolate, DependentCode::kPropertyCellChangedGroup);
   }
 }
 }  // namespace internal
 }  // namespace v8