| Index: test/cctest/test-log-stack-tracer.cc
|
| diff --git a/test/cctest/test-log-stack-tracer.cc b/test/cctest/test-log-stack-tracer.cc
|
| index ca6c7aea47bd11f76bc3e10e4f16f7c7174a8453..4333498d8b1fe987bd49c50a7f438de2c311790d 100644
|
| --- a/test/cctest/test-log-stack-tracer.cc
|
| +++ b/test/cctest/test-log-stack-tracer.cc
|
| @@ -92,12 +92,12 @@ class TraceExtension : public v8::Extension {
|
| TraceExtension() : v8::Extension("v8/trace", kSource) { }
|
| virtual v8::Handle<v8::FunctionTemplate> GetNativeFunction(
|
| v8::Handle<String> name);
|
| - static v8::Handle<v8::Value> Trace(const v8::Arguments& args);
|
| - static v8::Handle<v8::Value> JSTrace(const v8::Arguments& args);
|
| - static v8::Handle<v8::Value> JSEntrySP(const v8::Arguments& args);
|
| - static v8::Handle<v8::Value> JSEntrySPLevel2(const v8::Arguments& args);
|
| + static void Trace(const v8::FunctionCallbackInfo<v8::Value>& args);
|
| + static void JSTrace(const v8::FunctionCallbackInfo<v8::Value>& args);
|
| + static void JSEntrySP(const v8::FunctionCallbackInfo<v8::Value>& args);
|
| + static void JSEntrySPLevel2(const v8::FunctionCallbackInfo<v8::Value>& args);
|
| private:
|
| - static Address GetFP(const v8::Arguments& args);
|
| + static Address GetFP(const v8::FunctionCallbackInfo<v8::Value>& args);
|
| static const char* kSource;
|
| };
|
|
|
| @@ -125,7 +125,7 @@ v8::Handle<v8::FunctionTemplate> TraceExtension::GetNativeFunction(
|
| }
|
|
|
|
|
| -Address TraceExtension::GetFP(const v8::Arguments& args) {
|
| +Address TraceExtension::GetFP(const v8::FunctionCallbackInfo<v8::Value>& args) {
|
| // Convert frame pointer from encoding as smis in the arguments to a pointer.
|
| CHECK_EQ(2, args.Length()); // Ignore second argument on 32-bit platform.
|
| #if defined(V8_HOST_ARCH_32_BIT)
|
| @@ -142,15 +142,13 @@ Address TraceExtension::GetFP(const v8::Arguments& args) {
|
| }
|
|
|
|
|
| -v8::Handle<v8::Value> TraceExtension::Trace(const v8::Arguments& args) {
|
| +void TraceExtension::Trace(const v8::FunctionCallbackInfo<v8::Value>& args) {
|
| DoTrace(GetFP(args));
|
| - return v8::Undefined();
|
| }
|
|
|
|
|
| -v8::Handle<v8::Value> TraceExtension::JSTrace(const v8::Arguments& args) {
|
| +void TraceExtension::JSTrace(const v8::FunctionCallbackInfo<v8::Value>& args) {
|
| DoTraceHideCEntryFPAddress(GetFP(args));
|
| - return v8::Undefined();
|
| }
|
|
|
|
|
| @@ -160,20 +158,19 @@ static Address GetJsEntrySp() {
|
| }
|
|
|
|
|
| -v8::Handle<v8::Value> TraceExtension::JSEntrySP(const v8::Arguments& args) {
|
| +void TraceExtension::JSEntrySP(
|
| + const v8::FunctionCallbackInfo<v8::Value>& args) {
|
| CHECK_NE(0, GetJsEntrySp());
|
| - return v8::Undefined();
|
| }
|
|
|
|
|
| -v8::Handle<v8::Value> TraceExtension::JSEntrySPLevel2(
|
| - const v8::Arguments& args) {
|
| +void TraceExtension::JSEntrySPLevel2(
|
| + const v8::FunctionCallbackInfo<v8::Value>& args) {
|
| v8::HandleScope scope(args.GetIsolate());
|
| const Address js_entry_sp = GetJsEntrySp();
|
| CHECK_NE(0, js_entry_sp);
|
| CompileRun("js_entry_sp();");
|
| CHECK_EQ(js_entry_sp, GetJsEntrySp());
|
| - return v8::Undefined();
|
| }
|
|
|
|
|
| @@ -197,7 +194,7 @@ static bool IsAddressWithinFuncCode(const char* func_name, Address addr) {
|
| // This C++ function is called as a constructor, to grab the frame pointer
|
| // from the calling function. When this function runs, the stack contains
|
| // a C_Entry frame and a Construct frame above the calling function's frame.
|
| -static v8::Handle<Value> construct_call(const v8::Arguments& args) {
|
| +static void construct_call(const v8::FunctionCallbackInfo<v8::Value>& args) {
|
| i::Isolate* isolate = reinterpret_cast<i::Isolate*>(args.GetIsolate());
|
| i::StackFrameIterator frame_iterator(isolate);
|
| CHECK(frame_iterator.frame()->is_exit());
|
| @@ -219,7 +216,7 @@ static v8::Handle<Value> construct_call(const v8::Arguments& args) {
|
| #else
|
| #error Host architecture is neither 32-bit nor 64-bit.
|
| #endif
|
| - return args.This();
|
| + args.GetReturnValue().Set(args.This());
|
| }
|
|
|
|
|
|
|