diff options
| author | 2014-04-10 21:20:57 +0000 | |
|---|---|---|
| committer | 2014-04-10 21:20:57 +0000 | |
| commit | a5cb220ed5d92a2022efa5e6c643d1a12f77c77c (patch) | |
| tree | 68f41d07551c56ac51c189f26f9fc863c656da83 | |
| parent | e81a7c314afc8f92afcdbc3cbc2331afca7dcb3d (diff) | |
| parent | 644789fa0e807a9aa6d6e32d36ce039ec7318a7f (diff) | |
Merge "Fix problem with empty profiles."
| -rw-r--r-- | compiler/driver/compiler_driver.cc | 2 | ||||
| -rw-r--r-- | runtime/profiler.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index b66082dedd..2b20c6fc75 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -2036,7 +2036,7 @@ void CompilerDriver::InstructionSetToLLVMTarget(InstructionSet instruction_set, bool CompilerDriver::SkipCompilation(const std::string& method_name) { if (!profile_ok_) { - return true; + return false; } // Methods that comprise topKPercentThreshold % of the total samples will be compiled. double topKPercentThreshold = 90.0; diff --git a/runtime/profiler.cc b/runtime/profiler.cc index 77e7316fb2..7b117f4656 100644 --- a/runtime/profiler.cc +++ b/runtime/profiler.cc @@ -588,7 +588,7 @@ bool ProfileHelper::LoadProfileMap(ProfileMap& profileMap, const std::string& fi return false; } if (st.st_size == 0) { - return true; // empty profiles are ok. + return false; // Empty profiles are invalid. } std::ifstream in(fileName.c_str()); if (!in) { |