diff options
Diffstat (limited to 'deps/v8/test/cctest/test-api.h')
-rw-r--r-- | deps/v8/test/cctest/test-api.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/deps/v8/test/cctest/test-api.h b/deps/v8/test/cctest/test-api.h index 8887a8a976..f9a335a7f4 100644 --- a/deps/v8/test/cctest/test-api.h +++ b/deps/v8/test/cctest/test-api.h @@ -5,7 +5,6 @@ #include "src/v8.h" #include "src/isolate.h" -#include "src/profiler/cpu-profiler.h" #include "src/vm-state.h" #include "test/cctest/cctest.h" @@ -14,10 +13,11 @@ static void CheckReturnValue(const T& t, i::Address callback) { v8::ReturnValue<v8::Value> rv = t.GetReturnValue(); i::Object** o = *reinterpret_cast<i::Object***>(&rv); CHECK_EQ(CcTest::isolate(), t.GetIsolate()); + i::Isolate* isolate = reinterpret_cast<i::Isolate*>(t.GetIsolate()); CHECK_EQ(t.GetIsolate(), rv.GetIsolate()); - CHECK((*o)->IsTheHole() || (*o)->IsUndefined()); + CHECK((*o)->IsTheHole(isolate) || (*o)->IsUndefined(isolate)); // Verify reset - bool is_runtime = (*o)->IsTheHole(); + bool is_runtime = (*o)->IsTheHole(isolate); if (is_runtime) { CHECK(rv.Get()->IsUndefined()); } else { @@ -25,14 +25,13 @@ static void CheckReturnValue(const T& t, i::Address callback) { CHECK_EQ(*v, *o); } rv.Set(true); - CHECK(!(*o)->IsTheHole() && !(*o)->IsUndefined()); + CHECK(!(*o)->IsTheHole(isolate) && !(*o)->IsUndefined(isolate)); rv.Set(v8::Local<v8::Object>()); - CHECK((*o)->IsTheHole() || (*o)->IsUndefined()); - CHECK_EQ(is_runtime, (*o)->IsTheHole()); - i::Isolate* isolate = reinterpret_cast<i::Isolate*>(t.GetIsolate()); + CHECK((*o)->IsTheHole(isolate) || (*o)->IsUndefined(isolate)); + CHECK_EQ(is_runtime, (*o)->IsTheHole(isolate)); // If CPU profiler is active check that when API callback is invoked // VMState is set to EXTERNAL. - if (isolate->cpu_profiler()->is_profiling()) { + if (isolate->is_profiling()) { CHECK_EQ(v8::EXTERNAL, isolate->current_vm_state()); CHECK(isolate->external_callback_scope()); CHECK_EQ(callback, isolate->external_callback_scope()->callback()); |