merge revision(s) 2a6bfd22468343003463e0cbf91953a01b0dbba5,3ac28de5414c81a0da8c8ec969ea74db5a0f1b0f: [Backport #17645]

	Properly convert time_t [Bug #17645]

	---
	 thread_sync.c | 2 +-
	 1 file changed, 1 insertion(+), 1 deletion(-)

	Explicitly cast __s64 to time_t [Bug #17645]

	A workaround of shorten-64-to-32 error where 32-bit linux.
	---
	 file.c | 2 +-
	 1 file changed, 1 insertion(+), 1 deletion(-)

3 files changed, 4 insertions, 4 deletions

diff --git a/file.c b/file.c
index 0c599b0895..e77042fe20 100644
--- a/file.c
+++ b/file.c
@@ -1253,7 +1253,7 @@ statx_birthtime(const struct statx *stx, VALUE fname)
         /* birthtime is not supported on the filesystem */
         statx_notimplement("birthtime");
     }
-    return rb_time_nano_new(stx->stx_btime.tv_sec, stx->stx_btime.tv_nsec);
+    return rb_time_nano_new((time_t)stx->stx_btime.tv_sec, stx->stx_btime.tv_nsec);
 }
 
 typedef struct statx statx_data;
diff --git a/thread_sync.c b/thread_sync.c
index 8c999e2164..11d77e8e91 100644
--- a/thread_sync.c
+++ b/thread_sync.c
@@ -560,7 +560,7 @@ rb_mutex_sleep(VALUE self, VALUE timeout)
 
     RUBY_VM_CHECK_INTS_BLOCKING(GET_EC());
     time_t end = time(0) - beg;
-    return INT2FIX(end);
+    return TIMET2NUM(end);
 }
 
 /*
diff --git a/version.h b/version.h
index 47232597a9..4f5e7419e5 100644
--- a/version.h
+++ b/version.h
@@ -12,11 +12,11 @@
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 56
+#define RUBY_PATCHLEVEL 57
 
 #define RUBY_RELEASE_YEAR 2021
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 13
+#define RUBY_RELEASE_DAY 14
 
 #include "ruby/version.h"