From 6fbc03b3a8f859eb34127d8b4c399a57f7d3d5d9 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Fri, 7 Aug 2020 22:56:58 +0900 Subject: Revert 4c001673b Probably I misunderstand strict aliasing rule of C++. The fix in 4c001673b was other way around. --- include/mruby/array.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/mruby/array.h b/include/mruby/array.h index 92c86a8c5..08cacaa1f 100644 --- a/include/mruby/array.h +++ b/include/mruby/array.h @@ -33,7 +33,7 @@ struct RArray { } aux; mrb_value *ptr; } heap; - void *ary[3]; + mrb_value ary[MRB_ARY_EMBED_LEN_MAX]; } as; }; @@ -46,7 +46,7 @@ struct RArray { #define ARY_UNSET_EMBED_FLAG(a) ((a)->flags &= ~(MRB_ARY_EMBED_MASK)) #define ARY_EMBED_LEN(a) ((mrb_int)(((a)->flags & MRB_ARY_EMBED_MASK) - 1)) #define ARY_SET_EMBED_LEN(a,len) ((a)->flags = ((a)->flags&~MRB_ARY_EMBED_MASK) | ((uint32_t)(len) + 1)) -#define ARY_EMBED_PTR(a) ((mrb_value*)(&(a)->as.ary)) +#define ARY_EMBED_PTR(a) ((a)->as.ary) #define ARY_LEN(a) (ARY_EMBED_P(a)?ARY_EMBED_LEN(a):(a)->as.heap.len) #define ARY_PTR(a) (ARY_EMBED_P(a)?ARY_EMBED_PTR(a):(a)->as.heap.ptr) -- cgit v1.2.3