Commit 1f6b02e9 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

MDEV-19709 Workaround "internal compiler bug" on GCC v 4.9

GCC crashes during compilation, on a code fragment that was added  to
workaround code generation bug on GCC.

To fix, I randomly moved pragmas around, which seems to make GCC happy.
parent 0af18408
...@@ -27,6 +27,10 @@ ...@@ -27,6 +27,10 @@
#include <my_bitmap.h> #include <my_bitmap.h>
#include <my_bit.h> #include <my_bit.h>
template <uint width> class Bitmap
{
/* /*
Workaround GCC optimizer bug (generating SSE instuctions on unaligned data) Workaround GCC optimizer bug (generating SSE instuctions on unaligned data)
*/ */
...@@ -39,8 +43,6 @@ ...@@ -39,8 +43,6 @@
#pragma GCC target ("no-sse") #pragma GCC target ("no-sse")
#endif #endif
template <uint width> class Bitmap
{
uint32 buffer[(width + 31) / 32]; uint32 buffer[(width + 31) / 32];
public: public:
Bitmap() Bitmap()
...@@ -276,13 +278,15 @@ template <uint width> class Bitmap ...@@ -276,13 +278,15 @@ template <uint width> class Bitmap
} }
enum { BITMAP_END = width }; enum { BITMAP_END = width };
}; };
};
#ifdef NEED_GCC_NO_SSE_WORKAROUND #ifdef NEED_GCC_NO_SSE_WORKAROUND
#pragma GCC pop_options #pragma GCC pop_options
#undef NEED_GCC_NO_SSE_WORKAROUND #undef NEED_GCC_NO_SSE_WORKAROUND
#endif #endif
};
/* An iterator to quickly walk over bits in ulonglong bitmap. */ /* An iterator to quickly walk over bits in ulonglong bitmap. */
class Table_map_iterator class Table_map_iterator
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment