diff options
Diffstat (limited to 'deps/v8/test/cctest/trace-extension.cc')
| -rw-r--r-- | deps/v8/test/cctest/trace-extension.cc | 40 |
1 files changed, 18 insertions, 22 deletions
diff --git a/deps/v8/test/cctest/trace-extension.cc b/deps/v8/test/cctest/trace-extension.cc index cb44ebde7a..3e2a9192d7 100644 --- a/deps/v8/test/cctest/trace-extension.cc +++ b/deps/v8/test/cctest/trace-extension.cc @@ -28,6 +28,7 @@ #include "test/cctest/trace-extension.h" #include "include/v8-profiler.h" +#include "src/objects/smi.h" #include "src/vm-state-inl.h" #include "test/cctest/cctest.h" @@ -43,29 +44,24 @@ const char* TraceExtension::kSource = v8::Local<v8::FunctionTemplate> TraceExtension::GetNativeFunctionTemplate( v8::Isolate* isolate, v8::Local<v8::String> name) { - v8::Local<v8::Context> context = isolate->GetCurrentContext(); - if (name->Equals(context, v8::String::NewFromUtf8(isolate, "trace", - v8::NewStringType::kNormal) - .ToLocalChecked()) - .FromJust()) { + if (name->StrictEquals( + v8::String::NewFromUtf8(isolate, "trace", v8::NewStringType::kNormal) + .ToLocalChecked())) { return v8::FunctionTemplate::New(isolate, TraceExtension::Trace); - } else if (name->Equals(context, - v8::String::NewFromUtf8(isolate, "js_trace", - v8::NewStringType::kNormal) - .ToLocalChecked()) - .FromJust()) { + } else if (name->StrictEquals( + v8::String::NewFromUtf8(isolate, "js_trace", + v8::NewStringType::kNormal) + .ToLocalChecked())) { return v8::FunctionTemplate::New(isolate, TraceExtension::JSTrace); - } else if (name->Equals(context, - v8::String::NewFromUtf8(isolate, "js_entry_sp", - v8::NewStringType::kNormal) - .ToLocalChecked()) - .FromJust()) { + } else if (name->StrictEquals( + v8::String::NewFromUtf8(isolate, "js_entry_sp", + v8::NewStringType::kNormal) + .ToLocalChecked())) { return v8::FunctionTemplate::New(isolate, TraceExtension::JSEntrySP); - } else if (name->Equals(context, - v8::String::NewFromUtf8(isolate, "js_entry_sp_level2", - v8::NewStringType::kNormal) - .ToLocalChecked()) - .FromJust()) { + } else if (name->StrictEquals( + v8::String::NewFromUtf8(isolate, "js_entry_sp_level2", + v8::NewStringType::kNormal) + .ToLocalChecked())) { return v8::FunctionTemplate::New(isolate, TraceExtension::JSEntrySPLevel2); } UNREACHABLE(); @@ -81,9 +77,9 @@ Address TraceExtension::GetFP(const v8::FunctionCallbackInfo<v8::Value>& args) { uint64_t kSmiValueMask = (static_cast<uintptr_t>(1) << (kSmiValueSize - 1)) - 1; uint64_t low_bits = - (*reinterpret_cast<Smi**>(*args[0]))->value() & kSmiValueMask; + Smi(*reinterpret_cast<Address*>(*args[0]))->value() & kSmiValueMask; uint64_t high_bits = - (*reinterpret_cast<Smi**>(*args[1]))->value() & kSmiValueMask; + Smi(*reinterpret_cast<Address*>(*args[1]))->value() & kSmiValueMask; Address fp = static_cast<Address>((high_bits << (kSmiValueSize - 1)) | low_bits); #else |