Put live register bits in stackmaps.

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 54 matching lines @@
     stack_bitmap->Set(0, true);
     EXPECT_EQ(1, stack_bitmap->Length());
     stack_bitmap->SetLength(kStackSlotCount);
     EXPECT_EQ(kStackSlotCount, stack_bitmap->Length());
 
     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);
+    stackmap_table_builder->AddEntry(0, stack_bitmap, 0);
 
     stack_bitmap = new BitmapBuilder();
     EXPECT(stack_bitmap != NULL);
     EXPECT_EQ(0, stack_bitmap->Length());
     stack_bitmap->Set(0, true);
     stack_bitmap->Set(1, false);
     stack_bitmap->Set(2, true);
     EXPECT_EQ(3, stack_bitmap->Length());
     stack_bitmap->SetLength(kStackSlotCount);
     EXPECT_EQ(kStackSlotCount, stack_bitmap->Length());
 
     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);
+    stackmap_table_builder->AddEntry(1, stack_bitmap, 0);
 
     stack_bitmap = new BitmapBuilder();
     EXPECT(stack_bitmap != NULL);
     EXPECT_EQ(0, stack_bitmap->Length());
     stack_bitmap->Set(0, true);
     stack_bitmap->Set(1, false);
     stack_bitmap->Set(2, true);
     stack_bitmap->SetRange(3, 5, true);
     EXPECT_EQ(6, stack_bitmap->Length());
     stack_bitmap->SetLength(kStackSlotCount);
     EXPECT_EQ(kStackSlotCount, stack_bitmap->Length());
 
     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);
+    stackmap_table_builder->AddEntry(2, stack_bitmap, 0);
 
     stack_bitmap = new BitmapBuilder();
     EXPECT(stack_bitmap != NULL);
     EXPECT_EQ(0, stack_bitmap->Length());
     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_EQ(11, stack_bitmap->Length());
     stack_bitmap->SetLength(kStackSlotCount);
     EXPECT_EQ(kStackSlotCount, stack_bitmap->Length());
 
     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));
     }
     // Add a stack map entry at pc offset 3.
-    stackmap_table_builder->AddEntry(3, stack_bitmap);
+    stackmap_table_builder->AddEntry(3, stack_bitmap, 0);
 
     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());
@@ skipping 106 matching lines @@
   stack_bitmap->Set(3, true);  // var s2.
   stack_bitmap->Set(4, true);  // var s3.
   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);
+                                       stack_bitmap,
+                                       0);
       ++call_count;
     }
   }
   // We can't easily check that we put the stackmap at the correct pc, but
   // we did if there was exactly one call seen.
   EXPECT(call_count == 1);
   const Array& stack_maps =
       Array::Handle(stackmap_table_builder->FinalizeStackmaps(code));
   code.set_stackmaps(stack_maps);
 
   // Now invoke 'A.moo' and it will trigger a GC when the native function
   // is called, this should then cause the stack map of function 'A.foo'
   // to be traversed and the appropriate objects visited.
   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)