From 17b4d2b14fd26088bca195b5d7c48f26b8b545d8 Mon Sep 17 00:00:00 2001 From: David Srbecky Date: Tue, 2 Mar 2021 18:14:31 +0000 Subject: Add code size to CodeInfo. This is in preparation of removing it from OatQuickMethodHeader. Bug: 123510633 Test: m test-art-host-gtest Test: ./art/test.py -b -r --host Change-Id: I5c5adb4c040e329b81c1393aa1b80ee017729c8a --- compiler/optimizing/stack_map_test.cc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'compiler/optimizing/stack_map_test.cc') diff --git a/compiler/optimizing/stack_map_test.cc b/compiler/optimizing/stack_map_test.cc index 0dd5773cf6..0158ab5b66 100644 --- a/compiler/optimizing/stack_map_test.cc +++ b/compiler/optimizing/stack_map_test.cc @@ -61,7 +61,7 @@ TEST(StackMapTest, Test1) { stream.AddDexRegisterEntry(Kind::kConstant, -2); // Short location. stream.EndStackMapEntry(); - stream.EndMethod(); + stream.EndMethod(64 * kPcAlign); ScopedArenaVector memory = stream.Encode(); CodeInfo code_info(memory.data()); @@ -147,7 +147,7 @@ TEST(StackMapTest, Test2) { stream.AddDexRegisterEntry(Kind::kInFpuRegisterHigh, 1); // Short location. stream.EndStackMapEntry(); - stream.EndMethod(); + stream.EndMethod(256 * kPcAlign); ScopedArenaVector memory = stream.Encode(); CodeInfo code_info(memory.data()); @@ -317,7 +317,7 @@ TEST(StackMapTest, TestDeduplicateInlineInfoDexRegisterMap) { stream.EndInlineInfoEntry(); stream.EndStackMapEntry(); - stream.EndMethod(); + stream.EndMethod(64 * kPcAlign); ScopedArenaVector memory = stream.Encode(); CodeInfo code_info(memory.data()); @@ -372,7 +372,7 @@ TEST(StackMapTest, TestNonLiveDexRegisters) { stream.AddDexRegisterEntry(Kind::kConstant, -2); // Large location. stream.EndStackMapEntry(); - stream.EndMethod(); + stream.EndMethod(64 * kPcAlign); ScopedArenaVector memory = stream.Encode(); CodeInfo code_info(memory.data()); @@ -431,7 +431,7 @@ TEST(StackMapTest, TestShareDexRegisterMap) { stream.AddDexRegisterEntry(Kind::kConstant, -2); // Large location. stream.EndStackMapEntry(); - stream.EndMethod(); + stream.EndMethod(66 * kPcAlign); ScopedArenaVector memory = stream.Encode(); CodeInfo ci(memory.data()); @@ -479,7 +479,7 @@ TEST(StackMapTest, TestNoDexRegisterMap) { stream.AddDexRegisterEntry(Kind::kNone, 0); stream.EndStackMapEntry(); - stream.EndMethod(); + stream.EndMethod(68 * kPcAlign); ScopedArenaVector memory = stream.Encode(); CodeInfo code_info(memory.data()); @@ -578,7 +578,7 @@ TEST(StackMapTest, InlineTest) { stream.EndStackMapEntry(); - stream.EndMethod(); + stream.EndMethod(78 * kPcAlign); ScopedArenaVector memory = stream.Encode(); CodeInfo ci(memory.data()); @@ -714,7 +714,7 @@ TEST(StackMapTest, TestDeduplicateStackMask) { stream.BeginStackMapEntry(0, 8 * kPcAlign, 0x3, &sp_mask); stream.EndStackMapEntry(); - stream.EndMethod(); + stream.EndMethod(8 * kPcAlign); ScopedArenaVector memory = stream.Encode(); CodeInfo code_info(memory.data()); @@ -738,7 +738,7 @@ TEST(StackMapTest, TestDedupeBitTables) { stream.AddDexRegisterEntry(Kind::kConstant, -2); stream.EndStackMapEntry(); - stream.EndMethod(); + stream.EndMethod(64 * kPcAlign); ScopedArenaVector memory = stream.Encode(); std::vector out; -- cgit v1.2.3-59-g8ed1b