Remove unused GetDexRegisterMap arguments.

They are no longer needed in the new encoding.

I reuse the local variables in most places to DCHECK the size
of the decoded register map.  This has one catch though:
We sometimes omit all dex registers, so the DCHECK should be
done only after checking if the map is empty (if applicable).

Test: test-art-host-gtest-stack_map_test
Change-Id: I94b67029842374bc8eb7c9e5eac76fc93a651f24

1 files changed, 40 insertions, 26 deletions

diff --git a/compiler/optimizing/stack_map_test.cc b/compiler/optimizing/stack_map_test.cc
index 0be276cfd6..9adc4c5ba6 100644
--- a/compiler/optimizing/stack_map_test.cc
+++ b/compiler/optimizing/stack_map_test.cc
@@ -81,8 +81,8 @@ TEST(StackMapTest, Test1) {
   ASSERT_TRUE(CheckStackMask(code_info, stack_map, sp_mask));
 
   ASSERT_TRUE(stack_map.HasDexRegisterMap());
-  DexRegisterMap dex_register_map =
-      code_info.GetDexRegisterMapOf(stack_map, number_of_dex_registers);
+  DexRegisterMap dex_register_map = code_info.GetDexRegisterMapOf(stack_map);
+  ASSERT_EQ(number_of_dex_registers, dex_register_map.size());
   ASSERT_TRUE(dex_register_map.IsDexRegisterLive(0));
   ASSERT_TRUE(dex_register_map.IsDexRegisterLive(1));
   ASSERT_EQ(2u, dex_register_map.GetNumberOfLiveDexRegisters());
@@ -170,8 +170,8 @@ TEST(StackMapTest, Test2) {
     ASSERT_TRUE(CheckStackMask(code_info, stack_map, sp_mask1));
 
     ASSERT_TRUE(stack_map.HasDexRegisterMap());
-    DexRegisterMap dex_register_map =
-        code_info.GetDexRegisterMapOf(stack_map, number_of_dex_registers);
+    DexRegisterMap dex_register_map = code_info.GetDexRegisterMapOf(stack_map);
+    ASSERT_EQ(number_of_dex_registers, dex_register_map.size());
     ASSERT_TRUE(dex_register_map.IsDexRegisterLive(0));
     ASSERT_TRUE(dex_register_map.IsDexRegisterLive(1));
     ASSERT_EQ(2u, dex_register_map.GetNumberOfLiveDexRegisters());
@@ -210,8 +210,8 @@ TEST(StackMapTest, Test2) {
     ASSERT_TRUE(CheckStackMask(code_info, stack_map, sp_mask2));
 
     ASSERT_TRUE(stack_map.HasDexRegisterMap());
-    DexRegisterMap dex_register_map =
-        code_info.GetDexRegisterMapOf(stack_map, number_of_dex_registers);
+    DexRegisterMap dex_register_map = code_info.GetDexRegisterMapOf(stack_map);
+    ASSERT_EQ(number_of_dex_registers, dex_register_map.size());
     ASSERT_TRUE(dex_register_map.IsDexRegisterLive(0));
     ASSERT_TRUE(dex_register_map.IsDexRegisterLive(1));
     ASSERT_EQ(2u, dex_register_map.GetNumberOfLiveDexRegisters());
@@ -243,8 +243,8 @@ TEST(StackMapTest, Test2) {
     ASSERT_TRUE(CheckStackMask(code_info, stack_map, sp_mask3));
 
     ASSERT_TRUE(stack_map.HasDexRegisterMap());
-    DexRegisterMap dex_register_map =
-        code_info.GetDexRegisterMapOf(stack_map, number_of_dex_registers);
+    DexRegisterMap dex_register_map = code_info.GetDexRegisterMapOf(stack_map);
+    ASSERT_EQ(number_of_dex_registers, dex_register_map.size());
     ASSERT_TRUE(dex_register_map.IsDexRegisterLive(0));
     ASSERT_TRUE(dex_register_map.IsDexRegisterLive(1));
     ASSERT_EQ(2u, dex_register_map.GetNumberOfLiveDexRegisters());
@@ -276,8 +276,8 @@ TEST(StackMapTest, Test2) {
     ASSERT_TRUE(CheckStackMask(code_info, stack_map, sp_mask4));
 
     ASSERT_TRUE(stack_map.HasDexRegisterMap());
-    DexRegisterMap dex_register_map =
-        code_info.GetDexRegisterMapOf(stack_map, number_of_dex_registers);
+    DexRegisterMap dex_register_map = code_info.GetDexRegisterMapOf(stack_map);
+    ASSERT_EQ(number_of_dex_registers, dex_register_map.size());
     ASSERT_TRUE(dex_register_map.IsDexRegisterLive(0));
     ASSERT_TRUE(dex_register_map.IsDexRegisterLive(1));
     ASSERT_EQ(2u, dex_register_map.GetNumberOfLiveDexRegisters());
@@ -342,7 +342,8 @@ TEST(StackMapTest, TestDeduplicateInlineInfoDexRegisterMap) {
     ASSERT_TRUE(CheckStackMask(code_info, stack_map, sp_mask1));
 
     ASSERT_TRUE(stack_map.HasDexRegisterMap());
-    DexRegisterMap map(code_info.GetDexRegisterMapOf(stack_map, number_of_dex_registers));
+    DexRegisterMap map(code_info.GetDexRegisterMapOf(stack_map));
+    ASSERT_EQ(number_of_dex_registers, map.size());
     ASSERT_TRUE(map.IsDexRegisterLive(0));
     ASSERT_TRUE(map.IsDexRegisterLive(1));
     ASSERT_EQ(2u, map.GetNumberOfLiveDexRegisters());
@@ -393,8 +394,8 @@ TEST(StackMapTest, TestNonLiveDexRegisters) {
   ASSERT_EQ(0x3u, code_info.GetRegisterMaskOf(stack_map));
 
   ASSERT_TRUE(stack_map.HasDexRegisterMap());
-  DexRegisterMap dex_register_map =
-      code_info.GetDexRegisterMapOf(stack_map, number_of_dex_registers);
+  DexRegisterMap dex_register_map = code_info.GetDexRegisterMapOf(stack_map);
+  ASSERT_EQ(number_of_dex_registers, dex_register_map.size());
   ASSERT_FALSE(dex_register_map.IsDexRegisterLive(0));
   ASSERT_TRUE(dex_register_map.IsDexRegisterLive(1));
   ASSERT_EQ(1u, dex_register_map.GetNumberOfLiveDexRegisters());
@@ -443,19 +444,22 @@ TEST(StackMapTest, TestShareDexRegisterMap) {
 
   // Verify first stack map.
   StackMap sm0 = ci.GetStackMapAt(0);
-  DexRegisterMap dex_registers0 = ci.GetDexRegisterMapOf(sm0, number_of_dex_registers);
+  DexRegisterMap dex_registers0 = ci.GetDexRegisterMapOf(sm0);
+  ASSERT_EQ(number_of_dex_registers, dex_registers0.size());
   ASSERT_EQ(0, dex_registers0.GetMachineRegister(0));
   ASSERT_EQ(-2, dex_registers0.GetConstant(1));
 
   // Verify second stack map.
   StackMap sm1 = ci.GetStackMapAt(1);
-  DexRegisterMap dex_registers1 = ci.GetDexRegisterMapOf(sm1, number_of_dex_registers);
+  DexRegisterMap dex_registers1 = ci.GetDexRegisterMapOf(sm1);
+  ASSERT_EQ(number_of_dex_registers, dex_registers1.size());
   ASSERT_EQ(0, dex_registers1.GetMachineRegister(0));
   ASSERT_EQ(-2, dex_registers1.GetConstant(1));
 
   // Verify third stack map.
   StackMap sm2 = ci.GetStackMapAt(2);
-  DexRegisterMap dex_registers2 = ci.GetDexRegisterMapOf(sm2, number_of_dex_registers);
+  DexRegisterMap dex_registers2 = ci.GetDexRegisterMapOf(sm2);
+  ASSERT_EQ(number_of_dex_registers, dex_registers2.size());
   ASSERT_EQ(2, dex_registers2.GetMachineRegister(0));
   ASSERT_EQ(-2, dex_registers2.GetConstant(1));
 
@@ -591,7 +595,8 @@ TEST(StackMapTest, InlineTest) {
     // Verify first stack map.
     StackMap sm0 = ci.GetStackMapAt(0);
 
-    DexRegisterMap dex_registers0 = ci.GetDexRegisterMapOf(sm0, 2);
+    DexRegisterMap dex_registers0 = ci.GetDexRegisterMapOf(sm0);
+    ASSERT_EQ(2u, dex_registers0.size());
     ASSERT_EQ(0, dex_registers0.GetStackOffsetInBytes(0));
     ASSERT_EQ(4, dex_registers0.GetConstant(1));
 
@@ -603,10 +608,12 @@ TEST(StackMapTest, InlineTest) {
     ASSERT_EQ(3u, if0_1.GetDexPc());
     ASSERT_TRUE(if0_1.EncodesArtMethod());
 
-    DexRegisterMap dex_registers1 = ci.GetDexRegisterMapAtDepth(0, sm0, 1);
+    DexRegisterMap dex_registers1 = ci.GetDexRegisterMapAtDepth(0, sm0);
+    ASSERT_EQ(1u, dex_registers1.size());
     ASSERT_EQ(8, dex_registers1.GetStackOffsetInBytes(0));
 
-    DexRegisterMap dex_registers2 = ci.GetDexRegisterMapAtDepth(1, sm0, 3);
+    DexRegisterMap dex_registers2 = ci.GetDexRegisterMapAtDepth(1, sm0);
+    ASSERT_EQ(3u, dex_registers2.size());
     ASSERT_EQ(16, dex_registers2.GetStackOffsetInBytes(0));
     ASSERT_EQ(20, dex_registers2.GetConstant(1));
     ASSERT_EQ(15, dex_registers2.GetMachineRegister(2));
@@ -616,7 +623,8 @@ TEST(StackMapTest, InlineTest) {
     // Verify second stack map.
     StackMap sm1 = ci.GetStackMapAt(1);
 
-    DexRegisterMap dex_registers0 = ci.GetDexRegisterMapOf(sm1, 2);
+    DexRegisterMap dex_registers0 = ci.GetDexRegisterMapOf(sm1);
+    ASSERT_EQ(2u, dex_registers0.size());
     ASSERT_EQ(56, dex_registers0.GetStackOffsetInBytes(0));
     ASSERT_EQ(0, dex_registers0.GetConstant(1));
 
@@ -631,10 +639,12 @@ TEST(StackMapTest, InlineTest) {
     ASSERT_EQ(5u, if1_2.GetDexPc());
     ASSERT_TRUE(if1_2.EncodesArtMethod());
 
-    DexRegisterMap dex_registers1 = ci.GetDexRegisterMapAtDepth(0, sm1, 1);
+    DexRegisterMap dex_registers1 = ci.GetDexRegisterMapAtDepth(0, sm1);
+    ASSERT_EQ(1u, dex_registers1.size());
     ASSERT_EQ(12, dex_registers1.GetStackOffsetInBytes(0));
 
-    DexRegisterMap dex_registers2 = ci.GetDexRegisterMapAtDepth(1, sm1, 3);
+    DexRegisterMap dex_registers2 = ci.GetDexRegisterMapAtDepth(1, sm1);
+    ASSERT_EQ(3u, dex_registers2.size());
     ASSERT_EQ(80, dex_registers2.GetStackOffsetInBytes(0));
     ASSERT_EQ(10, dex_registers2.GetConstant(1));
     ASSERT_EQ(5, dex_registers2.GetMachineRegister(2));
@@ -644,7 +654,8 @@ TEST(StackMapTest, InlineTest) {
     // Verify third stack map.
     StackMap sm2 = ci.GetStackMapAt(2);
 
-    DexRegisterMap dex_registers0 = ci.GetDexRegisterMapOf(sm2, 2);
+    DexRegisterMap dex_registers0 = ci.GetDexRegisterMapOf(sm2);
+    ASSERT_EQ(2u, dex_registers0.size());
     ASSERT_FALSE(dex_registers0.IsDexRegisterLive(0));
     ASSERT_EQ(4, dex_registers0.GetConstant(1));
     ASSERT_FALSE(sm2.HasInlineInfo());
@@ -654,7 +665,8 @@ TEST(StackMapTest, InlineTest) {
     // Verify fourth stack map.
     StackMap sm3 = ci.GetStackMapAt(3);
 
-    DexRegisterMap dex_registers0 = ci.GetDexRegisterMapOf(sm3, 2);
+    DexRegisterMap dex_registers0 = ci.GetDexRegisterMapOf(sm3);
+    ASSERT_EQ(2u, dex_registers0.size());
     ASSERT_EQ(56, dex_registers0.GetStackOffsetInBytes(0));
     ASSERT_EQ(0, dex_registers0.GetConstant(1));
 
@@ -669,10 +681,12 @@ TEST(StackMapTest, InlineTest) {
     ASSERT_EQ(10u, if2_2.GetDexPc());
     ASSERT_TRUE(if2_2.EncodesArtMethod());
 
-    DexRegisterMap dex_registers1 = ci.GetDexRegisterMapAtDepth(1, sm3, 1);
+    DexRegisterMap dex_registers1 = ci.GetDexRegisterMapAtDepth(1, sm3);
+    ASSERT_EQ(1u, dex_registers1.size());
     ASSERT_EQ(2, dex_registers1.GetMachineRegister(0));
 
-    DexRegisterMap dex_registers2 = ci.GetDexRegisterMapAtDepth(2, sm3, 2);
+    DexRegisterMap dex_registers2 = ci.GetDexRegisterMapAtDepth(2, sm3);
+    ASSERT_EQ(2u, dex_registers2.size());
     ASSERT_FALSE(dex_registers2.IsDexRegisterLive(0));
     ASSERT_EQ(3, dex_registers2.GetMachineRegister(1));
   }