From e18259424ea6f1baafacab442d57c05d51c2548b Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 4 Apr 2014 08:34:12 +0000 Subject: eval_intern.h: VAR_INITIALIZED * eval_intern.h (VAR_INITIALIZED): macro to suppress maybe-uninitialized warnings by gcc 4.7 and 4.8. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45516 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- eval_intern.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'eval_intern.h') diff --git a/eval_intern.h b/eval_intern.h index f81f922269..f19c252918 100644 --- a/eval_intern.h +++ b/eval_intern.h @@ -128,6 +128,14 @@ extern int select_large_fdset(int, fd_set *, fd_set *, fd_set *, struct timeval #define PUSH_TAG() TH_PUSH_TAG(GET_THREAD()) #define POP_TAG() TH_POP_TAG() +#if defined __GNUC__ && __GNUC__ == 4 && (__GNUC_MINOR__ == 7 || __GNUC_MINOR__ == 8) +# define VAR_FROM_MEMORY(var) __extension__(*(__typeof__(var) volatile *)&(var)) +# define VAR_INITIALIZED(var) ((var) = VAR_FROM_MEMORY(var)) +#else +# define VAR_FROM_MEMORY(var) (var) +# define VAR_INITIALIZED(var) ((void)&(var)) +#endif + /* clear th->state, and return the value */ static inline int rb_threadptr_tag_state(rb_thread_t *th) @@ -150,7 +158,7 @@ rb_threadptr_tag_jump(rb_thread_t *th, int st) [ISO/IEC 9899:1999] 7.13.1.1 */ #define TH_EXEC_TAG() \ - (ruby_setjmp(_tag.buf) ? rb_threadptr_tag_state(_th) : (TH_REPUSH_TAG(), 0)) + (ruby_setjmp(_tag.buf) ? rb_threadptr_tag_state(VAR_FROM_MEMORY(_th)) : (TH_REPUSH_TAG(), 0)) #define EXEC_TAG() \ TH_EXEC_TAG() -- cgit v1.2.3