Make clear that non-FIXWV WIDEVAL can be a VALUE

Author: nobu

time.c

@@ -220,6 +220,7 @@ divmodv(VALUE n, VALUE d, VALUE *q, VALUE *r)
     typedef int64_t wideint_t;
     typedef uint64_t WIDEVALUE;
     typedef int64_t SIGNED_WIDEVALUE;
+    STATIC_ASSERT(FIXWINT_is_FIXNUM, RUBY_FIXNUM_FLAG == 1);
 #   define WIDEVALUE_IS_WIDER 1
 #   define UWIDEINT_MAX UINT64_MAX
 #   define WIDEINT_MAX INT64_MAX
@@ -282,6 +283,18 @@ divmodv(VALUE n, VALUE d, VALUE *q, VALUE *r)
 #   define WINT2WV(wi) WIDEVAL_WRAP(LONG2NUM(wi))
 #endif
 
+static inline bool
+NONFIXWV_P(wideval_t w)
+{
+    wideint_t wi = WIDEVAL_GET(w);
+    if (FIXWINT_P(wi)) return true;
+#if WIDEVALUE_IS_WIDER
+    RUBY_ASSERT(wi == (VALUE)wi);
+#endif
+    return false;
+}
+#define NONFIXWV_VALUE(wi) (VALUE)WIDEVAL_GET(wi)
+
 static inline VALUE
 w2v(wideval_t w)
 {
@@ -1890,8 +1903,8 @@ static void
 time_mark(void *ptr)
 {
     struct time_object *tobj = ptr;
-    if (!FIXWV_P(tobj->timew)) {
-        rb_gc_mark_movable(WIDEVAL_GET(tobj->timew));
+    if (!NONFIXWV_P(tobj->timew)) {
+        rb_gc_mark_movable(NONFIXWV_VALUE(tobj->timew));
     }
     rb_gc_mark_movable(tobj->vtm.year);
     rb_gc_mark_movable(tobj->vtm.subsecx);
@@ -1903,8 +1916,8 @@ static void
 time_compact(void *ptr)
 {
     struct time_object *tobj = ptr;
-    if (!FIXWV_P(tobj->timew)) {
-        WIDEVAL_GET(tobj->timew) = rb_gc_location(WIDEVAL_GET(tobj->timew));
+    if (!NONFIXWV_P(tobj->timew)) {
+        WIDEVAL_GET(tobj->timew) = rb_gc_location(NONFIXWV_VALUE(tobj->timew));
     }
 
     tobj->vtm.year = rb_gc_location(tobj->vtm.year);