diff options
| author | 2016-01-20 03:56:12 +0000 | |
|---|---|---|
| committer | 2016-01-20 04:02:21 +0000 | |
| commit | 47c83eac0644a4b6092d956dd3a6824bccb7263a (patch) | |
| tree | a7a5d0ff7d7f0e6e462240d24f209c045cdfcb76 /compiler/profile_assistant.cc | |
| parent | 4ca3850acc5e7d24cc623b796fd5d83c7e9aea1a (diff) | |
Make sure that OfflineCompilationInfo is set to nullptr when needed.
Local variables weren't initialized when in tests and the early
return in ProcessProfiles didn't make sure that the output
parameter is set to nullptr.
Bug: 26080105
Change-Id: Id88a6abb515c3ab9a6ebac56bc9dac7920c3d58f
Diffstat (limited to 'compiler/profile_assistant.cc')
| -rw-r--r-- | compiler/profile_assistant.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/compiler/profile_assistant.cc b/compiler/profile_assistant.cc index 0871722440..85335efcc4 100644 --- a/compiler/profile_assistant.cc +++ b/compiler/profile_assistant.cc @@ -31,6 +31,7 @@ bool ProfileAssistant::ProcessProfilesInternal( DCHECK(!profile_files.empty()); DCHECK(!reference_profile_files.empty() || (profile_files.size() == reference_profile_files.size())); + std::vector<ProfileCompilationInfo> new_info(profile_files.size()); bool should_compile = false; // Read the main profile files. @@ -44,7 +45,6 @@ bool ProfileAssistant::ProcessProfilesInternal( } if (!should_compile) { - *profile_compilation_info = nullptr; return true; } @@ -124,6 +124,8 @@ bool ProfileAssistant::ProcessProfiles( const std::vector<uint32_t>& profile_files_fd, const std::vector<uint32_t>& reference_profile_files_fd, /*out*/ ProfileCompilationInfo** profile_compilation_info) { + *profile_compilation_info = nullptr; + std::string error; ScopedCollectionFlock profile_files_flocks(profile_files_fd.size()); if (!profile_files_flocks.Init(profile_files_fd, &error)) { @@ -145,6 +147,8 @@ bool ProfileAssistant::ProcessProfiles( const std::vector<std::string>& profile_files, const std::vector<std::string>& reference_profile_files, /*out*/ ProfileCompilationInfo** profile_compilation_info) { + *profile_compilation_info = nullptr; + std::string error; ScopedCollectionFlock profile_files_flocks(profile_files.size()); if (!profile_files_flocks.Init(profile_files, &error)) { |