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