Changes to pass the current isolate to all runtime and native calls.

runtime/vm/unit_test.h

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #ifndef VM_UNIT_TEST_H_
 #define VM_UNIT_TEST_H_
 
 #include "include/dart_api.h"
 
 #include "vm/ast.h"
@@ skipping 13 matching lines @@
   static const dart::TestCase kRegister##name(Dart_Test##name, #name);         \
   void Dart_Test##name()
 
 // The TEST_CASE macro is used for tests that need an isolate and zone
 // in order to test its functionality.
 #define TEST_CASE(name)                                                        \
   static void Dart_TestHelper##name();                                         \
   UNIT_TEST_CASE(name)                                                         \
   {                                                                            \
     TestIsolateScope __test_isolate__;                                         \
-    Zone __zone__;                                                             \
-    HandleScope __hs__;                                                        \
+    Zone __zone__(__test_isolate__.isolate());                                 \
+    HandleScope __hs__(__test_isolate__.isolate());                            \
     Dart_TestHelper##name();                                                   \
   }                                                                            \
   static void Dart_TestHelper##name()
 
 // The ASSEMBLER_TEST_GENERATE macro is used to generate a unit test
 // for the assembler.
 #define ASSEMBLER_TEST_GENERATE(name, assembler)                               \
   static void AssemblerTestGenerate##name(Assembler* assembler)
 
 // The ASSEMBLER_TEST_RUN macro is used to execute the assembler unit
@@ skipping 130 matching lines @@
     isolate_ = reinterpret_cast<Isolate*>(Dart_CreateIsolate(NULL, NULL));
     EXPECT(isolate_ != NULL);
     Dart_EnterScope();  // Create a Dart API scope for unit tests.
   }
   ~TestIsolateScope() {
     Dart_ExitScope();  // Exit the Dart API scope created for unit tests.
     ASSERT(isolate_ == Isolate::Current());
     Dart_ShutdownIsolate();
     isolate_ = NULL;
   }
+  Isolate* isolate() const { return isolate_; }
 
  private:
   Isolate* isolate_;
 
   DISALLOW_COPY_AND_ASSIGN(TestIsolateScope);
 };
 
 
 class AssemblerTest {
  public:
@@ skipping 57 matching lines @@
 
 #define EXPECT_VALID(handle)                                                  \
   if (Dart_IsError((handle))) {                                               \
     dart::Expect(__FILE__, __LINE__).Fail("invalid handle '%s':\n    '%s'\n", \
                                           #handle, Dart_GetError(handle));    \
   }
 
 }  // namespace dart
 
 #endif  // VM_UNIT_TEST_H_