Make stackmaps store their actual length.

runtime/vm/code_descriptors_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/assert.h"
 #include "vm/globals.h"
 #if defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64)
 
 #include "vm/ast.h"
 #include "vm/assembler.h"
@@ skipping 37 matching lines @@
   parsed_function.set_default_parameter_values(Array::Handle());
   parsed_function.AllocateVariables();
   bool retval;
   Isolate* isolate = Isolate::Current();
   EXPECT(isolate != NULL);
   LongJump* base = isolate->long_jump_base();
   LongJump jump;
   isolate->set_long_jump_base(&jump);
   if (setjmp(*jump.Set()) == 0) {
     // Build a stackmap table and some stackmap table entries.
-    StackmapTableBuilder* stackmap_table_builder = new StackmapTableBuilder(11);
+    const intptr_t kStackSlotCount = 11;
+    StackmapTableBuilder* stackmap_table_builder =
+        new StackmapTableBuilder(kStackSlotCount);
     EXPECT(stackmap_table_builder != NULL);
+
     BitmapBuilder* stack_bitmap = new BitmapBuilder();
     EXPECT(stack_bitmap != NULL);
     stack_bitmap->Set(0, true);
-    EXPECT(stack_bitmap->Get(0));
+    bool expectation0[kStackSlotCount] = { true };
+    for (intptr_t i = 0; i < kStackSlotCount; ++i) {
+      EXPECT_EQ(expectation0[i], stack_bitmap->Get(i));
+    }
     // Add a stack map entry at pc offset 0.
     stackmap_table_builder->AddEntry(0, stack_bitmap);
 
     stack_bitmap = new BitmapBuilder();
     EXPECT(stack_bitmap != NULL);
     stack_bitmap->Set(0, true);
     stack_bitmap->Set(1, false);
     stack_bitmap->Set(2, true);
-    EXPECT(stack_bitmap->Get(0));
-    EXPECT(!stack_bitmap->Get(1));
-    EXPECT(stack_bitmap->Get(2));
+    bool expectation1[kStackSlotCount] = { true, false, true };
+    for (intptr_t i = 0; i < kStackSlotCount; ++i) {
+      EXPECT_EQ(expectation1[i], stack_bitmap->Get(i));
+    }
     // Add a stack map entry at pc offset 1.
     stackmap_table_builder->AddEntry(1, stack_bitmap);
 
     stack_bitmap = new BitmapBuilder();
     EXPECT(stack_bitmap != NULL);
     stack_bitmap->Set(0, true);
     stack_bitmap->Set(1, false);
     stack_bitmap->Set(2, true);
     stack_bitmap->SetRange(3, 5, true);
-    EXPECT(stack_bitmap->Get(0));
-    EXPECT(!stack_bitmap->Get(1));
-    EXPECT(stack_bitmap->Get(2));
-    for (intptr_t i = 3; i <= 5; i++) {
-      EXPECT(stack_bitmap->Get(i));
+    bool expectation2[kStackSlotCount] =
+        { true, false, true, true, true, true };
+    for (intptr_t i = 0; i < kStackSlotCount; ++i) {
+      EXPECT_EQ(expectation2[i], stack_bitmap->Get(i));
     }
     // Add a stack map entry at pc offset 2.
     stackmap_table_builder->AddEntry(2, stack_bitmap);
 
     stack_bitmap = new BitmapBuilder();
     EXPECT(stack_bitmap != NULL);
     stack_bitmap->Set(0, true);
     stack_bitmap->Set(1, false);
     stack_bitmap->Set(2, true);
     stack_bitmap->SetRange(3, 5, true);
     stack_bitmap->SetRange(6, 9, false);
     stack_bitmap->Set(10, true);
-    EXPECT(stack_bitmap->Get(0));
-    EXPECT(!stack_bitmap->Get(1));
-    EXPECT(stack_bitmap->Get(2));
-    for (intptr_t i = 3; i <= 5; i++) {
-      EXPECT(stack_bitmap->Get(i));
+    bool expectation3[kStackSlotCount] =
+        { true, false, true, true, true, true, false, false,
+          false, false, true };
+    for (intptr_t i = 0; i < kStackSlotCount; ++i) {
+      EXPECT_EQ(expectation3[i], stack_bitmap->Get(i));
     }
-    for (intptr_t i = 6; i <= 9; i++) {
-      EXPECT(!stack_bitmap->Get(i));
-    }
-    EXPECT(stack_bitmap->Get(10));
     // Add a stack map entry at pc offset 3.
     stackmap_table_builder->AddEntry(3, stack_bitmap);
 
     const Error& error =
         Error::Handle(Compiler::CompileParsedFunction(parsed_function));
     EXPECT(error.IsNull());
     const Code& code = Code::Handle(function.CurrentCode());
 
     const Array& stack_maps =
         Array::Handle(stackmap_table_builder->FinalizeStackmaps(code));
     code.set_stackmaps(stack_maps);
     const Array& stack_map_list = Array::Handle(code.stackmaps());
     EXPECT(!stack_map_list.IsNull());
     Stackmap& stack_map = Stackmap::Handle();
     EXPECT_EQ(4, stack_map_list.Length());
 
     // Validate the first stack map entry.
     stack_map ^= stack_map_list.At(0);
-    EXPECT(stack_map.IsObject(0));
-    EXPECT_EQ(0, stack_map.MinimumBitIndex());
-    EXPECT_EQ(0, stack_map.MaximumBitIndex());
+    EXPECT_EQ(kStackSlotCount, stack_map.Length());
+    for (intptr_t i = 0; i < kStackSlotCount; ++i) {
+      EXPECT_EQ(expectation0[i], stack_map.IsObject(i));
+    }
 
     // Validate the second stack map entry.
     stack_map ^= stack_map_list.At(1);
-    EXPECT(stack_map.IsObject(0));
-    EXPECT(!stack_map.IsObject(1));
-    EXPECT(stack_map.IsObject(2));
-    EXPECT_EQ(0, stack_map.MinimumBitIndex());
-    EXPECT_EQ(2, stack_map.MaximumBitIndex());
+    EXPECT_EQ(kStackSlotCount, stack_map.Length());
+    for (intptr_t i = 0; i < kStackSlotCount; ++i) {
+      EXPECT_EQ(expectation1[i], stack_map.IsObject(i));
+    }
 
     // Validate the third stack map entry.
     stack_map ^= stack_map_list.At(2);
-    EXPECT(stack_map.IsObject(0));
-    EXPECT(!stack_map.IsObject(1));
-    for (intptr_t i = 2; i <= 5; i++) {
-      EXPECT(stack_map.IsObject(i));
+    EXPECT_EQ(kStackSlotCount, stack_map.Length());
+    for (intptr_t i = 0; i < kStackSlotCount; ++i) {
+      EXPECT_EQ(expectation2[i], stack_map.IsObject(i));
     }
-    EXPECT_EQ(0, stack_map.MinimumBitIndex());
-    EXPECT_EQ(5, stack_map.MaximumBitIndex());
 
     // Validate the fourth stack map entry.
     stack_map ^= stack_map_list.At(3);
-    EXPECT(stack_map.IsObject(0));
-    EXPECT(!stack_map.IsObject(1));
-    for (intptr_t i = 2; i <= 5; i++) {
-      EXPECT(stack_map.IsObject(i));
+    EXPECT_EQ(kStackSlotCount, stack_map.Length());
+    for (intptr_t i = 0; i < kStackSlotCount; ++i) {
+      EXPECT_EQ(expectation3[i], stack_map.IsObject(i));
     }
-    for (intptr_t i = 6; i <= 9; i++) {
-      EXPECT(!stack_map.IsObject(i));
-    }
-    EXPECT(stack_map.IsObject(10));
-    EXPECT_EQ(0, stack_map.MinimumBitIndex());
-    EXPECT_EQ(10, stack_map.MaximumBitIndex());
     retval = true;
   } else {
     retval = false;
   }
   EXPECT(retval);
   isolate->set_long_jump_base(base);
 }
 CODEGEN_TEST_RUN(StackmapCodegen, Smi::New(1))
 
 
@@ skipping 48 matching lines @@
   EXPECT(function_moo.HasCode());
 
   String& function_foo_name = String::Handle(String::New("foo"));
   Function& function_foo =
       Function::Handle(cls.LookupStaticFunction(function_foo_name));
   EXPECT(CompilerTest::TestCompileFunction(function_foo));
   EXPECT(function_foo.HasCode());
 
   // Build and setup a stackmap for the call to 'func' in 'A.foo' in order
   // to test the traversal of stack maps when a GC happens.
-  StackmapTableBuilder* stackmap_table_builder = new StackmapTableBuilder(7);
+  StackmapTableBuilder* stackmap_table_builder = new StackmapTableBuilder(5);
   EXPECT(stackmap_table_builder != NULL);
   BitmapBuilder* stack_bitmap = new BitmapBuilder();
   EXPECT(stack_bitmap != NULL);
   stack_bitmap->Set(0, false);  // var i.
   stack_bitmap->Set(1, true);  // var s1.
   stack_bitmap->Set(2, false);  // var k.
   stack_bitmap->Set(3, true);  // var s2.
   stack_bitmap->Set(4, true);  // var s3.
-  stack_bitmap->Set(5, true);  // First argument to func(i, k).

[Kevin Millikin (Google), 2012/08/17 09:07:43]

This test is really brittle and will soon be replaced by one that uses a real,
not hand-constructed, stackmap.

-  stack_bitmap->Set(6, true);  // Second argument to func(i, k).
   const Code& code = Code::Handle(function_foo.unoptimized_code());
   // Search for the pc of the call to 'func'.
   const PcDescriptors& descriptors =
       PcDescriptors::Handle(code.pc_descriptors());
   int call_count = 0;
   for (int i = 0; i < descriptors.Length(); ++i) {
     if (descriptors.DescriptorKind(i) == PcDescriptors::kFuncCall) {
       stackmap_table_builder->AddEntry(descriptors.PC(i) - code.EntryPoint(),
                                        stack_bitmap);
       ++call_count;
@@ skipping 12 matching lines @@
   GrowableArray<const Object*> arguments;
   const Array& kNoArgumentNames = Array::Handle();
   Object& result = Object::Handle();
   result = DartEntry::InvokeStatic(function_foo, arguments, kNoArgumentNames);
   EXPECT(!result.IsError());
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32 || defined(TARGET_ARCH_X64)