Skip to content

Commit

Permalink
[Gardening] Remove dead code from ScriptInterpreterPython (NFC)
Browse files Browse the repository at this point in the history
The terminal state is never saved or restored.

llvm-svn: 367977
  • Loading branch information
JDevlieghere committed Aug 6, 2019
1 parent 3c3dce2 commit ea1752a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 24 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -448,9 +448,9 @@ ScriptInterpreterPythonImpl::ScriptInterpreterPythonImpl(Debugger &debugger)
m_sys_module_dict(PyInitialValue::Invalid), m_run_one_line_function(),
m_run_one_line_str_global(),
m_dictionary_name(m_debugger.GetInstanceName().AsCString()),
m_terminal_state(), m_active_io_handler(eIOHandlerNone),
m_session_is_active(false), m_pty_slave_is_open(false),
m_valid_session(true), m_lock_count(0), m_command_thread_state(nullptr) {
m_active_io_handler(eIOHandlerNone), m_session_is_active(false),
m_pty_slave_is_open(false), m_valid_session(true), m_lock_count(0),
m_command_thread_state(nullptr) {
InitializePrivate();

m_dictionary_name.append("_dict");
Expand Down Expand Up @@ -611,22 +611,6 @@ ScriptInterpreterPythonImpl::CreateInstance(Debugger &debugger) {

void ScriptInterpreterPythonImpl::ResetOutputFileHandle(FILE *fh) {}

void ScriptInterpreterPythonImpl::SaveTerminalState(int fd) {
// Python mucks with the terminal state of STDIN. If we can possibly avoid
// this by setting the file handles up correctly prior to entering the
// interpreter we should. For now we save and restore the terminal state on
// the input file handle.
m_terminal_state.Save(fd, false);
}

void ScriptInterpreterPythonImpl::RestoreTerminalState() {
// Python mucks with the terminal state of STDIN. If we can possibly avoid
// this by setting the file handles up correctly prior to entering the
// interpreter we should. For now we save and restore the terminal state on
// the input file handle.
m_terminal_state.Restore();
}

void ScriptInterpreterPythonImpl::LeaveSession() {
Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_SCRIPT));
if (log)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -347,10 +347,6 @@ class ScriptInterpreterPythonImpl : public ScriptInterpreterPython {

void LeaveSession();

void SaveTerminalState(int fd);

void RestoreTerminalState();

uint32_t IsExecutingPython() const { return m_lock_count > 0; }

uint32_t IncrementLockCount() { return ++m_lock_count; }
Expand Down Expand Up @@ -387,7 +383,6 @@ class ScriptInterpreterPythonImpl : public ScriptInterpreterPython {
PythonObject m_run_one_line_function;
PythonObject m_run_one_line_str_global;
std::string m_dictionary_name;
TerminalState m_terminal_state;
ActiveIOHandler m_active_io_handler;
bool m_session_is_active;
bool m_pty_slave_is_open;
Expand Down

0 comments on commit ea1752a

Please sign in to comment.