From bf5f0f3f1eea2e712e7269ff1e1f9b1bcc4cbaee Mon Sep 17 00:00:00 2001
From: Nicolas Geoffray <ngeoffray@google.com>
Date: Tue, 5 Mar 2019 15:41:50 +0000
Subject: Revert "Revert^2 "Add code size to CodeInfo""

This reverts commit e1412dacbf1d2a809bd1fca658cc8cb8f61f8ee6.

Bug: 123510633
Bug: 127305289

Reason for revert: b/127305289

Change-Id: I54557b05a44777f1fa2c15bde4fa648980f42eed
---
 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 cbd844f2cf..d28f09fbba 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(64 * kPcAlign);
+  stream.EndMethod();
   ScopedArenaVector<uint8_t> 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(256 * kPcAlign);
+  stream.EndMethod();
   ScopedArenaVector<uint8_t> memory = stream.Encode();
 
   CodeInfo code_info(memory.data());
@@ -317,7 +317,7 @@ TEST(StackMapTest, TestDeduplicateInlineInfoDexRegisterMap) {
   stream.EndInlineInfoEntry();
   stream.EndStackMapEntry();
 
-  stream.EndMethod(64 * kPcAlign);
+  stream.EndMethod();
   ScopedArenaVector<uint8_t> 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(64 * kPcAlign);
+  stream.EndMethod();
   ScopedArenaVector<uint8_t> 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(66 * kPcAlign);
+  stream.EndMethod();
   ScopedArenaVector<uint8_t> memory = stream.Encode();
 
   CodeInfo ci(memory.data());
@@ -479,7 +479,7 @@ TEST(StackMapTest, TestNoDexRegisterMap) {
   stream.AddDexRegisterEntry(Kind::kNone, 0);
   stream.EndStackMapEntry();
 
-  stream.EndMethod(68 * kPcAlign);
+  stream.EndMethod();
   ScopedArenaVector<uint8_t> memory = stream.Encode();
 
   CodeInfo code_info(memory.data());
@@ -578,7 +578,7 @@ TEST(StackMapTest, InlineTest) {
 
   stream.EndStackMapEntry();
 
-  stream.EndMethod(78 * kPcAlign);
+  stream.EndMethod();
   ScopedArenaVector<uint8_t> memory = stream.Encode();
 
   CodeInfo ci(memory.data());
@@ -722,7 +722,7 @@ TEST(StackMapTest, TestDeduplicateStackMask) {
   stream.BeginStackMapEntry(0, 8 * kPcAlign, 0x3, &sp_mask);
   stream.EndStackMapEntry();
 
-  stream.EndMethod(8 * kPcAlign);
+  stream.EndMethod();
   ScopedArenaVector<uint8_t> memory = stream.Encode();
 
   CodeInfo code_info(memory.data());
@@ -746,7 +746,7 @@ TEST(StackMapTest, TestDedupeBitTables) {
   stream.AddDexRegisterEntry(Kind::kConstant, -2);
   stream.EndStackMapEntry();
 
-  stream.EndMethod(64 * kPcAlign);
+  stream.EndMethod();
   ScopedArenaVector<uint8_t> memory = stream.Encode();
 
   std::vector<uint8_t> out;
-- 
cgit v1.2.3-59-g8ed1b