diff options
author | Zachary Turner <zturner@google.com> | 2019-03-04 19:57:04 +0000 |
---|---|---|
committer | Zachary Turner <zturner@google.com> | 2019-03-04 19:57:04 +0000 |
commit | bb4d4e2d767b451c88d8f226d62ab7c81f46711b (patch) | |
tree | 6d02afc7857bf98690c649b87cd0f94e97a56b10 /lldb/source/Host/windows | |
parent | 8670faf9394ed34ff894b0e784cdee4ba70d7837 (diff) | |
download | bcm5719-llvm-bb4d4e2d767b451c88d8f226d62ab7c81f46711b.tar.gz bcm5719-llvm-bb4d4e2d767b451c88d8f226d62ab7c81f46711b.zip |
Fix Windows build after UserIDResolver patch.
That patch added a function to HostInfo that returns an instance
of UserIDResolver, but this function was unimplemented on Windows,
leading to linker errors. For now, just return a dummy implementation
that doesn't resolve user ids to get the build green.
llvm-svn: 355329
Diffstat (limited to 'lldb/source/Host/windows')
-rw-r--r-- | lldb/source/Host/windows/HostInfoWindows.cpp | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/lldb/source/Host/windows/HostInfoWindows.cpp b/lldb/source/Host/windows/HostInfoWindows.cpp index 033d6d844b4..8cd8f2d2fc5 100644 --- a/lldb/source/Host/windows/HostInfoWindows.cpp +++ b/lldb/source/Host/windows/HostInfoWindows.cpp @@ -14,15 +14,29 @@ #include "lldb/Host/windows/HostInfoWindows.h" #include "lldb/Host/windows/PosixApi.h" +#include "lldb/Utility/UserIDResolver.h" #include "llvm/ADT/SmallString.h" #include "llvm/Support/ConvertUTF.h" #include "llvm/Support/FileSystem.h" +#include "llvm/Support/ManagedStatic.h" #include "llvm/Support/Path.h" #include "llvm/Support/Threading.h" #include "llvm/Support/raw_ostream.h" using namespace lldb_private; +namespace { +class WindowsUserIDResolver : public UserIDResolver { +protected: + llvm::Optional<std::string> DoGetUserName(id_t uid) override { + return llvm::None; + } + llvm::Optional<std::string> DoGetGroupName(id_t gid) override { + return llvm::None; + } +}; +} // namespace + FileSpec HostInfoWindows::m_program_filespec; void HostInfoWindows::Initialize() { @@ -117,3 +131,9 @@ bool HostInfoWindows::GetEnvironmentVar(const std::string &var_name, return llvm::convertWideToUTF8(wvar, var); return false; } + +static llvm::ManagedStatic<WindowsUserIDResolver> g_user_id_resolver; + +UserIDResolver &HostInfoWindows::GetUserIDResolver() { + return *g_user_id_resolver; +} |