Changes to support dprof and Observatory profiler UIs

runtime/vm/object_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 "vm/assembler.h"
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_entry.h"
 #include "vm/debugger.h"
@@ skipping 3450 matching lines @@
   EXPECT_EQ(field_a.raw(), field_a_from_index.raw());
   Field& field_b_from_index = Field::Handle();
   field_b_from_index ^= class_a_fields.At(field_b_index);
   ASSERT(!field_b_from_index.IsNull());
   // Same field.
   EXPECT_EQ(field_b.raw(), field_b_from_index.raw());
 }
 
 
 TEST_CASE(FindFunctionIndex) {
+  // Tests both FindFunctionIndex and FindImplicitClosureFunctionIndex.

[Ivan Posva, 2014/01/03 01:52:17]

Can you add the dispatcher lookups to the tests as well?

[Cutch, 2014/01/03 16:01:56]

Done.

   const char* kScriptChars =
       "class A {\n"
       "  void a() {}\n"
-      "  void b() {}\n"
+      "  void b() { return a; }\n"
       "}\n"
       "class B {\n"
       "  dynamic d() {}\n"
       "}\n"
+      "var x;\n"
       "test() {\n"
-      "  new A();\n"
+      "  x = new A().b();\n"
+      "  x();\n"
       "  new B();\n"
+      "  return x;\n"
       "}";
   Dart_Handle h_lib = TestCase::LoadTestScript(kScriptChars, NULL);
   EXPECT_VALID(h_lib);
   Dart_Handle result = Dart_Invoke(h_lib, NewString("test"), 0, NULL);
   EXPECT_VALID(result);
   Library& lib = Library::Handle();
   lib ^= Api::UnwrapHandle(h_lib);
   EXPECT(!lib.IsNull());
   const Class& class_a = Class::Handle(GetClass(lib, "A"));
   const Array& class_a_funcs = Array::Handle(class_a.functions());
   const Class& class_b = Class::Handle(GetClass(lib, "B"));
   const Function& func_a = Function::Handle(GetFunction(class_a, "a"));
   const Function& func_b = Function::Handle(GetFunction(class_a, "b"));
   const Function& func_d = Function::Handle(GetFunction(class_b, "d"));
+  EXPECT(func_a.HasImplicitClosureFunction());
+  const Function& func_x = Function::Handle(func_a.ImplicitClosureFunction());
   intptr_t func_a_index = class_a.FindFunctionIndex(func_a);
   intptr_t func_b_index = class_a.FindFunctionIndex(func_b);
   intptr_t func_d_index = class_a.FindFunctionIndex(func_d);
+  intptr_t func_x_index = class_a.FindImplicitClosureFunctionIndex(func_x);
   // Valid index.
   EXPECT_GE(func_a_index, 0);
   // Valid index.
   EXPECT_GE(func_b_index, 0);
   // Invalid index.
   EXPECT_EQ(func_d_index, -1);
+  // Valid index.
+  EXPECT_GE(func_x_index, 0);
   Function& func_a_from_index = Function::Handle();
   func_a_from_index ^= class_a_funcs.At(func_a_index);
-  ASSERT(!func_a_from_index.IsNull());
+  EXPECT(!func_a_from_index.IsNull());
   // Same function.
   EXPECT_EQ(func_a.raw(), func_a_from_index.raw());
   Function& func_b_from_index = Function::Handle();
   func_b_from_index ^= class_a_funcs.At(func_b_index);
-  ASSERT(!func_b_from_index.IsNull());
+  EXPECT(!func_b_from_index.IsNull());
   // Same function.
   EXPECT_EQ(func_b.raw(), func_b_from_index.raw());
+  // Retrieve function a from x's index.
+  func_a_from_index ^= class_a_funcs.At(func_x_index);
+  EXPECT_EQ(func_a.raw(), func_a_from_index.raw());
+  EXPECT(func_a.HasImplicitClosureFunction());
+  Function& func_x_from_index = Function::Handle();
+  func_x_from_index ^= func_a_from_index.ImplicitClosureFunction();
+  EXPECT_EQ(func_x.raw(), func_x_from_index.raw());
 }
 
 
 TEST_CASE(FindClosureIndex) {
   // Allocate the class first.
   const String& class_name = String::Handle(Symbols::New("MyClass"));
   const Script& script = Script::Handle();
   const Class& cls = Class::Handle(CreateDummyClass(class_name, script));
   const Array& functions = Array::Handle(Array::New(1));
 
   Function& parent = Function::Handle();
   const String& parent_name = String::Handle(Symbols::New("foo_papa"));
   parent = Function::New(parent_name, RawFunction::kRegularFunction,
                          false, false, false, false, false, cls, 0);
   functions.SetAt(0, parent);
   cls.SetFunctions(functions);
 
   Function& function = Function::Handle();
   const String& function_name = String::Handle(Symbols::New("foo"));
   function = Function::NewClosureFunction(function_name, parent, 0);
   // Add closure function to class.
   cls.AddClosureFunction(function);
 
-  // Token position 0 should return a valid index.
-  intptr_t good_closure_index = cls.FindClosureIndex(0);
+  // The closure should return a valid index.
+  intptr_t good_closure_index = cls.FindClosureIndex(function);
   EXPECT_GE(good_closure_index, 0);
-  // Token position 1 should return an invalid index.
-  intptr_t bad_closure_index = cls.FindClosureIndex(1);
+  // The parent function should return an invalid index.
+  intptr_t bad_closure_index = cls.FindClosureIndex(parent);
   EXPECT_EQ(bad_closure_index, -1);
 
   // Retrieve closure function via index.
   const GrowableObjectArray& closures = GrowableObjectArray::Handle(
       cls.closures());
   Function& func_from_index = Function::Handle();
   func_from_index ^= closures.At(good_closure_index);
 
   // Same closure function.
   EXPECT_EQ(func_from_index.raw(), function.raw());
@@ skipping 376 matching lines @@
   // Simple map.
   //
   // TODO(turnidge): Consider showing something like: {1: 2, 2: 'otter'}
   result = Dart_GetField(lib, NewString("simple_map"));
   EXPECT_VALID(result);
   obj ^= Api::UnwrapHandle(result);
   EXPECT_STREQ("Instance of '_LinkedHashMap'", obj.ToUserCString());
 }
 
 }  // namespace dart