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

runtime/vm/dart_api_impl_test.cc

 // 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.
 
 #include "include/dart_api.h"
 
 #include "vm/assert.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_api_state.h"
 #include "vm/unit_test.h"
@@ skipping 48 matching lines @@
   // Equal objects.
   EXPECT_VALID(Dart_IsSame(five, five_again, &same));
   EXPECT(!same);
 
   // Different objects.
   EXPECT_VALID(Dart_IsSame(five, seven, &same));
   EXPECT(!same);
 
   // Non-instance objects.
   {
-    Zone zone;
-    HandleScope hs;
+    Isolate* isolate = Isolate::Current();
+    DARTSCOPE(isolate);
     const Object& cls1 = Object::Handle(Object::null_class());
     const Object& cls2 = Object::Handle(Object::class_class());
     Dart_Handle class1 = Api::NewLocalHandle(cls1);
     Dart_Handle class2 = Api::NewLocalHandle(cls2);
 
     EXPECT_VALID(Dart_IsSame(class1, class1, &same));
     EXPECT(same);
 
     EXPECT_VALID(Dart_IsSame(class1, class2, &same));
     EXPECT(!same);
@@ skipping 405 matching lines @@
 UNIT_TEST_CASE(EnterExitScope) {
   Dart_CreateIsolate(NULL, NULL);
   Isolate* isolate = Isolate::Current();
   EXPECT(isolate != NULL);
   ApiState* state = isolate->api_state();
   EXPECT(state != NULL);
   ApiLocalScope* scope = state->top_scope();
   Dart_EnterScope();
   {
     EXPECT(state->top_scope() != NULL);
-    Zone zone;
-    HandleScope hs;
+    DARTSCOPE(isolate);
     const String& str1 = String::Handle(String::New("Test String"));
     Dart_Handle ref = Api::NewLocalHandle(str1);
     String& str2 = String::Handle();
     str2 ^= Api::UnwrapHandle(ref);
     EXPECT(str1.Equals(str2));
   }
   Dart_ExitScope();
   EXPECT(scope == state->top_scope());
   Dart_ShutdownIsolate();
 }
 
 
 // Unit test for creating and deleting persistent handles.
 UNIT_TEST_CASE(PersistentHandles) {
   const char* kTestString1 = "Test String1";
   const char* kTestString2 = "Test String2";
   Dart_CreateIsolate(NULL, NULL);
   Isolate* isolate = Isolate::Current();
   EXPECT(isolate != NULL);
   ApiState* state = isolate->api_state();
   EXPECT(state != NULL);
   ApiLocalScope* scope = state->top_scope();
   Dart_Handle handles[2000];
   Dart_EnterScope();
   {
-    Zone zone;
-    HandleScope hs;
+    DARTSCOPE(isolate);
     const String& str1 = String::Handle(String::New(kTestString1));
     Dart_Handle ref1 = Api::NewLocalHandle(str1);
     for (int i = 0; i < 1000; i++) {
       handles[i] = Dart_NewPersistentHandle(ref1);
     }
     Dart_EnterScope();
     const String& str2 = String::Handle(String::New(kTestString2));
     Dart_Handle ref2 = Api::NewLocalHandle(str2);
     for (int i = 1000; i < 2000; i++) {
       handles[i] = Dart_NewPersistentHandle(ref2);
     }
     for (int i = 500; i < 1500; i++) {
       Dart_DeletePersistentHandle(handles[i]);
     }
     for (int i = 500; i < 1000; i++) {
       handles[i] = Dart_NewPersistentHandle(ref2);
     }
     for (int i = 1000; i < 1500; i++) {
       handles[i] = Dart_NewPersistentHandle(ref1);
     }
     VERIFY_ON_TRANSITION;
     Dart_ExitScope();
   }
   Dart_ExitScope();
   {
-    Zone zone;
-    HandleScope hs;
+    DARTSCOPE(isolate);
     for (int i = 0; i < 500; i++) {
       String& str = String::Handle();
       str ^= Api::UnwrapHandle(handles[i]);
       EXPECT(str.Equals(kTestString1));
     }
     for (int i = 500; i < 1000; i++) {
       String& str = String::Handle();
       str ^= Api::UnwrapHandle(handles[i]);
       EXPECT(str.Equals(kTestString2));
     }
@@ skipping 48 matching lines @@
 // scope.
 UNIT_TEST_CASE(LocalHandles) {
   Dart_CreateIsolate(NULL, NULL);
   Isolate* isolate = Isolate::Current();
   EXPECT(isolate != NULL);
   ApiState* state = isolate->api_state();
   EXPECT(state != NULL);
   ApiLocalScope* scope = state->top_scope();
   Dart_Handle handles[300];
   {
-    Zone zone;
-    HandleScope hs;
+    DARTSCOPE(isolate);
     Smi& val = Smi::Handle();
 
     // Start a new scope and allocate some local handles.
     Dart_EnterScope();
     for (int i = 0; i < 100; i++) {
       val ^= Smi::New(i);
       handles[i] = Api::NewLocalHandle(val);
     }
     EXPECT_EQ(100, state->CountLocalHandles());
     for (int i = 0; i < 100; i++) {
@@ skipping 326 matching lines @@
       "class NativeFieldsTest {\n"
       "  static NativeFields testMain() {\n"
       "    NativeFields obj = new NativeFields(10, 20);\n"
       "    return obj;\n"
       "  }\n"
       "}\n";
   Dart_Handle result;
 
   Dart_CreateIsolate(NULL, NULL);
   {
-    Zone zone;
-    HandleScope scope;
+    Isolate* isolate = Isolate::Current();
+    DARTSCOPE(isolate);
     Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
     const int kNumNativeFields = 4;
 
     // Create a test library.
     Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
 
     // Create a native wrapper class with native fields.
     result = Dart_CreateNativeWrapperClass(
         lib,
         Dart_NewString("NativeFieldsWrapper"),
@@ skipping 200 matching lines @@
       "    return obj;\n"
       "  }\n"
       "  static Function testMain2() {\n"
       "    return function() {};\n"
       "  }\n"
       "}\n";
   Dart_Handle result;
 
   Dart_CreateIsolate(NULL, NULL);
   {
-    Zone zone;
-    HandleScope scope;
+    Isolate* isolate = Isolate::Current();
+    DARTSCOPE(isolate);
     Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
 
     // Create a test library and Load up a test script in it.
     Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
 
     // Invoke a function which returns an object of type NativeFields.
     Dart_Handle retobj = Dart_InvokeStatic(lib,
                                            Dart_NewString("NativeFieldsTest"),
                                            Dart_NewString("testMain1"),
                                            0,
@@ skipping 167 matching lines @@
       "class InvokeDynamicTest {\n"
       "  static InvokeDynamic testMain() {\n"
       "    InvokeDynamic obj = new InvokeDynamic(10, 20);\n"
       "    return obj;\n"
       "  }\n"
       "}\n";
   Dart_Handle result;
 
   Dart_CreateIsolate(NULL, NULL);
   {
-    Zone zone;
-    HandleScope scope;
+    Isolate* isolate = Isolate::Current();
+    DARTSCOPE(isolate);
     Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
 
     // Create a test library and Load up a test script in it.
     Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
 
     // Invoke a function which returns an object of type InvokeDynamic.
     Dart_Handle retobj = Dart_InvokeStatic(lib,
                                            Dart_NewString("InvokeDynamicTest"),
                                            Dart_NewString("testMain"),
                                            0,
@@ skipping 50 matching lines @@
       "    return obj.method1(10);\n"
       "  }\n"
       "  static Function testMain2() {\n"
       "    return InvokeClosure.method2(10);\n"
       "  }\n"
       "}\n";
   Dart_Handle result;
 
   Dart_CreateIsolate(NULL, NULL);
   {
-    Zone zone;
-    HandleScope scope;
+    Isolate* isolate = Isolate::Current();
+    DARTSCOPE(isolate);
     Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
 
     // Create a test library and Load up a test script in it.
     Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
 
     // Invoke a function which returns a closure.
     Dart_Handle retobj = Dart_InvokeStatic(lib,
                                            Dart_NewString("InvokeClosureTest"),
                                            Dart_NewString("testMain1"),
                                            0,
@@ skipping 281 matching lines @@
     Dart_ExitScope();  // Exit the Dart API scope.
   }
   Dart_ShutdownIsolate();
 }
 
 
 UNIT_TEST_CASE(NullReceiver) {
   Dart_CreateIsolate(NULL, NULL);
   Dart_EnterScope();  // Enter a Dart API scope for the unit test.
   {
-    Zone zone;
-    HandleScope hs;
+    Isolate* isolate = Isolate::Current();
+    DARTSCOPE(isolate);
 
     Dart_Handle function_name = Dart_NewString("toString");
     const int number_of_arguments = 0;
     Dart_Handle null_receiver = Api::NewLocalHandle(Object::Handle());
     Dart_Handle result = Dart_InvokeDynamic(null_receiver,
                                             function_name,
                                             number_of_arguments,
                                             NULL);
     EXPECT_VALID(result);
     EXPECT(Dart_IsString(result));
@@ skipping 330 matching lines @@
                                NULL);
     EXPECT_VALID(result);
 
     Dart_ExitScope();  // Exit the Dart API scope.
   }
   Dart_ShutdownIsolate();
 }
 #endif  // TARGET_ARCH_IA32.
 
 }  // namespace dart