From 9ab19d792e8fa412900ad671256ba5ee49730f21 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 16 Jan 2019 12:04:57 +0000
Subject: merge revision(s) 64476: [Backport #15084]

	thread_sync.c (rb_mutex_sleep): disable interrupt checking in ensure

	This is needed to reliably fix ConditionVariable#wait on Thread#kill
	[Bug #14999] because there is still a chance an interrupt could fire
	and prevent lock acquisition after an ensure statement.

	Arguably, rb_mutex_lock itself should be uninterruptible, but that
	already prevents bootstraptest/test_thread.rb from completing and
	probably breaks existing use cases.

	For reference, POSIX expressly forbids EINTR from pthread_mutex_lock.

	[ruby-core:88556] [Bug #14999]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@66837 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 thread_sync.c | 47 +++++++++++++++++++++++++++++++----------------
 version.h     |  6 +++---
 2 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/thread_sync.c b/thread_sync.c
index bd51328e52..c7055578e6 100644
--- a/thread_sync.c
+++ b/thread_sync.c
@@ -221,15 +221,8 @@ rb_mutex_trylock(VALUE self)
  */
 static const rb_thread_t *patrol_thread = NULL;
 
-/*
- * call-seq:
- *    mutex.lock  -> self
- *
- * Attempts to grab the lock and waits if it isn't available.
- * Raises +ThreadError+ if +mutex+ was locked by the current thread.
- */
-VALUE
-rb_mutex_lock(VALUE self)
+static VALUE
+do_mutex_lock(VALUE self, int interruptible_p)
 {
     rb_thread_t *th = GET_THREAD();
     rb_mutex_t *mutex;
@@ -290,16 +283,37 @@ rb_mutex_lock(VALUE self)
 	    th->vm->sleeper--;
 	    if (mutex->th == th) mutex_locked(th, self);
 
-	    RUBY_VM_CHECK_INTS_BLOCKING(th->ec); /* may release mutex */
-	    if (!mutex->th) {
-		mutex->th = th;
-	        mutex_locked(th, self);
-	    }
+            if (interruptible_p) {
+                RUBY_VM_CHECK_INTS_BLOCKING(th->ec); /* may release mutex */
+                if (!mutex->th) {
+                    mutex->th = th;
+                    mutex_locked(th, self);
+                }
+            }
 	}
     }
     return self;
 }
 
+static VALUE
+mutex_lock_uninterruptible(VALUE self)
+{
+    return do_mutex_lock(self, 0);
+}
+
+/*
+ * call-seq:
+ *    mutex.lock  -> self
+ *
+ * Attempts to grab the lock and waits if it isn't available.
+ * Raises +ThreadError+ if +mutex+ was locked by the current thread.
+ */
+VALUE
+rb_mutex_lock(VALUE self)
+{
+    return do_mutex_lock(self, 1);
+}
+
 /*
  * call-seq:
  *    mutex.owned?  -> true or false
@@ -462,11 +476,12 @@ rb_mutex_sleep(VALUE self, VALUE timeout)
     rb_mutex_unlock(self);
     beg = time(0);
     if (NIL_P(timeout)) {
-	rb_ensure(rb_mutex_sleep_forever, Qnil, rb_mutex_lock, self);
+	rb_ensure(rb_mutex_sleep_forever, Qnil, mutex_lock_uninterruptible, self);
     }
     else {
-	rb_ensure(rb_mutex_wait_for, (VALUE)&t, rb_mutex_lock, self);
+	rb_ensure(rb_mutex_wait_for, (VALUE)&t, mutex_lock_uninterruptible, self);
     }
+    RUBY_VM_CHECK_INTS_BLOCKING(GET_EC());
     end = time(0) - beg;
     return INT2FIX(end);
 }
diff --git a/version.h b/version.h
index b6b67e1432..99742eddca 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.5.4"
-#define RUBY_RELEASE_DATE "2019-01-14"
-#define RUBY_PATCHLEVEL 129
+#define RUBY_RELEASE_DATE "2019-01-16"
+#define RUBY_PATCHLEVEL 130
 
 #define RUBY_RELEASE_YEAR 2019
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 14
+#define RUBY_RELEASE_DAY 16
 
 #include "ruby/version.h"
 
-- 
cgit v1.2.3