From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 65798 invoked by alias); 22 Aug 2019 20:48:15 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 65713 invoked by uid 89); 22 Aug 2019 20:48:07 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-30.7 required=5.0 tests=AWL,BAYES_00,ENV_AND_HDR_SPF_MATCH,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_PASS,USER_IN_DEF_SPF_WL autolearn=ham version=3.3.1 spammy=sk:unique_, GDBs, UD:modules, GDB's X-HELO: mail-oi1-f173.google.com Received: from mail-oi1-f173.google.com (HELO mail-oi1-f173.google.com) (209.85.167.173) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 22 Aug 2019 20:48:05 +0000 Received: by mail-oi1-f173.google.com with SMTP id g7so5416372oia.8 for ; Thu, 22 Aug 2019 13:48:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=u5WQyA58rO1XNsBaPzcQdfP+Xz/+G9pDvBjKqVAmMbk=; b=QDbgmHsNLx0/JPwUxum17h1YTwbtntRw0/5OjguvQ2oYPzcnsx7WBiwdbtmKAC2is8 pPHW11qwFz1WgtrZfdu889RFuUtqSLlFCXWcvCgsPp40jbTvlGzyXJJaMgLZTqvl17vg sncwGY2n/nbvnUSZsa8gaBTIPZh73ZgkGnlgjslJ7JenP3l/m16Lsi3mQuhUN7g3Wyvt OFIeKrk9nHLc/3GnY/hOAP/9/zTZZDvPaANdzyrUtSafyAdsgTHiWG0GFywMXUCQzepG Ljp0vXDMlbHRs0I6SyYSCXk0YQPQ+lPSJ+jT7t2jWoIpwk2VaRLYG8q9BAXCNuQuqCZk HD4Q== MIME-Version: 1.0 References: <20190815184942.19371-1-cbiesinger@google.com> In-Reply-To: <20190815184942.19371-1-cbiesinger@google.com> From: "Christian Biesinger via gdb-patches" Reply-To: Christian Biesinger Date: Thu, 22 Aug 2019 20:48:00 -0000 Message-ID: Subject: [PING] [PATCH v4] Make GDB compile with Python 3 on MinGW To: gdb-patches Content-Type: text/plain; charset="UTF-8" X-IsSubscribed: yes X-SW-Source: 2019-08/txt/msg00538.txt.bz2 Ping On Thu, Aug 15, 2019 at 1:49 PM Christian Biesinger wrote: > > 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 > > * 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 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 >