Upgrade V8 to 5.1.281.57 DO NOT MERGE
FPIIM-449
Change-Id: Id981b686b4d587ac31697662eb98bb34be42ad90
(cherry picked from commit 3b9bc31999c9787eb726ecdbfd5796bfdec32a18)
diff --git a/src/arguments.h b/src/arguments.h
index 3509677..02090f9 100644
--- a/src/arguments.h
+++ b/src/arguments.h
@@ -6,7 +6,8 @@
#define V8_ARGUMENTS_H_
#include "src/allocation.h"
-#include "src/isolate.h"
+#include "src/objects-inl.h"
+#include "src/tracing/trace-event.h"
namespace v8 {
namespace internal {
@@ -70,217 +71,30 @@
Object** arguments_;
};
-
-// For each type of callback, we have a list of arguments
-// They are used to generate the Call() functions below
-// These aren't included in the list as they have duplicate signatures
-// F(GenericNamedPropertyEnumeratorCallback, ...)
-// F(GenericNamedPropertyGetterCallback, ...)
-
-#define FOR_EACH_CALLBACK_TABLE_MAPPING_0(F) \
- F(IndexedPropertyEnumeratorCallback, v8::Array)
-
-#define FOR_EACH_CALLBACK_TABLE_MAPPING_1(F) \
- F(AccessorNameGetterCallback, v8::Value, v8::Local<v8::Name>) \
- F(GenericNamedPropertyQueryCallback, v8::Integer, v8::Local<v8::Name>) \
- F(GenericNamedPropertyDeleterCallback, v8::Boolean, v8::Local<v8::Name>) \
- F(IndexedPropertyGetterCallback, v8::Value, uint32_t) \
- F(IndexedPropertyQueryCallback, v8::Integer, uint32_t) \
- F(IndexedPropertyDeleterCallback, v8::Boolean, uint32_t)
-
-#define FOR_EACH_CALLBACK_TABLE_MAPPING_2(F) \
- F(GenericNamedPropertySetterCallback, v8::Value, v8::Local<v8::Name>, \
- v8::Local<v8::Value>) \
- F(IndexedPropertySetterCallback, v8::Value, uint32_t, v8::Local<v8::Value>)
-
-#define FOR_EACH_CALLBACK_TABLE_MAPPING_2_VOID_RETURN(F) \
- F(AccessorNameSetterCallback, \
- void, \
- v8::Local<v8::Name>, \
- v8::Local<v8::Value>) \
-
-
-// Custom arguments replicate a small segment of stack that can be
-// accessed through an Arguments object the same way the actual stack
-// can.
-template<int kArrayLength>
-class CustomArgumentsBase : public Relocatable {
- public:
- virtual inline void IterateInstance(ObjectVisitor* v) {
- v->VisitPointers(values_, values_ + kArrayLength);
- }
- protected:
- inline Object** begin() { return values_; }
- explicit inline CustomArgumentsBase(Isolate* isolate)
- : Relocatable(isolate) {}
- Object* values_[kArrayLength];
-};
-
-
-template<typename T>
-class CustomArguments : public CustomArgumentsBase<T::kArgsLength> {
- public:
- static const int kReturnValueOffset = T::kReturnValueIndex;
-
- typedef CustomArgumentsBase<T::kArgsLength> Super;
- ~CustomArguments() {
- this->begin()[kReturnValueOffset] =
- reinterpret_cast<Object*>(kHandleZapValue);
- }
-
- protected:
- explicit inline CustomArguments(Isolate* isolate) : Super(isolate) {}
-
- template <typename V>
- v8::Local<V> GetReturnValue(Isolate* isolate);
-
- inline Isolate* isolate() {
- return reinterpret_cast<Isolate*>(this->begin()[T::kIsolateIndex]);
- }
-};
-
-
-class PropertyCallbackArguments
- : public CustomArguments<PropertyCallbackInfo<Value> > {
- public:
- typedef PropertyCallbackInfo<Value> T;
- typedef CustomArguments<T> Super;
- static const int kArgsLength = T::kArgsLength;
- static const int kThisIndex = T::kThisIndex;
- static const int kHolderIndex = T::kHolderIndex;
- static const int kDataIndex = T::kDataIndex;
- static const int kReturnValueDefaultValueIndex =
- T::kReturnValueDefaultValueIndex;
- static const int kIsolateIndex = T::kIsolateIndex;
- static const int kShouldThrowOnErrorIndex = T::kShouldThrowOnErrorIndex;
-
- PropertyCallbackArguments(Isolate* isolate, Object* data, Object* self,
- JSObject* holder, Object::ShouldThrow should_throw)
- : Super(isolate) {
- Object** values = this->begin();
- values[T::kThisIndex] = self;
- values[T::kHolderIndex] = holder;
- values[T::kDataIndex] = data;
- values[T::kIsolateIndex] = reinterpret_cast<Object*>(isolate);
- values[T::kShouldThrowOnErrorIndex] =
- Smi::FromInt(should_throw == Object::THROW_ON_ERROR ? 1 : 0);
-
- // Here the hole is set as default value.
- // It cannot escape into js as it's remove in Call below.
- values[T::kReturnValueDefaultValueIndex] =
- isolate->heap()->the_hole_value();
- values[T::kReturnValueIndex] = isolate->heap()->the_hole_value();
- DCHECK(values[T::kHolderIndex]->IsHeapObject());
- DCHECK(values[T::kIsolateIndex]->IsSmi());
- }
-
- /*
- * The following Call functions wrap the calling of all callbacks to handle
- * calling either the old or the new style callbacks depending on which one
- * has been registered.
- * For old callbacks which return an empty handle, the ReturnValue is checked
- * and used if it's been set to anything inside the callback.
- * New style callbacks always use the return value.
- */
-#define WRITE_CALL_0(Function, ReturnValue) \
- v8::Local<ReturnValue> Call(Function f);
-
-#define WRITE_CALL_1(Function, ReturnValue, Arg1) \
- v8::Local<ReturnValue> Call(Function f, Arg1 arg1);
-
-#define WRITE_CALL_2(Function, ReturnValue, Arg1, Arg2) \
- v8::Local<ReturnValue> Call(Function f, Arg1 arg1, Arg2 arg2);
-
-#define WRITE_CALL_2_VOID(Function, ReturnValue, Arg1, Arg2) \
- void Call(Function f, Arg1 arg1, Arg2 arg2); \
-
-FOR_EACH_CALLBACK_TABLE_MAPPING_0(WRITE_CALL_0)
-FOR_EACH_CALLBACK_TABLE_MAPPING_1(WRITE_CALL_1)
-FOR_EACH_CALLBACK_TABLE_MAPPING_2(WRITE_CALL_2)
-FOR_EACH_CALLBACK_TABLE_MAPPING_2_VOID_RETURN(WRITE_CALL_2_VOID)
-
-#undef WRITE_CALL_0
-#undef WRITE_CALL_1
-#undef WRITE_CALL_2
-#undef WRITE_CALL_2_VOID
-};
-
-
-class FunctionCallbackArguments
- : public CustomArguments<FunctionCallbackInfo<Value> > {
- public:
- typedef FunctionCallbackInfo<Value> T;
- typedef CustomArguments<T> Super;
- static const int kArgsLength = T::kArgsLength;
- static const int kHolderIndex = T::kHolderIndex;
- static const int kDataIndex = T::kDataIndex;
- static const int kReturnValueDefaultValueIndex =
- T::kReturnValueDefaultValueIndex;
- static const int kIsolateIndex = T::kIsolateIndex;
- static const int kCalleeIndex = T::kCalleeIndex;
- static const int kContextSaveIndex = T::kContextSaveIndex;
-
- FunctionCallbackArguments(internal::Isolate* isolate, internal::Object* data,
- internal::HeapObject* callee,
- internal::Object* holder, internal::Object** argv,
- int argc, bool is_construct_call)
- : Super(isolate),
- argv_(argv),
- argc_(argc),
- is_construct_call_(is_construct_call) {
- Object** values = begin();
- values[T::kDataIndex] = data;
- values[T::kCalleeIndex] = callee;
- values[T::kHolderIndex] = holder;
- values[T::kContextSaveIndex] = isolate->heap()->the_hole_value();
- values[T::kIsolateIndex] = reinterpret_cast<internal::Object*>(isolate);
- // Here the hole is set as default value.
- // It cannot escape into js as it's remove in Call below.
- values[T::kReturnValueDefaultValueIndex] =
- isolate->heap()->the_hole_value();
- values[T::kReturnValueIndex] = isolate->heap()->the_hole_value();
- DCHECK(values[T::kCalleeIndex]->IsJSFunction() ||
- values[T::kCalleeIndex]->IsFunctionTemplateInfo());
- DCHECK(values[T::kHolderIndex]->IsHeapObject());
- DCHECK(values[T::kIsolateIndex]->IsSmi());
- }
-
- /*
- * The following Call function wraps the calling of all callbacks to handle
- * calling either the old or the new style callbacks depending on which one
- * has been registered.
- * For old callbacks which return an empty handle, the ReturnValue is checked
- * and used if it's been set to anything inside the callback.
- * New style callbacks always use the return value.
- */
- v8::Local<v8::Value> Call(FunctionCallback f);
-
- private:
- internal::Object** argv_;
- int argc_;
- bool is_construct_call_;
-};
-
-
double ClobberDoubleRegisters(double x1, double x2, double x3, double x4);
-
#ifdef DEBUG
#define CLOBBER_DOUBLE_REGISTERS() ClobberDoubleRegisters(1, 2, 3, 4);
#else
#define CLOBBER_DOUBLE_REGISTERS()
#endif
-#define RUNTIME_FUNCTION_RETURNS_TYPE(Type, Name) \
- static INLINE(Type __RT_impl_##Name(Arguments args, Isolate* isolate)); \
- Type Name(int args_length, Object** args_object, Isolate* isolate) { \
- CLOBBER_DOUBLE_REGISTERS(); \
- RuntimeCallStats* stats = isolate->counters()->runtime_call_stats(); \
- RuntimeCallTimerScope timer(isolate, &stats->Name); \
- Arguments args(args_length, args_object); \
- Type value = __RT_impl_##Name(args, isolate); \
- return value; \
- } \
+#define RUNTIME_FUNCTION_RETURNS_TYPE(Type, Name) \
+ static INLINE(Type __RT_impl_##Name(Arguments args, Isolate* isolate)); \
+ Type Name(int args_length, Object** args_object, Isolate* isolate) { \
+ CLOBBER_DOUBLE_REGISTERS(); \
+ Type value; \
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("v8.runtime"), "V8." #Name); \
+ Arguments args(args_length, args_object); \
+ if (FLAG_runtime_call_stats) { \
+ RuntimeCallStats* stats = isolate->counters()->runtime_call_stats(); \
+ RuntimeCallTimerScope timer(isolate, &stats->Name); \
+ value = __RT_impl_##Name(args, isolate); \
+ } else { \
+ value = __RT_impl_##Name(args, isolate); \
+ } \
+ return value; \
+ } \
static Type __RT_impl_##Name(Arguments args, Isolate* isolate)
#define RUNTIME_FUNCTION(Name) RUNTIME_FUNCTION_RETURNS_TYPE(Object*, Name)