Revert of Change calling convention of CallApiGetterStub to accept the AccessorInfo

src/objects.h

 // Copyright 2015 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/assert-scope.h"
@@ skipping 10226 matching lines @@
 // the request is ignored.
 //
 // If the accessor in the prototype has the READ_ONLY property attribute, then
 // a new value is added to the derived object when the property is set.
 // This shadows the accessor in the prototype.
 class AccessorInfo: public Struct {
  public:
   DECL_ACCESSORS(name, Object)
   DECL_INT_ACCESSORS(flag)
   DECL_ACCESSORS(expected_receiver_type, Object)
-  // This directly points at a foreign C function to be used from the runtime.
   DECL_ACCESSORS(getter, Object)
   DECL_ACCESSORS(setter, Object)
-  // This either points at the same as above, or a trampoline in case we are
-  // running with the simulator. Use these entries from generated code.
-  DECL_ACCESSORS(js_getter, Object)
   DECL_ACCESSORS(data, Object)
 
-#ifdef USE_SIMULATOR
-  static Address redirect(Isolate* isolate, Address address,
-                          AccessorComponent component);
-  Address redirected_getter() const;
-#endif
-
   // Dispatched behavior.
   DECLARE_PRINTER(AccessorInfo)
 
   inline bool all_can_read();
   inline void set_all_can_read(bool value);
 
   inline bool all_can_write();
   inline void set_all_can_write(bool value);
 
   inline bool is_special_data_property();
@@ skipping 15 matching lines @@
 
   // Append all descriptors to the array that are not already there.
   // Return number added.
   static int AppendUnique(Handle<Object> descriptors,
                           Handle<FixedArray> array,
                           int valid_descriptors);
 
   static const int kNameOffset = HeapObject::kHeaderSize;
   static const int kFlagOffset = kNameOffset + kPointerSize;
   static const int kExpectedReceiverTypeOffset = kFlagOffset + kPointerSize;
-  static const int kSetterOffset = kExpectedReceiverTypeOffset + kPointerSize;
-  static const int kGetterOffset = kSetterOffset + kPointerSize;
-#ifdef USE_SIMULATOR
-  static const int kJsGetterOffset = kGetterOffset + kPointerSize;
-#else
-  static const int kJsGetterOffset = kGetterOffset;
-#endif
-  static const int kDataOffset = kJsGetterOffset + kPointerSize;
+  static const int kGetterOffset = kExpectedReceiverTypeOffset + kPointerSize;
+  static const int kSetterOffset = kGetterOffset + kPointerSize;
+  static const int kDataOffset = kSetterOffset + kPointerSize;
   static const int kSize = kDataOffset + kPointerSize;
 
 
  private:
   inline bool HasExpectedReceiverType();
 
   // Bit positions in flag.
   static const int kAllCanReadBit = 0;
   static const int kAllCanWriteBit = 1;
   static const int kSpecialDataProperty = 2;
@@ skipping 481 matching lines @@
     }
     return value;
   }
 };
 
 
 }  // NOLINT, false-positive due to second-order macros.
 }  // NOLINT, false-positive due to second-order macros.
 
 #endif  // V8_OBJECTS_H_