caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[lldb] fix -print-script-interpreter-info on windows

Browse Source 
Apparently "{sys.prefix}/bin/python3" isn't where you find the
python interpreter on windows, so the test I wrote for
-print-script-interpreter-info is failing.

We can't rely on sys.executable at runtime, because that will point
to lldb.exe not python.exe.

We can't just record sys.executable from build time, because python
could have been moved to a different location.

But it should be OK to apply relative path from sys.prefix to sys.executable
from build-time to the sys.prefix at runtime.

Reviewed By: JDevlieghere

Differential Revision: https://reviews.llvm.org/D113650
This commit is contained in:
Lawrence D'Anna
2021-11-16 13:50:18 -08:00
committed by Lawrence D'Anna
parent 913d78c40c
commit 4c2cf3a314
5 changed files with 94 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
View File

@@ -410,30 +410,31 @@ FileSpec ScriptInterpreterPython::GetPythonDir() {
return g_spec;
}
static const char GetInterpreterInfoScript[] = R"(
import os
import sys
def main(lldb_python_dir, python_exe_relative_path):
info = {
"lldb-pythonpath": lldb_python_dir,
"language": "python",
"prefix": sys.prefix,
"executable": os.path.join(sys.prefix, python_exe_relative_path)
}
return info
)";
static const char python_exe_relative_path[] = LLDB_PYTHON_EXE_RELATIVE_PATH;
StructuredData::DictionarySP ScriptInterpreterPython::GetInterpreterInfo() {
GIL gil;
FileSpec python_dir_spec = GetPythonDir();
if (!python_dir_spec)
return nullptr;
PythonString python_dir(python_dir_spec.GetPath());
PythonDictionary info(PyInitialValue::Empty);
llvm::Error error = info.SetItem("lldb-pythonpath", python_dir);
if (error)
return nullptr;
static const char script[] = R"(
def main(info):
import sys
import os
name = 'python' + str(sys.version_info.major)
info.update({
"language": "python",
"prefix": sys.prefix,
"executable": os.path.join(sys.prefix, "bin", name),
})
return info
)";
PythonScript get_info(script);
auto info_json = unwrapIgnoringErrors(As<PythonDictionary>(get_info(info)));
PythonScript get_info(GetInterpreterInfoScript);
auto info_json = unwrapIgnoringErrors(
As<PythonDictionary>(get_info(PythonString(python_dir_spec.GetPath()),
PythonString(python_exe_relative_path))));
if (!info_json)
return nullptr;
return info_json.CreateStructuredDictionary();