diff options
| author | Jeff Muizelaar <jmuizelaar@mozilla.com> | 2009-02-19 16:00:17 -0500 |
|---|---|---|
| committer | Jeff Muizelaar <jmuizelaar@mozilla.com> | 2009-02-19 16:00:17 -0500 |
| commit | fe7d5323f5bc734e76179b74d68fcba9b924ba94 (patch) | |
| tree | 35387121b59a4d55bfc6dddbe0d628f05780df39 /src/cairo-compiler-private.h | |
| parent | 78de0e045ec0c10708052ed48df228e786839ddb (diff) | |
| download | cairo-fe7d5323f5bc734e76179b74d68fcba9b924ba94.tar.gz | |
Relanding: Add CAIRO_ENSURE_UNIQUE macro and use it in _cairo_error()
When using MSVC, _cairo_error() can be folded into other identical functions.
If that happens, _cairo_error isn't really useful anymore. Using the
CAIRO_ENSURE_UNIQUE macro makes sure this doesn't happen.
Use __asm to serve as a line delimiter. This allows us to use the
__asm{} block in a macro.
Diffstat (limited to 'src/cairo-compiler-private.h')
| -rw-r--r-- | src/cairo-compiler-private.h | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/src/cairo-compiler-private.h b/src/cairo-compiler-private.h index bd7cccd9b..f796e1380 100644 --- a/src/cairo-compiler-private.h +++ b/src/cairo-compiler-private.h @@ -172,6 +172,30 @@ #define inline __inline #endif +#ifdef _MSC_VER +/* When compiling with /Gy and /OPT:ICF identical functions will be folded in together. + The CAIRO_ENSURE_UNIQUE macro ensures that a function is always unique and + will never be folded into another one. Something like this might eventually + be needed for GCC but it seems fine for now. */ +#define CAIRO_ENSURE_UNIQUE \ + do { \ + char func[] = __FUNCTION__; \ + char file[] = __FILE__; \ + __asm { \ + __asm jmp __internal_skip_line_no \ + __asm _emit (__LINE__ & 0xff) \ + __asm _emit ((__LINE__>>8) & 0xff) \ + __asm _emit ((__LINE__>>16) & 0xff) \ + __asm _emit ((__LINE__>>24) & 0xff) \ + __asm lea eax, func \ + __asm lea eax, file \ + __asm __internal_skip_line_no: \ + }; \ + } while (0) +#else +#define CAIRO_ENSURE_UNIQUE do { } while (0) +#endif + #ifdef __STRICT_ANSI__ #undef inline #define inline __inline__ |