summaryrefslogtreecommitdiff
path: root/include/my_global.h
diff options
context:
space:
mode:
authorDavi Arnaut <Davi.Arnaut@Sun.COM>2010-07-14 09:27:13 -0300
committerDavi Arnaut <Davi.Arnaut@Sun.COM>2010-07-14 09:27:13 -0300
commitf317d3a6fb413cfc04c1ed005df8e859664e41d5 (patch)
tree666695a495d717b7ff2f8bcb13c61829e7bc393b /include/my_global.h
parentce78970202c076b5c9967ea4e31e5add94c73d82 (diff)
downloadmariadb-git-f317d3a6fb413cfc04c1ed005df8e859664e41d5.tar.gz
Bug#42733: Type-punning warnings when compiling MySQL --
strict aliasing violations. Another rather noisy violation of strict aliasing rules is the spatial code which makes use of stack-based memory (of type Geometry_buffer) to provide placement for Geometry objects. Although a placement new is allowed to dynamically change the type of a object, the object returned by the new placement was being ignored and the original stack-based object was being casted to the new type, thus violating strict aliasing rules. The solution is to reorganize the code so that the object returned by the new placement is used instead of casting the original object. Also, to ensure that the stack-based object is properly aligned with respect to the objects it provides placement for, a set of compiler-dependent macros and types are introduced so that the alignment of objects can be inquired and specified. include/Makefile.am: Add new header. include/my_compiler.h: Add new header. include/my_global.h: Remove now-unnecessary macros. sql/spatial.cc: Make object creation functions return the object whose type was dynamically changed by the new placement. Move static method from the header in order to avoid having to access a forward declaration. sql/spatial.h: Object creation callbacks now take a array of chars as the storage area. Move create_by_typeid to a source file as to not access the forward declaration of Geometry_buffer. Ensure that Geometry_buffer is properly aligned. sql/sql_show.cc: Use newly added aligned storage helper.
Diffstat (limited to 'include/my_global.h')
-rw-r--r--include/my_global.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/my_global.h b/include/my_global.h
index f03ed665d5a..6723267ae50 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -941,9 +941,6 @@ typedef long long my_ptrdiff_t;
#define ADD_TO_PTR(ptr,size,type) (type) ((uchar*) (ptr)+size)
#define PTR_BYTE_DIFF(A,B) (my_ptrdiff_t) ((uchar*) (A) - (uchar*) (B))
-#define MY_DIV_UP(A, B) (((A) + (B) - 1) / (B))
-#define MY_ALIGNED_BYTE_ARRAY(N, S, T) T N[MY_DIV_UP(S, sizeof(T))]
-
/*
Custom version of standard offsetof() macro which can be used to get
offsets of members in class for non-POD types (according to the current