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