Volatile-ize all five places where we expect a PG_TRY block to restore

old memory context in plpython.  Before only one of them was marked
volatile, but per report from Zdenek Kotala, some compilers do the
wrong thing here.

diff --git a/src/pl/plpython/plpython.c b/src/pl/plpython/plpython.c
index c9f1ee5f27060d7014e277b96bbba09caf66093b..a6c65f1b7ba75819b7123732f600396b998c456e 100644 (file)
--- a/src/pl/plpython/plpython.c
+++ b/src/pl/plpython/plpython.c
@@ -29,7 +29,7 @@
  * MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
  *
  * IDENTIFICATION
- *     $PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.58.4.9 2009/11/03 07:53:58 petere Exp $
+ *     $PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.58.4.10 2010/02/18 23:50:41 tgl Exp $
  *
  *********************************************************************
  */
@@ -1853,7 +1853,7 @@ PLy_spi_prepare(PyObject * self, PyObject * args)
        PyObject   *volatile optr = NULL;
        char       *query;
        void       *tmpplan;
-       MemoryContext oldcontext;
+       volatile MemoryContext oldcontext;
 
        /* Can't execute more if we have an unhandled error */
        if (PLy_error_in_progress)
@@ -2007,7 +2007,7 @@ PLy_spi_execute_plan(PyObject * ob, PyObject * list, int limit)
        int                     i,
                                rv;
        PLyPlanObject *plan;
-       MemoryContext oldcontext;
+       volatile MemoryContext oldcontext;
 
        if (list != NULL)
        {
@@ -2151,7 +2151,7 @@ static PyObject *
 PLy_spi_execute_query(char *query, int limit)
 {
        int                     rv;
-       MemoryContext oldcontext;
+       volatile MemoryContext oldcontext;
 
        oldcontext = CurrentMemoryContext;
        PG_TRY();
@@ -2188,7 +2188,7 @@ static PyObject *
 PLy_spi_execute_fetch_result(SPITupleTable *tuptable, int rows, int status)
 {
        PLyResultObject *result;
-       MemoryContext oldcontext;
+       volatile MemoryContext oldcontext;
 
        result = (PLyResultObject *) PLy_result_new();
        Py_DECREF(result->status);