3 files changed, 6 insertions, 5 deletions
diff --git a/string.c b/string.c
index 97eb9436c3..3af9b08b83 100644
--- a/string.c
+++ b/string.c
@@ -3493,10 +3493,8 @@ rb_str_rindex_m(int argc, VALUE *argv, VALUE str)
 	pos = str_offset(RSTRING_PTR(str), RSTRING_END(str), pos,
 			 enc, single_byte_optimizable(str));
 
-	if (!RREGEXP_PTR(sub) || RREGEXP_SRC_LEN(sub)) {
-	    pos = rb_reg_search(sub, str, pos, 1);
-	    pos = rb_str_sublen(str, pos);
-	}
+	pos = rb_reg_search(sub, str, pos, 1);
+	pos = rb_str_sublen(str, pos);
 	if (pos >= 0) return LONG2NUM(pos);
 	break;
 
diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb
index 4dee245462..5b4e27e0fa 100644
--- a/test/ruby/test_string.rb
+++ b/test/ruby/test_string.rb
@@ -1217,6 +1217,9 @@ CODE
 
     assert_nil("foo".rindex(//, -100))
     assert_nil($~)
+
+    assert_equal(3, "foo".rindex(//))
+    assert_equal([3, 3], $~.offset(0))
   end
 
   def test_rjust
diff --git a/version.h b/version.h
index e4f4125e30..b7063c2a16 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.4.0"
 #define RUBY_RELEASE_DATE "2017-03-12"
-#define RUBY_PATCHLEVEL 29
+#define RUBY_PATCHLEVEL 30
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 3