ea2d40
commit 0b91f8a668201fc58fa732b8acc496caedfdbae0
ea2d40
Author: Florian Weimer <fw@deneb.enyo.de>
ea2d40
Date:   Sun Apr 29 12:18:33 2018 -0700
ea2d40
ea2d40
    Indicate that _PyGC_Head is only 8-byte aligned. (closes bpo-33374)
ea2d40
ea2d40
    By spec, the "long double" in _PyGC_Head requires the union to always be 16-byte
ea2d40
    aligned. However, obmalloc only yields 8-byte alignment. Compilers including GCC
ea2d40
    8 are starting to use alignment information to do store-merging. So, the "long
ea2d40
    double" needs to be changed to a simple "double" as was long ago done in Python
ea2d40
    3 by e348c8d154cf6342c79d627ebfe89dfe9de23817. For 2.7, we need to add some
ea2d40
    dummy padding to make sure _PyGC_Head stays the same size.
ea2d40
ea2d40
diff --git a/Include/objimpl.h b/Include/objimpl.h
ea2d40
index 5f28683329..cbf6bc3f87 100644
ea2d40
--- Python-2.7.13/Include/objimpl.h
ea2d40
+++ Python-2.7.13/Include/objimpl.h
ea2d40
@@ -248,6 +248,20 @@ PyAPI_FUNC(PyVarObject *) _PyObject_GC_Resize(PyVarObject *, Py_ssize_t);
ea2d40
 /* for source compatibility with 2.2 */
ea2d40
 #define _PyObject_GC_Del PyObject_GC_Del
ea2d40
ea2d40
+/*
ea2d40
+ * Former over-aligned definition of PyGC_Head, used to compute the size of the
ea2d40
+ * padding for the new version below.
ea2d40
+ */
ea2d40
+union _gc_head;
ea2d40
+union _gc_head_old {
ea2d40
+    struct {
ea2d40
+        union _gc_head_old *gc_next;
ea2d40
+        union _gc_head_old *gc_prev;
ea2d40
+        Py_ssize_t gc_refs;
ea2d40
+    } gc;
ea2d40
+    long double dummy;
ea2d40
+};
ea2d40
+
ea2d40
 /* GC information is stored BEFORE the object structure. */
ea2d40
 typedef union _gc_head {
ea2d40
     struct {
ea2d40
@@ -255,7 +269,8 @@ typedef union _gc_head {
ea2d40
         union _gc_head *gc_prev;
ea2d40
         Py_ssize_t gc_refs;
ea2d40
     } gc;
ea2d40
-    long double dummy;  /* force worst-case alignment */
ea2d40
+    double dummy; /* Force at least 8-byte alignment. */
ea2d40
+    char dummy_padding[sizeof(union _gc_head_old)];
ea2d40
 } PyGC_Head;
ea2d40
ea2d40
 extern PyGC_Head *_PyGC_generation0;
ea2d40
diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-04-29-12-07-00.bpo-33374.-xegL6.rst b/Misc/NEWS.d/next/Core and Builtins/2018-04-29-12-07-00.bpo-33374.-xegL6.rst
ea2d40
new file mode 100644
ea2d40
index 0000000000..9ec1a605c8
ea2d40
--- /dev/null
ea2d40
+++ Python-2.7.13/Misc/NEWS.d/next/Core and Builtins/2018-04-29-12-07-00.bpo-33374.-xegL6.rst
ea2d40
@@ -0,0 +1,3 @@
ea2d40
+Tweak the definition of PyGC_Head, so compilers do not believe it is always
ea2d40
+16-byte aligned on x86. This prevents crashes with more aggressive
ea2d40
+optimizations present in GCC 8.