
Resubmission of https://reviews.llvm.org/D130309 with the 2 patches that fixed the linux buildbot, and new windows fixes. The FileSpec APIs allow users to modify instance variables directly by getting a non const reference to the directory and filename instance variables. This makes it impossible to control all of the times the FileSpec object is modified so we can clear cached member variables like m_resolved and with an upcoming patch caching if the file is relative or absolute. This patch modifies the APIs of FileSpec so no one can modify the directory or filename instance variables directly by adding set accessors and by removing the get accessors that are non const. Many clients were using FileSpec::GetCString(...) which returned a unique C string from a ConstString'ified version of the result of GetPath() which returned a std::string. This caused many locations to use this convenient function incorrectly and could cause many strings to be added to the constant string pool that didn't need to. Most clients were converted to using FileSpec::GetPath().c_str() when possible. Other clients were modified to use the newly renamed version of this function which returns an actualy ConstString: ConstString FileSpec::GetPathAsConstString(bool denormalize = true) const; This avoids the issue where people were getting an already uniqued "const char *" that came from a ConstString only to put the "const char *" back into a "ConstString" object. By returning the ConstString instead of a "const char *" clients can be more efficient with the result. The patch: - Removes the non const GetDirectory() and GetFilename() get accessors - Adds set accessors to replace the above functions: SetDirectory() and SetFilename(). - Adds ClearDirectory() and ClearFilename() to replace usage of the FileSpec::GetDirectory().Clear()/FileSpec::GetFilename().Clear() call sites - Fixed all incorrect usage of FileSpec::GetCString() to use FileSpec::GetPath().c_str() where appropriate, and updated other call sites that wanted a ConstString to use the newly returned ConstString appropriately and efficiently. Differential Revision: https://reviews.llvm.org/D130549
59 lines
2.0 KiB
C++
59 lines
2.0 KiB
C++
//===-- WindowsMiniDump.cpp -----------------------------------------------===//
|
|
//
|
|
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
|
|
// See https://llvm.org/LICENSE.txt for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
// This function is separated out from ObjectFilePECOFF.cpp to name avoid name
|
|
// collisions with WinAPI preprocessor macros.
|
|
|
|
#include "WindowsMiniDump.h"
|
|
#include "lldb/Utility/FileSpec.h"
|
|
#include "llvm/Support/ConvertUTF.h"
|
|
|
|
#ifdef _WIN32
|
|
#include "lldb/Host/windows/windows.h"
|
|
#include <dbghelp.h>
|
|
#endif
|
|
|
|
namespace lldb_private {
|
|
|
|
bool SaveMiniDump(const lldb::ProcessSP &process_sp,
|
|
const lldb_private::FileSpec &outfile,
|
|
lldb_private::Status &error) {
|
|
if (!process_sp)
|
|
return false;
|
|
#ifdef _WIN32
|
|
HANDLE process_handle = ::OpenProcess(
|
|
PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, process_sp->GetID());
|
|
const std::string file_name = outfile.GetPath();
|
|
std::wstring wide_name;
|
|
wide_name.resize(file_name.size() + 1);
|
|
char *result_ptr = reinterpret_cast<char *>(&wide_name[0]);
|
|
const llvm::UTF8 *error_ptr = nullptr;
|
|
if (!llvm::ConvertUTF8toWide(sizeof(wchar_t), file_name, result_ptr,
|
|
error_ptr)) {
|
|
error.SetErrorString("cannot convert file name");
|
|
return false;
|
|
}
|
|
HANDLE file_handle =
|
|
::CreateFileW(wide_name.c_str(), GENERIC_WRITE, FILE_SHARE_READ, NULL,
|
|
CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
|
|
const auto result =
|
|
::MiniDumpWriteDump(process_handle, process_sp->GetID(), file_handle,
|
|
MiniDumpWithFullMemoryInfo, NULL, NULL, NULL);
|
|
::CloseHandle(file_handle);
|
|
::CloseHandle(process_handle);
|
|
if (!result) {
|
|
error.SetError(::GetLastError(), lldb::eErrorTypeWin32);
|
|
return false;
|
|
}
|
|
return true;
|
|
#endif
|
|
return false;
|
|
}
|
|
|
|
} // namesapce lldb_private
|