projects / postgresql.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e5b50d0)
Work around gcc 4.6.0 bug that breaks WAL replay.
authorTom Lane <tgl@sss.pgh.pa.us>
Fri, 10 Jun 2011 21:03:27 +0000 (17:03 -0400)
committerTom Lane <tgl@sss.pgh.pa.us>
Fri, 10 Jun 2011 21:03:27 +0000 (17:03 -0400)
ReadRecord's habit of using both direct references to tmpRecPtr and
references to *RecPtr (which is pointing at tmpRecPtr) triggers an
optimization bug in gcc 4.6.0, which apparently has forgotten about
aliasing rules.  Avoid the compiler bug, and make the code more readable
to boot, by getting rid of the direct references.  Improve the comments
while at it.

Back-patch to all supported versions, in case they get built with 4.6.0.

Tom Lane, with some cosmetic suggestions from Alex Hunsaker

src/backend/access/transam/xlog.c patch | blob | blame | history

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 594437badc0f41e7bd2826bea88007587ebc4be6..5be726ea8ae4181e36eb165cd8aec928ed4b252f 100644 (file)
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -2931,12 +2931,12 @@ ReadRecord(XLogRecPtr *RecPtr, int emode)
            goto got_record;
        }
        /* align old recptr to next page */
-       if (tmpRecPtr.xrecoff % XLOG_BLCKSZ != 0)
-           tmpRecPtr.xrecoff += (XLOG_BLCKSZ - tmpRecPtr.xrecoff % XLOG_BLCKSZ);
-       if (tmpRecPtr.xrecoff >= XLogFileSize)
+       if (RecPtr->xrecoff % XLOG_BLCKSZ != 0)
+           RecPtr->xrecoff += (XLOG_BLCKSZ - RecPtr->xrecoff % XLOG_BLCKSZ);
+       if (RecPtr->xrecoff >= XLogFileSize)
        {
-           (tmpRecPtr.xlogid)++;
-           tmpRecPtr.xrecoff = 0;
+           (RecPtr->xlogid)++;
+           RecPtr->xrecoff = 0;
        }
        /* We will account for page header size below */
    }
@@ -3022,11 +3022,13 @@ ReadRecord(XLogRecPtr *RecPtr, int emode)
    if (targetRecOff == 0)
    {
        /*
-        * Can only get here in the continuing-from-prev-page case, because
-        * XRecOffIsValid eliminated the zero-page-offset case otherwise. Need
-        * to skip over the new page's header.
+        * At page start, so skip over page header.  The Assert checks that
+        * we're not scribbling on caller's record pointer; it's OK because we
+        * can only get here in the continuing-from-prev-record case, since
+        * XRecOffIsValid rejected the zero-page-offset case otherwise.
         */
-       tmpRecPtr.xrecoff += pageHeaderSize;
+       Assert(RecPtr == &tmpRecPtr);
+       RecPtr->xrecoff += pageHeaderSize;
        targetRecOff = pageHeaderSize;
    }
    else if (targetRecOff < pageHeaderSize)
This is the main PostgreSQL git repository.