| Index: src/vm-state-inl.h
|
| diff --git a/src/vm-state-inl.h b/src/vm-state-inl.h
|
| index 2e1ef195c28c2d7224f19a1f7c13645ddc1b1963..2e2e044600089bd9cff35be8ae8a7693fc7e484f 100644
|
| --- a/src/vm-state-inl.h
|
| +++ b/src/vm-state-inl.h
|
| @@ -55,13 +55,16 @@ inline const char* StateToString(StateTag state) {
|
| }
|
| }
|
|
|
| -VMState::VMState(StateTag state)
|
| - : disabled_(true),
|
| +VMState::VMState(Isolate* isolate, StateTag state)
|
| + : isolate_(isolate),
|
| + disabled_(true),
|
| state_(OTHER),
|
| - external_callback_(NULL),
|
| - isolate_(Isolate::Current()) {
|
| + external_callback_(NULL) {
|
| + ASSERT(isolate == Isolate::Current());
|
| +
|
| #ifdef ENABLE_LOGGING_AND_PROFILING
|
| - if (!LOGGER->is_logging() && !CpuProfiler::is_profiling()) {
|
| + if (!isolate_->logger()->is_logging() &&
|
| + !CpuProfiler::is_profiling(isolate_)) {
|
| return;
|
| }
|
| #endif
|
|
|