Skip to content

Commit f96cfda

Browse files
authored
Merge pull request #1996 from apple/revert-1992-cherrypick/r372060
apple-llvm-split-commit: 59ee2a439a00627b95765e4eec8af265ee43f314 apple-llvm-split-dir: lldb/
2 parents f5ed756 + 7e3ae07 commit f96cfda

File tree

3 files changed

+6
-16
lines changed

3 files changed

+6
-16
lines changed

lldb/lit/Commands/Inputs/frame.py

Lines changed: 0 additions & 2 deletions
This file was deleted.

lldb/lit/Commands/command-script-import.test

Lines changed: 0 additions & 8 deletions
This file was deleted.

lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2717,12 +2717,12 @@ bool ScriptInterpreterPythonImpl::LoadScriptingModule(
27172717
StreamString command_stream;
27182718

27192719
// Before executing Python code, lock the GIL.
2720-
Locker py_lock(
2721-
this,
2722-
Locker::AcquireLock | (init_session ? Locker::InitSession : 0) |
2723-
(init_session ? Locker::InitGlobals : 0) | Locker::NoSTDIN,
2724-
Locker::FreeAcquiredLock |
2725-
(init_session ? Locker::TearDownSession : 0));
2720+
Locker py_lock(this,
2721+
Locker::AcquireLock |
2722+
(init_session ? Locker::InitSession : 0) |
2723+
Locker::NoSTDIN,
2724+
Locker::FreeAcquiredLock |
2725+
(init_session ? Locker::TearDownSession : 0));
27262726
namespace fs = llvm::sys::fs;
27272727
fs::file_status st;
27282728
std::error_code ec = status(target_file.GetPath(), st);

0 commit comments

Comments
 (0)