- Ensure that HandleScope is initialized with a thread. (Remove

runtime/vm/object_graph_test.cc

 // Copyright (c) 2014, 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/assert.h"
 #include "vm/object_graph.h"
 #include "vm/unit_test.h"
 
 namespace dart {
 
@@ skipping 21 matching lines @@
 
  private:
   int count_;
   intptr_t size_;
   RawObject* skip_;
   RawObject* expected_parent_;
 };
 
 
 TEST_CASE(ObjectGraph) {
-  Isolate* isolate = Isolate::Current();
+  Isolate* isolate = thread->isolate();
   // Create a simple object graph with objects a, b, c, d:
   //  a+->b+->c
   //  +   +
   //  |   v
   //  +-->d
   Array& a = Array::Handle(Array::New(12, Heap::kNew));
   Array& b = Array::Handle(Array::New(2, Heap::kOld));
   Array& c = Array::Handle(Array::New(0, Heap::kOld));
   Array& d = Array::Handle(Array::New(0, Heap::kOld));
   a.SetAt(10, b);
@@ skipping 39 matching lines @@
               graph.SizeRetainedByInstance(a));
   }
   {
     // Get hold of c again.
     b ^= a.At(10);
     c ^= b.At(0);
     b = Array::null();
     ObjectGraph graph(isolate);
     // A retaining path should end like this: c <- b <- a <- ...
     {
-      HANDLESCOPE(isolate);
+      HANDLESCOPE(thread);
       // Test null, empty, and length 1 array.
       intptr_t null_length = graph.RetainingPath(&c, Object::null_array());
       intptr_t empty_length = graph.RetainingPath(&c, Object::empty_array());
       Array& path = Array::Handle(Array::New(1, Heap::kNew));
       intptr_t one_length = graph.RetainingPath(&c, path);
       EXPECT_EQ(null_length, empty_length);
       EXPECT_EQ(null_length, one_length);
       EXPECT_LE(3, null_length);
     }
     {
-      HANDLESCOPE(isolate);
+      HANDLESCOPE(thread);
       Array& path = Array::Handle(Array::New(6, Heap::kNew));
       // Trigger a full GC to increase probability of concurrent tasks.
       isolate->heap()->CollectAllGarbage();
       intptr_t length = graph.RetainingPath(&c, path);
       EXPECT_LE(3, length);
       Array& expected_c = Array::Handle();
       expected_c ^= path.At(0);
       // c is the first element in b.
       Smi& offset_from_parent = Smi::Handle();
       offset_from_parent ^= path.At(1);
       EXPECT_EQ(Array::element_offset(0),
                 offset_from_parent.Value() * kWordSize);
       Array& expected_b = Array::Handle();
       expected_b ^= path.At(2);
       // b is the element with index 10 in a.
       offset_from_parent ^= path.At(3);
       EXPECT_EQ(Array::element_offset(10),
                 offset_from_parent.Value() * kWordSize);
       Array& expected_a = Array::Handle();
       expected_a ^= path.At(4);
       EXPECT(expected_c.raw() == c.raw());
       EXPECT(expected_b.raw() == a.At(10));
       EXPECT(expected_a.raw() == a.raw());
     }
   }
 }
 
 }  // namespace dart