| Index: src/isolate.cc
|
| diff --git a/src/isolate.cc b/src/isolate.cc
|
| index 5bb2311efbec26b5fbb56df8a750aca90d1844f7..8521017eaf07206827ac10cca200b211e57915d4 100644
|
| --- a/src/isolate.cc
|
| +++ b/src/isolate.cc
|
| @@ -1847,7 +1847,9 @@ void Isolate::TearDown() {
|
| // direct pointer. We don't use Enter/Exit here to avoid
|
| // initializing the thread data.
|
| PerIsolateThreadData* saved_data = CurrentPerIsolateThreadData();
|
| - Isolate* saved_isolate = UncheckedCurrent();
|
| + DCHECK(base::NoBarrier_Load(&isolate_key_created_) == 1);
|
| + Isolate* saved_isolate =
|
| + reinterpret_cast<Isolate*>(base::Thread::GetThreadLocal(isolate_key_));
|
| SetIsolateThreadLocals(this, NULL);
|
|
|
| Deinit();
|
|
|