Skip to content

[lldb] Only use PyConfig when LLDB_EMBED_PYTHON_HOME is enabled #152588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 8, 2025
Merged

[lldb] Only use PyConfig when LLDB_EMBED_PYTHON_HOME is enabled #152588

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 21 additions & 19 deletions lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,25 +92,6 @@ namespace {
struct InitializePythonRAII {
public:
InitializePythonRAII() {
PyConfig config;
PyConfig_InitPythonConfig(&config);

#if LLDB_EMBED_PYTHON_HOME
static std::string g_python_home = []() -> std::string {
if (llvm::sys::path::is_absolute(LLDB_PYTHON_HOME))
return LLDB_PYTHON_HOME;

FileSpec spec = HostInfo::GetShlibDir();
if (!spec)
return {};
spec.AppendPathComponent(LLDB_PYTHON_HOME);
return spec.GetPath();
}();
if (!g_python_home.empty()) {
PyConfig_SetBytesString(&config, &config.home, g_python_home.c_str());
}
#endif

// The table of built-in modules can only be extended before Python is
// initialized.
if (!Py_IsInitialized()) {
Expand All @@ -134,9 +115,30 @@ struct InitializePythonRAII {
PyImport_AppendInittab("_lldb", LLDBSwigPyInit);
}

#if LLDB_EMBED_PYTHON_HOME
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was moving the initialization past the if (!Py_IsInitialized()) { needed ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Part of it, yes, but you could avoid changing the order by splitting the ifdef-ed code in two, which is slightly messier. I enabled LLDB_EMBED_PYTHON_HOME on Darwin and there it doesn't matter. That would look like this:

#if LLDB_EMBED_PYTHON_HOME
  PyConfig config;
  [...]
  PyConfig_SetBytesString(&config, &config.home, g_python_home.c_str());
#endif 

  if (!Py_IsInitialized()) {
  	[...]
    PyImport_AppendInittab("_lldb", LLDBSwigPyInit);
  }
  
#if LLDB_EMBED_PYTHON_HOME  
    config.install_signal_handlers = 0;
    Py_InitializeFromConfig(&config);
    PyConfig_Clear(&config);
#else
    Py_InitializeEx(/*install_sigs=*/0);
#endif

PyConfig config;
PyConfig_InitPythonConfig(&config);

static std::string g_python_home = []() -> std::string {
if (llvm::sys::path::is_absolute(LLDB_PYTHON_HOME))
return LLDB_PYTHON_HOME;

FileSpec spec = HostInfo::GetShlibDir();
if (!spec)
return {};
spec.AppendPathComponent(LLDB_PYTHON_HOME);
return spec.GetPath();
}();
if (!g_python_home.empty()) {
PyConfig_SetBytesString(&config, &config.home, g_python_home.c_str());
}

config.install_signal_handlers = 0;
Py_InitializeFromConfig(&config);
PyConfig_Clear(&config);
#else
Py_InitializeEx(/*install_sigs=*/0);
#endif

// The only case we should go further and acquire the GIL: it is unlocked.
PyGILState_STATE gil_state = PyGILState_Ensure();
Expand Down
Loading