3party/crashpad
0
0
Fork 0
mirror of https://github.com/chromium/crashpad.git synced 2025-03-09 14:06:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

linux: ProcessReader can own ProcessMemoryLinux without unique_ptr

Browse Source 
There’s no reason for ProcessReader to own its ProcessMemoryLinux via
std::unique_ptr<>.

This was discovered in a trunk Clang build, during which a
-Wdelete-non-virtual-dtor warning was produced (since Clang r312167).
The warning is not produced by earlier Clang versions or by GCC because
the “delete” happens in a system header, <memory>, when performed by
std::unique_ptr<>. Although ownership via std::unique_ptr<> is no longer
used, ProcessMemoryLinux is marked “final” because it ought to be.

In file included from ../../snapshot/linux/process_reader.cc:15:
In file included from ../../snapshot/linux/process_reader.h:21:
In file included from /usr/bin/../lib/gcc/x86_64-linux-gnu/7.2.0/../../include/c++/7.2.0/memory:80:
/usr/bin/../lib/gcc/x86_64-linux-gnu/7.2.0/../../include/c++/7.2.0/bits/unique_ptr.h:78:2: error: delete called on non-final 'crashpad::ProcessMemoryLinux' that has virtual functions but non-virtual destructor [-Werror,-Wdelete-non-virtual-dtor]
        delete __ptr;
        ^
/usr/bin/../lib/gcc/x86_64-linux-gnu/7.2.0/../../include/c++/7.2.0/bits/unique_ptr.h:268:4: note: in instantiation of member function 'std::default_delete<crashpad::ProcessMemoryLinux>::operator()' requested here
          get_deleter()(__ptr);
          ^
../../snapshot/linux/process_reader.cc:169:16: note: in instantiation of member function 'std::unique_ptr<crashpad::ProcessMemoryLinux, std::default_delete<crashpad::ProcessMemoryLinux> >::~unique_ptr' requested here
ProcessReader::ProcessReader()
               ^
1 error generated.
Change-Id: Ibe9671db429262aca12bbfdf457c8f72cad2f358
Reviewed-on: https://chromium-review.googlesource.com/738530
Reviewed-by: Dave Bort <dbort@google.com>
Commit-Queue: Mark Mentovai <mark@chromium.org>
This commit is contained in:
Mark Mentovai 2017-10-25 14:26:29 -04:00 committed by Commit Bot
parent b96b9f627e
commit 52d766400d
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
snapshot/linux/process_reader.cc
View File

@ -192,8 +192,7 @@ bool ProcessReader::Initialize(PtraceConnection* connection) {
return false;
}
process_memory_.reset(new ProcessMemoryLinux());
if (!process_memory_->Initialize(pid)) {
if (!process_memory_.Initialize(pid)) {
return false;
}

7
snapshot/linux/process_reader.h
View File

@ -18,7 +18,6 @@
#include <sys/time.h>
#include <sys/types.h>
#include <memory>
#include <vector>
#include "base/macros.h"
@ -79,7 +78,7 @@ class ProcessReader {
pid_t ParentProcessID() const { return process_info_.ParentProcessID(); }
//! \brief Return a memory reader for the target process.
ProcessMemory* Memory() { return process_memory_.get(); }
ProcessMemory* Memory() { return &process_memory_; }
//! \brief Return a memory map of the target process.
MemoryMap* GetMemoryMap() { return &memory_map_; }
@ -113,9 +112,9 @@ class ProcessReader {
PtraceConnection* connection_; // weak
ProcessInfo process_info_;
class MemoryMap memory_map_;
MemoryMap memory_map_;
std::vector<Thread> threads_;
std::unique_ptr<ProcessMemoryLinux> process_memory_;
ProcessMemoryLinux process_memory_;
bool is_64_bit_;
bool initialized_threads_;
InitializationStateDcheck initialized_;

1
snapshot/linux/process_reader_test.cc
View File

@ -24,6 +24,7 @@
#include <unistd.h>
#include <map>
#include <memory>
#include <string>
#include <utility>

2
util/process/process_memory_linux.h
View File

@ -27,7 +27,7 @@
namespace crashpad {
//! \brief Accesses the memory of another Linux process.
class ProcessMemoryLinux : public ProcessMemory {
class ProcessMemoryLinux final : public ProcessMemory {
public:
ProcessMemoryLinux();
~ProcessMemoryLinux();