Reduce space used for stackmaps.

runtime/vm/bitmap_test.cc

Index: runtime/vm/bitmap_test.cc
diff --git a/runtime/vm/bitmap_test.cc b/runtime/vm/bitmap_test.cc
index 8078923984d21374d56dd5d4cadd2325f67432d0..8681ab30be18999ca2a7486b3210589a1daaf866 100644
--- a/runtime/vm/bitmap_test.cc
+++ b/runtime/vm/bitmap_test.cc
@@ -11,92 +11,94 @@ namespace dart {
 
 TEST_CASE(BitmapBuilder) {
   // Test basic bit map builder operations.
-  BitmapBuilder* bmap1_builder = new BitmapBuilder();
+  BitmapBuilder* builder1 = new BitmapBuilder();
 
-  EXPECT_EQ(-1, bmap1_builder->Maximum());
-  EXPECT_EQ(-1, bmap1_builder->Minimum());
+  EXPECT_EQ(-1, builder1->Maximum());
+  EXPECT_EQ(-1, builder1->Minimum());
 
   bool value = true;
   for (int32_t i = 0; i < 128; i++) {
-    bmap1_builder->Set(i, value);
+    builder1->Set(i, value);
     value = !value;
   }
   value = true;
   for (int32_t i = 0; i < 128; i++) {
-    EXPECT_EQ(value, bmap1_builder->Get(i));
+    EXPECT_EQ(value, builder1->Get(i));
     value = !value;
   }
   value = true;
   for (int32_t i = 0; i < 1024; i++) {
-    bmap1_builder->Set(i, value);
+    builder1->Set(i, value);
     value = !value;
   }
   value = true;
   for (int32_t i = 0; i < 1024; i++) {
-    EXPECT_EQ(value, bmap1_builder->Get(i));
+    EXPECT_EQ(value, builder1->Get(i));
     value = !value;
   }
-  // Create a Bitmap object from the builder and verify it's contents.
-  const Stackmap& bmap1 = Stackmap::Handle(Stackmap::New(0, bmap1_builder));
-  EXPECT_EQ(1022, bmap1_builder->Maximum());
-  EXPECT_EQ(0, bmap1_builder->Minimum());
-  OS::Print("%s\n", bmap1.ToCString());
+  // Create a Stackmap object from the builder and verify its contents.
+  const Stackmap& stackmap1 =
+      Stackmap::Handle(Stackmap::New(0, 1024, builder1));
+  EXPECT_EQ(1022, builder1->Maximum());
+  EXPECT_EQ(0, builder1->Minimum());
+  OS::Print("%s\n", stackmap1.ToCString());
   value = true;
   for (int32_t i = 0; i < 1024; i++) {
-    EXPECT_EQ(value, bmap1.IsObject(i));
+    EXPECT_EQ(value, stackmap1.IsObject(i));
     value = !value;
   }
-  EXPECT(!bmap1.IsObject(2056));  // Out of range so returns false.
+  EXPECT(!stackmap1.IsObject(2056));  // Out of range so returns false.
 
   // Test the SetRange function in the builder.
-  bmap1_builder->SetRange(0, 256, false);
-  bmap1_builder->SetRange(257, 1024, true);
-  bmap1_builder->SetRange(1025, 2048, false);
+  builder1->SetRange(0, 256, false);
+  builder1->SetRange(257, 1024, true);
+  builder1->SetRange(1025, 2048, false);
   for (int32_t i = 0; i <= 256; i++) {
-    EXPECT(!bmap1_builder->Get(i));
+    EXPECT(!builder1->Get(i));
   }
   for (int32_t i = 257; i <= 1024; i++) {
-    EXPECT(bmap1_builder->Get(i));
+    EXPECT(builder1->Get(i));
   }
   for (int32_t i = 1025; i <= 2048; i++) {
-    EXPECT(!bmap1_builder->Get(i));
+    EXPECT(!builder1->Get(i));
   }
-  const Stackmap& bmap2 = Stackmap::Handle(Stackmap::New(0, bmap1_builder));
-  EXPECT_EQ(1024, bmap1_builder->Maximum());
-  EXPECT_EQ(257, bmap1_builder->Minimum());
+  const Stackmap& stackmap2 =
+      Stackmap::Handle(Stackmap::New(0, 2049, builder1));
+  EXPECT_EQ(1024, builder1->Maximum());
+  EXPECT_EQ(257, builder1->Minimum());
   for (int32_t i = 0; i <= 256; i++) {
-    EXPECT(!bmap2.IsObject(i));
+    EXPECT(!stackmap2.IsObject(i));
   }
   for (int32_t i = 257; i <= 1024; i++) {
-    EXPECT(bmap2.IsObject(i));
+    EXPECT(stackmap2.IsObject(i));
   }
   for (int32_t i = 1025; i <= 2048; i++) {
-    EXPECT(!bmap2.IsObject(i));
+    EXPECT(!stackmap2.IsObject(i));
   }
 
   // Test the functionality to copy a Stackmap object into a builder.
-  BitmapBuilder* bmap2_builder = new BitmapBuilder();
-  bmap2_builder->SetBits(bmap1);
-  EXPECT_EQ(1022, bmap2_builder->Maximum());
-  EXPECT_EQ(0, bmap2_builder->Minimum());
+  BitmapBuilder* builder2 = new BitmapBuilder();
+  builder2->SetBits(stackmap1);
+  EXPECT_EQ(1022, builder2->Maximum());
+  EXPECT_EQ(0, builder2->Minimum());
   value = true;
   for (int32_t i = 0; i < 1024; i++) {
-    EXPECT_EQ(value, bmap2_builder->Get(i));
+    EXPECT_EQ(value, builder2->Get(i));
     value = !value;
   }
 
-  BitmapBuilder* bmap3_builder = new BitmapBuilder();
-  bmap3_builder->SetBits(bmap2);
-  EXPECT_EQ(1024, bmap3_builder->Maximum());
-  EXPECT_EQ(257, bmap3_builder->Minimum());
+  BitmapBuilder* builder3 = new BitmapBuilder();
+  builder3->SetBits(stackmap2);
+  EXPECT_EQ(1024, builder3->Maximum());
+  EXPECT_EQ(257, builder3->Minimum());
   for (int32_t i = 0; i <= 256; i++) {
-    EXPECT(!bmap3_builder->Get(i));
+    EXPECT(!builder3->Get(i));
   }
   for (int32_t i = 257; i <= 1024; i++) {
-    EXPECT(bmap3_builder->Get(i));
+    EXPECT(builder3->Get(i));
   }
   for (int32_t i = 1025; i <= 2048; i++) {
-    EXPECT(!bmap3_builder->Get(i));
+    EXPECT(!builder3->Get(i));
   }
 }