From: "Christian Biesinger via gdb-patches" <gdb-patches@sourceware.org>
To: gdb-patches@sourceware.org
Cc: Christian Biesinger <cbiesinger@google.com>
Subject: [PATCH v4] Make GDB compile with Python 3 on MinGW
Date: Thu, 15 Aug 2019 18:49:00 -0000 [thread overview]
Message-ID: <20190815184942.19371-1-cbiesinger@google.com> (raw)
In-Reply-To: <CAPTJ0XF81N_geY+L5XieEgbdf_G=f7LfXvm3ukRx=sH6CRwc0Q@mail.gmail.com>
PyFile_FromString and PyFile_AsFile have been removed in Python 3.
There is no obvious replacement that works here, and we can't just
pass our FILE* to a DLL in Windows because it may use a different
C runtime.
So we just call a Python function which reads and executes file
contents. Care must be taken to execute it in the context of
__main__.
Tested by inverting the ifdef and running the testsuite on Debian
Linux (even without the patch, I failed at running the testsuite
on Windows). I did test with both Python 2 and 3.
gdb/ChangeLog:
2019-08-13 Christian Biesinger <cbiesinger@google.com>
* python/lib/gdb/__init__.py: Add an execute_file function.
* python/python.c (python_run_simple_file): Call gdb.execute_file
on Windows.
---
gdb/python/lib/gdb/__init__.py | 26 ++++++++++++++++++++++++++
gdb/python/python.c | 23 ++++++++++++++---------
2 files changed, 40 insertions(+), 9 deletions(-)
diff --git a/gdb/python/lib/gdb/__init__.py b/gdb/python/lib/gdb/__init__.py
index af74df80c8..afe5b08f3a 100644
--- a/gdb/python/lib/gdb/__init__.py
+++ b/gdb/python/lib/gdb/__init__.py
@@ -106,6 +106,32 @@ def execute_unwinders(pending_frame):
return None
+def _execute_file(filepath):
+ """This function is used to replace Python 2's PyRun_SimpleFile.
+
+ Loads and executes the given file.
+
+ We could use the runpy module, but its documentation says:
+ "Furthermore, any functions and classes defined by the executed code are
+ not guaranteed to work correctly after a runpy function has returned."
+ """
+ globals = sys.modules['__main__'].__dict__
+ set_file = False
+ # Set file (if not set) so that the imported file can use it (e.g. to
+ # access file-relative paths). This matches what PyRun_SimpleFile does.
+ if not hasattr(globals, '__file__'):
+ globals['__file__'] = filepath
+ set_file = True
+ try:
+ with open(filepath, 'rb') as file:
+ # We pass globals also as locals to match what Python does
+ # in PyRun_SimpleFile.
+ compiled = compile(file.read(), filepath, 'exec')
+ exec(compiled, globals, globals)
+ finally:
+ if set_file:
+ del globals['__file__']
+
# Convenience variable to GDB's python directory
PYTHONDIR = os.path.dirname(os.path.dirname(__file__))
diff --git a/gdb/python/python.c b/gdb/python/python.c
index 162470dcc0..cca7c4cd6b 100644
--- a/gdb/python/python.c
+++ b/gdb/python/python.c
@@ -323,9 +323,8 @@ python_interactive_command (const char *arg, int from_tty)
A FILE * from one runtime does not necessarily operate correctly in
the other runtime.
- To work around this potential issue, we create on Windows hosts the
- FILE object using Python routines, thus making sure that it is
- compatible with the Python library. */
+ To work around this potential issue, we run code in Python to load
+ the script. */
static void
python_run_simple_file (FILE *file, const char *filename)
@@ -339,15 +338,21 @@ python_run_simple_file (FILE *file, const char *filename)
/* Because we have a string for a filename, and are using Python to
open the file, we need to expand any tilde in the path first. */
gdb::unique_xmalloc_ptr<char> full_path (tilde_expand (filename));
- gdbpy_ref<> python_file (PyFile_FromString (full_path.get (), (char *) "r"));
- if (python_file == NULL)
+
+ if (gdb_python_module == nullptr
+ || ! PyObject_HasAttrString (gdb_python_module, "_execute_file"))
+ error (_("Installation error: gdb._execute_file function is missing"));
+
+ gdbpy_ref<> return_value
+ (PyObject_CallMethod (gdb_python_module, "_execute_file", "s",
+ full_path.get ()));
+ if (return_value == nullptr)
{
- gdbpy_print_stack ();
- error (_("Error while opening file: %s"), full_path.get ());
+ /* Use PyErr_PrintEx instead of gdbpy_print_stack to better match the
+ behavior of the non-Windows codepath. */
+ PyErr_PrintEx(0);
}
- PyRun_SimpleFile (PyFile_AsFile (python_file.get ()), filename);
-
#endif /* _WIN32 */
}
--
2.23.0.rc1.153.gdeed80330f-goog
next prev parent reply other threads:[~2019-08-15 18:49 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-14 0:05 [PATCH] " Christian Biesinger via gdb-patches
2019-08-14 16:06 ` [PATCH v2] " Christian Biesinger via gdb-patches
2019-08-15 2:58 ` Simon Marchi
2019-08-15 17:15 ` Christian Biesinger via gdb-patches
2019-08-15 17:15 ` [PATCH] " Christian Biesinger via gdb-patches
2019-08-15 17:42 ` [PATCH v3] " Christian Biesinger via gdb-patches
2019-08-15 18:02 ` Pedro Alves
2019-08-15 18:50 ` Christian Biesinger via gdb-patches
2019-08-15 18:49 ` Christian Biesinger via gdb-patches [this message]
2019-08-22 20:48 ` [PING] [PATCH v4] " Christian Biesinger via gdb-patches
2019-08-22 22:24 ` Simon Marchi
2019-08-22 22:48 ` Christian Biesinger via gdb-patches
2019-09-14 13:09 ` Christian Biesinger via gdb-patches
2019-09-14 13:30 ` Eli Zaretskii
2019-09-14 20:43 ` [PATCH] Add a NEWS entry that gdb can be compiled with py3 on Windows Christian Biesinger via gdb-patches
2019-09-15 2:34 ` Eli Zaretskii
2019-09-15 2:42 ` Christian Biesinger via gdb-patches
2019-08-15 18:25 ` [PATCH v2] Make GDB compile with Python 3 on MinGW Simon Marchi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190815184942.19371-1-cbiesinger@google.com \
--to=gdb-patches@sourceware.org \
--cc=cbiesinger@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).