[Isolates] Fix auto extraction of isolate from heap objects in handle constructor.

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 620 matching lines @@
   Handle<Context> GetCallingGlobalContext();
 
   void RegisterTryCatchHandler(v8::TryCatch* that);
   void UnregisterTryCatchHandler(v8::TryCatch* that);
 
   char* ArchiveThread(char* to);
   char* RestoreThread(char* from);
 
   static const char* const kStackOverflowMessage;
 
-  static const int kUC16AlphabetSize = 256; // See StringSearchBase.
-  static const int kBMMaxShift = 250;       // See StringSearchBase.
+  static const int kUC16AlphabetSize = 256;  // See StringSearchBase.
+  static const int kBMMaxShift = 250;        // See StringSearchBase.
 
   // Accessors.
 #define GLOBAL_ACCESSOR(type, name, initialvalue)                              \
   type name() const { return name##_; }                                        \
   void set_##name(type value) { name##_ = value; }
   ISOLATE_INIT_LIST(GLOBAL_ACCESSOR)
 #undef GLOBAL_ACCESSOR
 
 #define GLOBAL_ARRAY_ACCESSOR(type, name, length)                              \
   type* name() { return &(name##_[0]); }
@@ skipping 385 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(Isolate);
 };
 
 
 // If the GCC version is 4.1.x or 4.2.x an additional field is added to the
 // class as a work around for a bug in the generated code found with these
 // versions of GCC. See V8 issue 122 for details.
 class SaveContext BASE_EMBEDDED {
  public:
-  SaveContext()
-      : context_(Isolate::Current()->context()),
+  explicit SaveContext(Isolate* isolate) : prev_(isolate->save_context()) {
+    if (isolate->context() != NULL) {
+      context_ = Handle<Context>(isolate->context());
 #if __GNUC_VERSION__ >= 40100 && __GNUC_VERSION__ < 40300
-        dummy_(Isolate::Current()->context()),
+      dummy_ = Handle<Context>(isolate->context());
 #endif
-        prev_(Isolate::Current()->save_context()) {
-    Isolate::Current()->set_save_context(this);
+    }
+    isolate->set_save_context(this);
 
     // If there is no JS frame under the current C frame, use the value 0.
     JavaScriptFrameIterator it;
     js_sp_ = it.done() ? 0 : it.frame()->sp();
   }
 
   ~SaveContext() {
-    Isolate::Current()->set_context(*context_);
-    Isolate::Current()->set_save_context(prev_);
+    if (context_.is_null()) {
+      Isolate* isolate = Isolate::Current();
+      isolate->set_context(NULL);
+      isolate->set_save_context(prev_);
+    } else {
+      Isolate* isolate = context_->GetIsolate();
+      isolate->set_context(*context_);
+      isolate->set_save_context(prev_);
+    }
   }
 
   Handle<Context> context() { return context_; }
   SaveContext* prev() { return prev_; }
 
   // Returns true if this save context is below a given JavaScript frame.
   bool below(JavaScriptFrame* frame) {
     return (js_sp_ == 0) || (frame->sp() < js_sp_);
   }
 
@@ skipping 111 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_