commit bbe3a5efcdfb2fb15a4e5f724cc323ae0ada5111
author Mathieu Chartier <mathieuc@google.com> Tue Jun 13 16:36:17 2017 -0700
committer Mathieu Chartier <mathieuc@google.com> Thu Jun 15 11:45:06 2017 -0700
tree 65fd149e1159674681d866e47e485d85b8464334
parent d58932f98a673c9d687863a7efafb2da168063a2

Refactor some profiling info functions

Deleted profile_compilation_info-inl.h

Added a new helper class MethodHotness to reduce the number of
required getters for reading method hotness, startup, and post
startup booleans.

Test: test-art-host
Bug: 62040831

Change-Id: I799a38e2bea6177ba5816c54524f4ccacedba772

compiler/driver/compiler_driver.cc

diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc
index 91b58e1..51446d4 100644
--- a/compiler/driver/compiler_driver.cc
+++ b/compiler/driver/compiler_driver.cc
@@ -1002,7 +1002,7 @@
   }
   // Compile only hot methods, it is the profile saver's job to decide what startup methods to mark
   // as hot.
-  bool result = profile_compilation_info_->ContainsHotMethod(method_ref);
+  bool result = profile_compilation_info_->GetMethodHotness(method_ref).IsHot();
 
   if (kDebugProfileGuidedCompilation) {
     LOG(INFO) << "[ProfileGuidedCompilation] "

compiler/driver/compiler_driver_test.cc

diff --git a/compiler/driver/compiler_driver_test.cc b/compiler/driver/compiler_driver_test.cc
index 4b979d8..85d8b12 100644
--- a/compiler/driver/compiler_driver_test.cc
+++ b/compiler/driver/compiler_driver_test.cc
@@ -239,14 +239,10 @@
 
     ProfileCompilationInfo info;
     for (const std::unique_ptr<const DexFile>& dex_file : dex_files) {
-      profile_info_.AddMethodIndex(dex_file->GetLocation(),
-                                   dex_file->GetLocationChecksum(),
-                                   1,
-                                   dex_file->NumMethodIds());
-      profile_info_.AddMethodIndex(dex_file->GetLocation(),
-                                   dex_file->GetLocationChecksum(),
-                                   2,
-                                   dex_file->NumMethodIds());
+      profile_info_.AddMethodIndex(ProfileCompilationInfo::MethodHotness::kFlagHot,
+                                   MethodReference(dex_file.get(), 1));
+      profile_info_.AddMethodIndex(ProfileCompilationInfo::MethodHotness::kFlagHot,
+                                   MethodReference(dex_file.get(), 2));
     }
     return &profile_info_;
   }