| Index: src/isolate.h | 
| diff --git a/src/isolate.h b/src/isolate.h | 
| index ef1dd30b227b1ec9a263d27c85ce1ec940715b32..13669cdc75c03defc165507a9613313a22b65dd1 100644 | 
| --- a/src/isolate.h | 
| +++ b/src/isolate.h | 
| @@ -389,24 +389,16 @@ class Isolate { | 
| thread_id_(thread_id), | 
| stack_limit_(0), | 
| thread_state_(NULL), | 
| -#if !defined(__arm__) && V8_TARGET_ARCH_ARM || \ | 
| -    !defined(__aarch64__) && V8_TARGET_ARCH_A64 || \ | 
| -    !defined(__mips__) && V8_TARGET_ARCH_MIPS | 
| simulator_(NULL), | 
| -#endif | 
| next_(NULL), | 
| prev_(NULL) { } | 
| +    ~PerIsolateThreadData(); | 
| Isolate* isolate() const { return isolate_; } | 
| ThreadId thread_id() const { return thread_id_; } | 
|  | 
| FIELD_ACCESSOR(uintptr_t, stack_limit) | 
| FIELD_ACCESSOR(ThreadState*, thread_state) | 
| - | 
| -#if !defined(__arm__) && V8_TARGET_ARCH_ARM || \ | 
| -    !defined(__aarch64__) && V8_TARGET_ARCH_A64 || \ | 
| -    !defined(__mips__) && V8_TARGET_ARCH_MIPS | 
| FIELD_ACCESSOR(Simulator*, simulator) | 
| -#endif | 
|  | 
| bool Matches(Isolate* isolate, ThreadId thread_id) const { | 
| return isolate_ == isolate && thread_id_.Equals(thread_id); | 
| @@ -417,12 +409,7 @@ class Isolate { | 
| ThreadId thread_id_; | 
| uintptr_t stack_limit_; | 
| ThreadState* thread_state_; | 
| - | 
| -#if !defined(__arm__) && V8_TARGET_ARCH_ARM || \ | 
| -    !defined(__aarch64__) && V8_TARGET_ARCH_A64 || \ | 
| -    !defined(__mips__) && V8_TARGET_ARCH_MIPS | 
| Simulator* simulator_; | 
| -#endif | 
|  | 
| PerIsolateThreadData* next_; | 
| PerIsolateThreadData* prev_; | 
|  |