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