Reland "[lldb] Reland 2402b3213c with /H to debug the windows build issue (#101672)
This reverts commit 9effefbae8.
With the include order in ScriptedProcessPythonInterface.cpp fixed
(though I cannot explain exactly why it works) and removes the /H flag
intended for debugging this issue.
I think it is something to do with Process.h pulling in PosixApi.h
somewhere along the line, and including Process.h after lldb-python.h
means that NO_PID_T is defined to prevent a redefinition of pid_t.
This commit is contained in:
1 parent
60054dcd81
commit
9d07f43676
5 files changed
+68
-13
No files matched your search
-76
@@ -1,76 +0,0 @@
|
||||
//===-- ScriptedProcessPythonInterface.h ------------------------*- C++ -*-===//
|
||||
//
|
||||
// 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
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
#ifndef LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDPROCESSPYTHONINTERFACE_H
|
||||
#define LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDPROCESSPYTHONINTERFACE_H
|
||||
|
||||
#include "lldb/Host/Config.h"
|
||||
|
||||
#if LLDB_ENABLE_PYTHON
|
||||
|
||||
#include "ScriptedPythonInterface.h"
|
||||
#include "lldb/Interpreter/Interfaces/ScriptedProcessInterface.h"
|
||||
#include <optional>
|
||||
|
||||
namespace lldb_private {
|
||||
class ScriptedProcessPythonInterface : public ScriptedProcessInterface,
|
||||
public ScriptedPythonInterface {
|
||||
public:
|
||||
ScriptedProcessPythonInterface(ScriptInterpreterPythonImpl &interpreter);
|
||||
|
||||
llvm::Expected<StructuredData::GenericSP>
|
||||
CreatePluginObject(const llvm::StringRef class_name,
|
||||
ExecutionContext &exe_ctx,
|
||||
StructuredData::DictionarySP args_sp,
|
||||
StructuredData::Generic *script_obj = nullptr) override;
|
||||
|
||||
llvm::SmallVector<llvm::StringLiteral> GetAbstractMethods() const override {
|
||||
return llvm::SmallVector<llvm::StringLiteral>(
|
||||
{"read_memory_at_address", "is_alive", "get_scripted_thread_plugin"});
|
||||
}
|
||||
|
||||
StructuredData::DictionarySP GetCapabilities() override;
|
||||
|
||||
Status Attach(const ProcessAttachInfo &attach_info) override;
|
||||
|
||||
Status Launch() override;
|
||||
|
||||
Status Resume() override;
|
||||
|
||||
std::optional<MemoryRegionInfo>
|
||||
GetMemoryRegionContainingAddress(lldb::addr_t address,
|
||||
Status &error) override;
|
||||
|
||||
StructuredData::DictionarySP GetThreadsInfo() override;
|
||||
|
||||
bool CreateBreakpoint(lldb::addr_t addr, Status &error) override;
|
||||
|
||||
lldb::DataExtractorSP ReadMemoryAtAddress(lldb::addr_t address, size_t size,
|
||||
Status &error) override;
|
||||
|
||||
lldb::offset_t WriteMemoryAtAddress(lldb::addr_t addr,
|
||||
lldb::DataExtractorSP data_sp,
|
||||
Status &error) override;
|
||||
|
||||
StructuredData::ArraySP GetLoadedImages() override;
|
||||
|
||||
lldb::pid_t GetProcessID() override;
|
||||
|
||||
bool IsAlive() override;
|
||||
|
||||
std::optional<std::string> GetScriptedThreadPluginName() override;
|
||||
|
||||
StructuredData::DictionarySP GetMetadata() override;
|
||||
|
||||
private:
|
||||
lldb::ScriptedThreadInterfaceSP CreateScriptedThreadInterface() override;
|
||||
};
|
||||
} // namespace lldb_private
|
||||
|
||||
#endif // LLDB_ENABLE_PYTHON
|
||||
#endif // LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDPROCESSPYTHONINTERFACE_H
|
||||
Reference in new issue
Block a user