Split ValidateAndApplyPropertyDescriptor out of OrdinaryDefineOwnProperty

src/objects.h

 // 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.
 
 #ifndef V8_OBJECTS_H_
 #define V8_OBJECTS_H_
 
 #include <iosfwd>
 
 #include "src/allocation.h"
@@ skipping 1825 matching lines @@
                                                 Handle<Object> attributes);
   MUST_USE_RESULT static Object* DefineProperties(Isolate* isolate,
                                                   Handle<Object> object,
                                                   Handle<Object> properties);
 
   // "virtual" dispatcher to the correct [[DefineOwnProperty]] implementation.
   static bool DefineOwnProperty(Isolate* isolate, Handle<JSReceiver> object,
                                 Handle<Object> key, PropertyDescriptor* desc,
                                 ShouldThrow should_throw);
 
+  // ES6 9.1.6.1
   static bool OrdinaryDefineOwnProperty(Isolate* isolate,
                                         Handle<JSObject> object,
                                         Handle<Object> key,
                                         PropertyDescriptor* desc,
                                         ShouldThrow should_throw);
   static bool OrdinaryDefineOwnProperty(LookupIterator* it,
                                         PropertyDescriptor* desc,
                                         ShouldThrow should_throw);
+  // ES6 9.1.6.2
+  static bool IsCompatiblePropertyDescriptor(bool extensible,
+                                             PropertyDescriptor* desc,
+                                             PropertyDescriptor* current,
+                                             Handle<Name> property_name);
+  // ES6 9.1.6.3
+  // |it| can be NULL in cases where the ES spec passes |undefined| as the
+  // receiver. Exactly one of |it| and |property_name| must be provided.
+  static bool ValidateAndApplyPropertyDescriptor(
+      LookupIterator* it, bool extensible, PropertyDescriptor* desc,
+      PropertyDescriptor* current, ShouldThrow should_throw,
+      Handle<Name> property_name = Handle<Name>());
 
   static bool GetOwnPropertyDescriptor(Isolate* isolate,
                                        Handle<JSReceiver> object,
                                        Handle<Object> key,
                                        PropertyDescriptor* desc);
   static bool GetOwnPropertyDescriptor(LookupIterator* it,
                                        PropertyDescriptor* desc);
 
   // Disallow further properties to be added to the object.  This is
   // ES6's [[PreventExtensions]] when passed DONT_THROW.
@@ skipping 8830 matching lines @@
     }
     return value;
   }
 };
 
 
 }  // NOLINT, false-positive due to second-order macros.
 }  // NOLINT, false-positive due to second-order macros.
 
 #endif  // V8_OBJECTS_H_