1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

date_core.c: more write-barriers

Browse Source 
* ext/date/date_core.c (SimpleDateData, ComplexDateData): constify
  VALUE members to find out missing write-barriers.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47734 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-09-29 01:45:11 +00:00
parent 036acdab02
commit cedc0d1f6e
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
ext/date/date_core.c
View File

@ -235,7 +235,7 @@ f_negative_p(VALUE x)
struct SimpleDateData struct SimpleDateData
{ {
unsigned flags; unsigned flags;
VALUE nth; /* not always canonicalized */ const VALUE nth; /* not always canonicalized */
int jd; /* as utc */ int jd; /* as utc */
/* df is zero */ /* df is zero */
/* sf is zero */ /* sf is zero */
@ -258,10 +258,10 @@ struct SimpleDateData
struct ComplexDateData struct ComplexDateData
{ {
unsigned flags; unsigned flags;
VALUE nth; /* not always canonicalized */ const VALUE nth; /* not always canonicalized */
int jd; /* as utc */ int jd; /* as utc */
int df; /* as utc, in secs */ int df; /* as utc, in secs */
VALUE sf; /* in nano secs */ const VALUE sf; /* in nano secs */
int of; /* in secs */ int of; /* in secs */
date_sg_t sg; /* 2298874..2426355 or -/+oo -- at most 22 bits */ date_sg_t sg; /* 2298874..2426355 or -/+oo -- at most 22 bits */
/* decoded as local */ /* decoded as local */
@ -392,7 +392,7 @@ _year, _mon, _mday, _hour, _min, _sec, _flags) \
RB_OBJ_WRITE((obj), &(x)->nth, (y)->nth);\ RB_OBJ_WRITE((obj), &(x)->nth, (y)->nth);\
(x)->jd = (y)->jd;\ (x)->jd = (y)->jd;\
(x)->df = 0;\ (x)->df = 0;\
(x)->sf = INT2FIX(0);\ RB_OBJ_WRITE((obj), &(x)->sf, INT2FIX(0));\
(x)->of = 0;\ (x)->of = 0;\
(x)->sg = (date_sg_t)((y)->sg);\ (x)->sg = (date_sg_t)((y)->sg);\
(x)->year = (y)->year;\ (x)->year = (y)->year;\
@ -1120,11 +1120,13 @@ m_virtual_sg(union DateData *x)
} }
inline static void inline static void
canonicalize_s_jd(union DateData *x) canonicalize_s_jd(VALUE obj, union DateData *x)
{ {
int j = x->s.jd; int j = x->s.jd;
VALUE nth = x->s.nth;
assert(have_jd_p(x)); assert(have_jd_p(x));
canonicalize_jd(x->s.nth, x->s.jd); canonicalize_jd(nth, x->s.jd);
RB_OBJ_WRITE(obj, &x->s.nth, nth);
if (x->s.jd != j) if (x->s.jd != j)
x->flags &= ~HAVE_CIVIL; x->flags &= ~HAVE_CIVIL;
} }
@ -1214,11 +1216,13 @@ get_c_time(union DateData *x)
} }
inline static void inline static void
canonicalize_c_jd(union DateData *x) canonicalize_c_jd(VALUE obj, union DateData *x)
{ {
int j = x->c.jd; int j = x->c.jd;
VALUE nth = x->c.nth;
assert(have_jd_p(x)); assert(have_jd_p(x));
canonicalize_jd(x->c.nth, x->c.jd); canonicalize_jd(nth, x->c.jd);
RB_OBJ_WRITE(obj, &x->c.nth, nth);
if (x->c.jd != j) if (x->c.jd != j)
x->flags &= ~HAVE_CIVIL; x->flags &= ~HAVE_CIVIL;
} }
@ -1397,15 +1401,15 @@ guess_style(VALUE y, double sg) /* -/+oo or zero */
} }
inline static void inline static void
m_canonicalize_jd(union DateData *x) m_canonicalize_jd(VALUE obj, union DateData *x)
{ {
if (simple_dat_p(x)) { if (simple_dat_p(x)) {
get_s_jd(x); get_s_jd(x);
canonicalize_s_jd(x); canonicalize_s_jd(obj, x);
} }
else { else {
get_c_jd(x); get_c_jd(x);
canonicalize_c_jd(x); canonicalize_c_jd(obj, x);
} }
} }
@ -6209,8 +6213,8 @@ cmp_dd(VALUE self, VALUE other)
int a_jd, b_jd, int a_jd, b_jd,
a_df, b_df; a_df, b_df;
m_canonicalize_jd(adat); m_canonicalize_jd(self, adat);
m_canonicalize_jd(bdat); m_canonicalize_jd(other, bdat);
a_nth = m_nth(adat); a_nth = m_nth(adat);
b_nth = m_nth(bdat); b_nth = m_nth(bdat);
if (f_eqeq_p(a_nth, b_nth)) { if (f_eqeq_p(a_nth, b_nth)) {
@ -6288,8 +6292,8 @@ d_lite_cmp(VALUE self, VALUE other)
VALUE a_nth, b_nth; VALUE a_nth, b_nth;
int a_jd, b_jd; int a_jd, b_jd;
m_canonicalize_jd(adat); m_canonicalize_jd(self, adat);
m_canonicalize_jd(bdat); m_canonicalize_jd(other, bdat);
a_nth = m_nth(adat); a_nth = m_nth(adat);
b_nth = m_nth(bdat); b_nth = m_nth(bdat);
if (f_eqeq_p(a_nth, b_nth)) { if (f_eqeq_p(a_nth, b_nth)) {
@ -6360,8 +6364,8 @@ d_lite_equal(VALUE self, VALUE other)
VALUE a_nth, b_nth; VALUE a_nth, b_nth;
int a_jd, b_jd; int a_jd, b_jd;
m_canonicalize_jd(adat); m_canonicalize_jd(self, adat);
m_canonicalize_jd(bdat); m_canonicalize_jd(other, bdat);
a_nth = m_nth(adat); a_nth = m_nth(adat);
b_nth = m_nth(bdat); b_nth = m_nth(bdat);
a_jd = m_local_jd(adat); a_jd = m_local_jd(adat);
@ -8553,7 +8557,7 @@ date_to_datetime(VALUE self)
get_d1b(new); get_d1b(new);
bdat->c = adat->c; bdat->c = adat->c;
bdat->c.df = 0; bdat->c.df = 0;
bdat->c.sf = INT2FIX(0); RB_OBJ_WRITE(new, &bdat->c.sf, INT2FIX(0));
#ifndef USE_PACK #ifndef USE_PACK
bdat->c.hour = 0; bdat->c.hour = 0;
bdat->c.min = 0; bdat->c.min = 0;