[Isolates] A fix for 2 crashing tests in arm simulator (post-API patch).

src/isolate.h

 // Copyright 2010 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 30 matching lines @@
 #include "regexp-stack.h"
 #include "runtime.h"
 #include "zone.h"
 #include "../include/v8-debug.h"
 
 
 #if !defined(__arm__) && defined(V8_TARGET_ARCH_ARM)
 namespace assembler {
 namespace arm {
 class Redirection;
+class Simulator;
 }
 }
 #endif
 
 
 namespace v8 {
 namespace internal {
 
 class AstSentinels;
 class Bootstrapper;
@@ skipping 242 matching lines @@
   // A thread has a PerIsolateThreadData instance for each isolate that it has
   // entered. That instance is allocated when the isolate is initially entered
   // and reused on subsequent entries.
   class PerIsolateThreadData {
    public:
     PerIsolateThreadData(Isolate* isolate, ThreadId thread_id)
         : isolate_(isolate),
           thread_id_(thread_id),
           stack_limit_(0),
           thread_state_(NULL),
+#if !defined(__arm__) && defined(V8_TARGET_ARCH_ARM)
+          simulator_(NULL),
+#endif
           next_(NULL),
           prev_(NULL) { }
     Isolate* isolate() const { return isolate_; }
     ThreadId thread_id() const { return thread_id_; }
     void set_stack_limit(uintptr_t value) { stack_limit_ = value; }
     uintptr_t stack_limit() const { return stack_limit_; }
     ThreadState* thread_state() const { return thread_state_; }
     void set_thread_state(ThreadState* value) { thread_state_ = value; }
+
+#if !defined(__arm__) && defined(V8_TARGET_ARCH_ARM)
+    assembler::arm::Simulator* simulator() const { return simulator_; }
+    void set_simulator(assembler::arm::Simulator* simulator) {
+      simulator_ = simulator;
+    }
+#endif
+
     bool Matches(Isolate* isolate, ThreadId thread_id) const {
       return isolate_ == isolate && thread_id_ == thread_id;
     }
 
    private:
     Isolate* isolate_;
     ThreadId thread_id_;
     uintptr_t stack_limit_;
     ThreadState* thread_state_;
 
+#if !defined(__arm__) && defined(V8_TARGET_ARCH_ARM)
+    assembler::arm::Simulator* simulator_;
+#endif
+
     PerIsolateThreadData* next_;
     PerIsolateThreadData* prev_;
 
     friend class Isolate;
     friend class ThreadDataTable;
     friend class EntryStackItem;
 
     DISALLOW_COPY_AND_ASSIGN(PerIsolateThreadData);
   };
 
@@ skipping 443 matching lines @@
   HistogramInfo* heap_histograms() { return heap_histograms_; }
 
   JSObject::SpillInformation* js_spill_information() {
     return &js_spill_information_;
   }
 
   int* code_kind_statistics() { return code_kind_statistics_; }
 #endif
 
 #if defined(V8_TARGET_ARCH_ARM) && !defined(__arm__)
-  static v8::internal::Thread::LocalStorageKey* simulator_key() {
-    return &simulator_key_;
-  }
-
   bool simulator_initialized() { return simulator_initialized_; }
   void set_simulator_initialized(bool initialized) {
     simulator_initialized_ = initialized;
   }
 
   HashMap* simulator_i_cache() { return simulator_i_cache_; }
   void set_simulator_i_cache(HashMap* hash_map) {
     simulator_i_cache_ = hash_map;
   }
 
@@ skipping 169 matching lines @@
   StaticResource<StringInputBuffer> objects_string_input_buffer_;
   unibrow::Mapping<unibrow::Ecma262Canonicalize>
       regexp_macro_assembler_canonicalize_;
   RegExpStack* regexp_stack_;
   unibrow::Mapping<unibrow::Ecma262Canonicalize> interp_canonicalize_mapping_;
   ZoneObjectList frame_element_constant_list_;
   ZoneObjectList result_constant_list_;
   AtomicWord vm_state_;
 
 #if defined(V8_TARGET_ARCH_ARM) && !defined(__arm__)
-  // Create one simulator per thread and keep it in thread local storage.
-  static v8::internal::Thread::LocalStorageKey simulator_key_;
   bool simulator_initialized_;
   HashMap* simulator_i_cache_;
   assembler::arm::Redirection* simulator_redirection_;
 #endif
 
 #ifdef DEBUG
   // A static array of histogram info for each type.
   HistogramInfo heap_histograms_[LAST_TYPE + 1];
   JSObject::SpillInformation js_spill_information_;
   int code_kind_statistics_[Code::NUMBER_OF_KINDS];
@@ skipping 165 matching lines @@
 #define ISOLATED_CLASS class
 
 } }  // namespace v8::internal
 
 // TODO(isolates): Get rid of these -inl.h includes and place them only where
 //                 they're needed.
 #include "allocation-inl.h"
 #include "zone-inl.h"
 
 #endif  // V8_ISOLATE_H_