- Remove deprecated StackZone constructor with Isolate parameter.

runtime/vm/snapshot_test.cc

 // Copyright (c) 2012, 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 "platform/globals.h"
 
 #include "include/dart_tools_api.h"
 #include "platform/assert.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart_api_impl.h"
@@ skipping 1148 matching lines @@
   Dart_Handle result;
 
   uint8_t* isolate_snapshot_buffer;
 
   // Start an Isolate, load a script and create a full snapshot.
   Timer timer1(true, "Snapshot_test");
   timer1.Start();
   {
     TestIsolateScope __test_isolate__;
 
-    Isolate* isolate = Isolate::Current();
-    StackZone zone(isolate);
-    HandleScope scope(Thread::Current());
+    Thread* thread = Thread::Current();
+    StackZone zone(thread);
+    HandleScope scope(thread);
 
     // Create a test library and Load up a test script in it.
     TestCase::LoadTestScript(kScriptChars, NULL);
-    EXPECT_VALID(Api::CheckAndFinalizePendingClasses(isolate));
+    EXPECT_VALID(Api::CheckAndFinalizePendingClasses(thread->isolate()));
     timer1.Stop();
     OS::PrintErr("Without Snapshot: %" Pd64 "us\n", timer1.TotalElapsedTime());
 
     // Write snapshot with object content.
     {
       FullSnapshotWriter writer(NULL,
                                 &isolate_snapshot_buffer,
                                 &malloc_allocator,
                                 false /* snapshot_code */);
       writer.WriteFullSnapshot();
@@ skipping 32 matching lines @@
   const char* kScriptChars = kFullSnapshotScriptChars;
 
   uint8_t* isolate_snapshot_buffer;
 
   // Start an Isolate, load a script and create a full snapshot.
   Timer timer1(true, "Snapshot_test");
   timer1.Start();
   {
     TestIsolateScope __test_isolate__;
 
-    Isolate* isolate = Isolate::Current();
-    StackZone zone(isolate);
-    HandleScope scope(Thread::Current());
+    Thread* thread = Thread::Current();
+    StackZone zone(thread);
+    HandleScope scope(thread);
 
     // Create a test library and Load up a test script in it.
     Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
-    EXPECT_VALID(Api::CheckAndFinalizePendingClasses(isolate));
+    EXPECT_VALID(Api::CheckAndFinalizePendingClasses(thread->isolate()));
     timer1.Stop();
     OS::PrintErr("Without Snapshot: %" Pd64 "us\n", timer1.TotalElapsedTime());
 
     // Write snapshot with object content.
     {
       FullSnapshotWriter writer(NULL,
                                 &isolate_snapshot_buffer,
                                 &malloc_allocator,
                                 false /* snapshot_code */);
       writer.WriteFullSnapshot();
@@ skipping 664 matching lines @@
       "getMixedList() {\n"
       "  var list = new List(kArrayLength);\n"
       "  list[0] = 0;\n"
       "  list[1] = '1';\n"
       "  list[2] = 2.2;\n"
       "  list[3] = true;\n"
       "  return list;\n"
       "}\n";
 
   TestCase::CreateTestIsolate();
-  Isolate* isolate = Isolate::Current();
-  EXPECT(isolate != NULL);
+  Thread* thread = Thread::Current();
+  EXPECT(thread->isolate() != NULL);
   Dart_EnterScope();
 
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
   EXPECT_VALID(lib);
 
   {
-    DARTSCOPE(Thread::Current());
-    StackZone zone(isolate);
+    DARTSCOPE(thread);
+    StackZone zone(thread);
     intptr_t buf_len = 0;
     {
       // Generate a list of nulls from Dart code.
       uint8_t* buf = GetSerialized(lib, "getList", &buf_len);
       ApiNativeScope scope;
       Dart_CObject* root = GetDeserialized(buf, buf_len);
       EXPECT_NOTNULL(root);
       EXPECT_EQ(Dart_CObject_kArray, root->type);
       EXPECT_EQ(kArrayLength, root->value.as_array.length);
       for (int i = 0; i < kArrayLength; i++) {
@@ skipping 94 matching lines @@
       "  list.add([]);\n"
       "  list.add([[]]);\n"
       "  list.add([[[]]]);\n"
       "  list.add([1, [2, [3]]]);\n"
       "  list.add([1, [1, 2, [1, 2, 3]]]);\n"
       "  list.add([1, 2, 3]);\n"
       "  return list;\n"
       "}\n";
 
   TestCase::CreateTestIsolate();
-  Isolate* isolate = Isolate::Current();
-  EXPECT(isolate != NULL);
+  Thread* thread = Thread::Current();
+  EXPECT(thread->isolate() != NULL);
   Dart_EnterScope();
 
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
   EXPECT_VALID(lib);
 
   {
-    DARTSCOPE(Thread::Current());
-    StackZone zone(isolate);
+    DARTSCOPE(thread);
+    StackZone zone(thread);
     intptr_t buf_len = 0;
     {
       // Generate a list of nulls from Dart code.
       uint8_t* buf = GetSerialized(lib, "getList", &buf_len);
       ApiNativeScope scope;
       Dart_CObject* root = GetDeserialized(buf, buf_len);
       EXPECT_NOTNULL(root);
       EXPECT_EQ(Dart_CObject_kArray, root->type);
       EXPECT_EQ(kArrayLength, root->value.as_array.length);
       for (int i = 0; i < kArrayLength; i++) {
@@ skipping 209 matching lines @@
       "}\n"
       "getSelfRefList() {\n"
       "  var list = new List(kArrayLength);\n"
       "  for (var i = 0; i < kArrayLength; i++) {\n"
       "    list[i] = list;\n"
       "  }\n"
       "  return list;\n"
       "}\n";
 
   TestCase::CreateTestIsolate();
-  Isolate* isolate = Isolate::Current();
-  EXPECT(isolate != NULL);
+  Thread* thread = Thread::Current();
+  EXPECT(thread->isolate() != NULL);
   Dart_EnterScope();
 
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
   EXPECT_VALID(lib);
 
   {
-    DARTSCOPE(Thread::Current());
-    StackZone zone(isolate);
+    DARTSCOPE(thread);
+    StackZone zone(thread);
     intptr_t buf_len = 0;
     {
       // Generate a list of strings from Dart code.
       uint8_t* buf = GetSerialized(lib, "getStringList", &buf_len);
       ApiNativeScope scope;
       Dart_CObject* root = GetDeserialized(buf, buf_len);
       EXPECT_NOTNULL(root);
       EXPECT_EQ(Dart_CObject_kArray, root->type);
       EXPECT_EQ(kArrayLength, root->value.as_array.length);
       for (int i = 0; i < kArrayLength; i++) {
@@ skipping 195 matching lines @@
       "}\n"
       "getSelfRefList() {\n"
       "  var list = [];\n"
       "  for (var i = 0; i < kArrayLength; i++) {\n"
       "    list.add(list);\n"
       "  }\n"
       "  return list;\n"
       "}\n";
 
   TestCase::CreateTestIsolate();
-  Isolate* isolate = Isolate::Current();
-  EXPECT(isolate != NULL);
+  Thread* thread = Thread::Current();
+  EXPECT(thread->isolate() != NULL);
   Dart_EnterScope();
 
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
   EXPECT_VALID(lib);
 
   {
-    DARTSCOPE(Thread::Current());
-    StackZone zone(isolate);
+    DARTSCOPE(thread);
+    StackZone zone(thread);
     intptr_t buf_len = 0;
     {
       // Generate a list of strings from Dart code.
       uint8_t* buf = GetSerialized(lib, "getStringList", &buf_len);
       ApiNativeScope scope;
       Dart_CObject* root = GetDeserialized(buf, buf_len);
       EXPECT_NOTNULL(root);
       EXPECT_EQ(Dart_CObject_kArray, root->type);
       EXPECT_EQ(kArrayLength, root->value.as_array.length);
       for (int i = 0; i < kArrayLength; i++) {
@@ skipping 211 matching lines @@
       "  list[index++] = new Int32List.view(data);\n"
       "  list[index++] = new Uint32List.view(data);\n"
       "  list[index++] = new Int64List.view(data);\n"
       "  list[index++] = new Uint64List.view(data);\n"
       "  list[index++] = new Float32List.view(data);\n"
       "  list[index++] = new Float64List.view(data);\n"
       "  return list;\n"
       "}\n";
 
   TestCase::CreateTestIsolate();
-  Isolate* isolate = Isolate::Current();
-  EXPECT(isolate != NULL);
+  Thread* thread = Thread::Current();
+  EXPECT(thread->isolate() != NULL);
   Dart_EnterScope();
 
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
   EXPECT_VALID(lib);
 
   {
-    DARTSCOPE(Thread::Current());
-    StackZone zone(isolate);
+    DARTSCOPE(thread);
+    StackZone zone(thread);
     intptr_t buf_len = 0;
     {
       // Generate a list of Uint8Lists from Dart code.
       uint8_t* buf = GetSerialized(lib, "getTypedDataList", &buf_len);
       ApiNativeScope scope;
       Dart_CObject* root = GetDeserialized(buf, buf_len);
       EXPECT_NOTNULL(root);
       EXPECT_EQ(Dart_CObject_kArray, root->type);
       struct {
         Dart_TypedData_Type type;
@@ skipping 221 matching lines @@
   StackZone zone(Thread::Current());
   uint8_t* buffer;
   MessageWriter writer(&buffer, &zone_allocator, true);
   writer.WriteInlinedObjectHeader(kOmittedObjectId);
   // For performance, we'd like single-byte headers when ids are omitted.
   // If this starts failing, consider renumbering the snapshot ids.
   EXPECT_EQ(1, writer.BytesWritten());
 }
 
 }  // namespace dart