diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | gc.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Fri Dec 13 16:27:17 2013 Aman Gupta <ruby@tmm1.net> + + * gc.c (gc_info_decode): Use :major_by=>:nofree as fallback reason + when other trigger conditions are present. + Fri Dec 13 13:25:30 2013 Koichi Sasada <ko1@atdot.net> * error.c: add Exception#backtrace_locations. @@ -5213,7 +5213,6 @@ gc_info_decode(int flags, VALUE hash_or_key) rb_hash_aset(hash, sym_##name, (attr)); major_by = - (flags & GPR_FLAG_MAJOR_BY_NOFREE) ? sym_nofree : (flags & GPR_FLAG_MAJOR_BY_OLDGEN) ? sym_oldgen : (flags & GPR_FLAG_MAJOR_BY_SHADY) ? sym_shady : (flags & GPR_FLAG_MAJOR_BY_RESCAN) ? sym_rescan : @@ -5221,6 +5220,7 @@ gc_info_decode(int flags, VALUE hash_or_key) #if RGENGC_ESTIMATE_OLDMALLOC (flags & GPR_FLAG_MAJOR_BY_OLDMALLOC) ? sym_oldmalloc : #endif + (flags & GPR_FLAG_MAJOR_BY_NOFREE) ? sym_nofree : Qnil; SET(major_by, major_by); |