From 8cd54547cec8a4537db5682c2da8be22843b1310 Mon Sep 17 00:00:00 2001
From: David Srbecky <dsrbecky@google.com>
Date: Sun, 15 Jul 2018 23:58:44 +0100
Subject: Move MethodInfo to CodeInfo.

There is no need to treat it specially any more,
because of the de-duplication at BitTable level.

This saves 0.6% of oat file size.

Test: test-art-host-gtest
Change-Id: Ife7927d736243879a41d6f325d49ebf6930a63f6
---
 compiler/compiled_method.cc | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'compiler/compiled_method.cc')

diff --git a/compiler/compiled_method.cc b/compiler/compiled_method.cc
index 5b93316b87..29f004cf87 100644
--- a/compiler/compiled_method.cc
+++ b/compiler/compiled_method.cc
@@ -102,12 +102,10 @@ const void* CompiledCode::CodePointer(const void* code_pointer, InstructionSet i
 CompiledMethod::CompiledMethod(CompilerDriver* driver,
                                InstructionSet instruction_set,
                                const ArrayRef<const uint8_t>& quick_code,
-                               const ArrayRef<const uint8_t>& method_info,
                                const ArrayRef<const uint8_t>& vmap_table,
                                const ArrayRef<const uint8_t>& cfi_info,
                                const ArrayRef<const linker::LinkerPatch>& patches)
     : CompiledCode(driver, instruction_set, quick_code),
-      method_info_(driver->GetCompiledMethodStorage()->DeduplicateMethodInfo(method_info)),
       vmap_table_(driver->GetCompiledMethodStorage()->DeduplicateVMapTable(vmap_table)),
       cfi_info_(driver->GetCompiledMethodStorage()->DeduplicateCFIInfo(cfi_info)),
       patches_(driver->GetCompiledMethodStorage()->DeduplicateLinkerPatches(patches)) {
@@ -117,7 +115,6 @@ CompiledMethod* CompiledMethod::SwapAllocCompiledMethod(
     CompilerDriver* driver,
     InstructionSet instruction_set,
     const ArrayRef<const uint8_t>& quick_code,
-    const ArrayRef<const uint8_t>& method_info,
     const ArrayRef<const uint8_t>& vmap_table,
     const ArrayRef<const uint8_t>& cfi_info,
     const ArrayRef<const linker::LinkerPatch>& patches) {
@@ -127,7 +124,6 @@ CompiledMethod* CompiledMethod::SwapAllocCompiledMethod(
                   driver,
                   instruction_set,
                   quick_code,
-                  method_info,
                   vmap_table,
                   cfi_info, patches);
   return ret;
@@ -144,7 +140,6 @@ CompiledMethod::~CompiledMethod() {
   storage->ReleaseLinkerPatches(patches_);
   storage->ReleaseCFIInfo(cfi_info_);
   storage->ReleaseVMapTable(vmap_table_);
-  storage->ReleaseMethodInfo(method_info_);
 }
 
 }  // namespace art
-- 
cgit v1.2.3-59-g8ed1b