diff options
author | Nico Weber <thakis@chromium.org> | 2022-07-23 12:31:31 -0400 |
---|---|---|
committer | Nico Weber <thakis@chromium.org> | 2022-07-23 12:35:48 -0400 |
commit | 1b4b12a34022b13b35755d9c941f7f13753e5e96 (patch) | |
tree | ae21d18e00f9cf38b86d71e5711178e7e6f089ce /lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp | |
parent | cbfc22392085924c39fbd239884c12a1b5294085 (diff) | |
download | llvm-1b4b12a34022b13b35755d9c941f7f13753e5e96.zip llvm-1b4b12a34022b13b35755d9c941f7f13753e5e96.tar.gz llvm-1b4b12a34022b13b35755d9c941f7f13753e5e96.tar.bz2 |
Revert "[NFC] Improve FileSpec internal APIs and usage in preparation for adding caching of resolved/absolute." and follow-ups
This reverts commit 9429b67b8e300e638d7828bbcb95585f85c4df4d.
It broke the build on Windows, see comments on https://reviews.llvm.org/D130309
It also reverts these follow-ups:
Revert "Fix buildbot breakage after https://reviews.llvm.org/D130309."
This reverts commit f959d815f4637890ebbacca379f1c38ab47e4e14.
Revert "Fix buildbot breakage after https://reviews.llvm.org/D130309."
This reverts commit 0bbce7a4c2d2bff622bdadd4323f93f5d90e6d24.
Revert "Cache the value for absolute path in FileSpec."
This reverts commit dabe877248b85b34878e75d5510339325ee087d0.
Diffstat (limited to 'lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp')
-rw-r--r-- | lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp index 6558993..a21adcfb 100644 --- a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp +++ b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp @@ -241,7 +241,7 @@ void ScriptInterpreterPython::ComputePythonDir( llvm::sys::path::append(path, LLDB_PYTHON_RELATIVE_LIBDIR); #if defined(_WIN32) - // This will be injected directly through FileSpec.SetDirectory(), + // This will be injected directly through FileSpec.GetDirectory().SetString(), // so we need to normalize manually. std::replace(path.begin(), path.end(), '\\', '/'); #endif @@ -260,7 +260,7 @@ FileSpec ScriptInterpreterPython::GetPythonDir() { #else ComputePythonDir(path); #endif - spec.SetDirectory(path); + spec.GetDirectory().SetString(path); return spec; }(); return g_spec; |