From 1263f82a592d334e0ed4d03fb5b350b4733ca398 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 9 Dec 2015 08:02:06 +0000 Subject: [PATCH] regparse.h: ANSI alias rule fix * regparse.h (SET_NTYPE): get rid of breaking strict aliasing. patch by Zarko Todorovski in [ruby-core:71953]. [Bug #11790] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52999 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ regparse.h | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f7a6a25cda..d49c30fc0b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Dec 9 17:02:03 2015 Nobuyoshi Nakada + + * regparse.h (SET_NTYPE): get rid of breaking strict aliasing. + patch by Zarko Todorovski in [ruby-core:71953]. [Bug #11790] + Wed Dec 9 16:10:37 2015 Koichi Sasada * vm.c (rb_vm_cref_in_context): Module#define_method in non-class diff --git a/regparse.h b/regparse.h index 35de54671e..caf0790b1c 100644 --- a/regparse.h +++ b/regparse.h @@ -67,7 +67,11 @@ RUBY_SYMBOL_EXPORT_BEGIN BIT_NT_CANY | BIT_NT_BREF)) != 0) #define NTYPE(node) ((node)->u.base.type) -#define SET_NTYPE(node, ntype) (node)->u.base.type = (ntype) +#define SET_NTYPE(node, ntype) \ + do { \ + int value = ntype; \ + memcpy(&((node)->u.base.type), &value, sizeof(int)); \ + } while (0) #define NSTR(node) (&((node)->u.str)) #define NCCLASS(node) (&((node)->u.cclass))