diff options
| author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-04 15:04:10 +0000 |
|---|---|---|
| committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-04 15:04:10 +0000 |
| commit | 42bd731dc53406d04e4397ec673b3acbb3a79bfc (patch) | |
| tree | 32105a4f1740fa4372256429c719a7be1bf7d567 /include/ruby | |
| parent | 7a3f2845df7fe3fd9a2b0649e555dba7301fa164 (diff) | |
* include/ruby/ruby.h: rename FL_OLDGEN to FL_PROMOTED.
This flag represents that "this object is promoted at least once."
* gc.c, debug.c, object.c: catch up this change.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43527 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include/ruby')
| -rw-r--r-- | include/ruby/ruby.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 5c75ff456e..06e89a93fe 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -1124,7 +1124,7 @@ struct RBignum { #define FL_SINGLETON FL_USER0 #define FL_WB_PROTECTED (((VALUE)1)<<5) -#define FL_OLDGEN (((VALUE)1)<<6) +#define FL_PROMOTED (((VALUE)1)<<6) #define FL_FINALIZE (((VALUE)1)<<7) #define FL_TAINT (((VALUE)1)<<8) #define FL_UNTRUSTED FL_TAINT @@ -1178,7 +1178,7 @@ struct RBignum { #define OBJ_FREEZE(x) FL_SET((x), FL_FREEZE) #if USE_RGENGC -#define OBJ_PROMOTED(x) (SPECIAL_CONST_P(x) ? 0 : FL_TEST_RAW((x), FL_OLDGEN)) +#define OBJ_PROMOTED(x) (SPECIAL_CONST_P(x) ? 0 : FL_TEST_RAW((x), FL_PROMOTED)) #define OBJ_WB_PROTECTED(x) (SPECIAL_CONST_P(x) ? 1 : FL_TEST_RAW((x), FL_WB_PROTECTED)) #define OBJ_WB_UNPROTECT(x) rb_obj_wb_unprotect(x, __FILE__, __LINE__) @@ -1215,7 +1215,7 @@ rb_obj_wb_unprotect(VALUE x, RB_UNUSED_VAR(const char *filename), RB_UNUSED_VAR( if (FL_TEST_RAW((x), FL_WB_PROTECTED)) { RBASIC(x)->flags &= ~FL_WB_PROTECTED; - if (FL_TEST_RAW((x), FL_OLDGEN)) { + if (FL_TEST_RAW((x), FL_PROMOTED)) { rb_gc_writebarrier_unprotect_promoted(x); } } @@ -1232,8 +1232,8 @@ rb_obj_written(VALUE a, RB_UNUSED_VAR(VALUE oldv), VALUE b, RB_UNUSED_VAR(const #if USE_RGENGC /* `a' should be an RVALUE object */ - if (FL_TEST_RAW((a), FL_OLDGEN) && - !SPECIAL_CONST_P(b) && !FL_TEST_RAW((b), FL_OLDGEN)) { + if (FL_TEST_RAW((a), FL_PROMOTED) && + !SPECIAL_CONST_P(b) && !FL_TEST_RAW((b), FL_PROMOTED)) { rb_gc_writebarrier(a, b); } #endif |