From 218ac97bd87c490e46a0dffb6d9dcfdb1374ffca Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 6 Nov 2018 15:31:15 +0000
Subject: [PATCH] merge revision(s) 65460: [Backport #15271]

	parse.y: last location from bison

	* parse.y (command): set the last location from the location
	  managed by bison, so that other nodes are not needed.
	  [ruby-core:89648] [Bug #15271]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@65581 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 parse.y                  | 4 ++--
 test/ruby/test_syntax.rb | 5 +++++
 version.h                | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/parse.y b/parse.y
index b917a3d2f465b3..1348842b911715 100644
--- a/parse.y
+++ b/parse.y
@@ -1673,7 +1673,7 @@ command		: fcall command_args       %prec tLOWEST
 		    /*%%%*/
 			$$ = $1;
 			$$->nd_args = $2;
-			nd_set_last_loc($1, nd_last_loc($2));
+			nd_set_last_loc($1, @2.last_loc);
 		    /*%
 			$$ = dispatch2(command, $1, $2);
 		    %*/
@@ -1686,7 +1686,7 @@ command		: fcall command_args       %prec tLOWEST
 			fixpos($$, $1);
 		    /*%%%*/
 			$$->nd_loc = @$;
-			nd_set_last_loc($1, nd_last_loc($2));
+			nd_set_last_loc($1, @2.last_loc);
 		    /*%
 		    %*/
 		    }
diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb
index 6d8d8f5f320cba..7e25d965dfe32f 100644
--- a/test/ruby/test_syntax.rb
+++ b/test/ruby/test_syntax.rb
@@ -179,6 +179,11 @@ def test_keyword_empty_splat
       bug13756 = '[ruby-core:82113] [Bug #13756]'
       assert_valid_syntax("defined? foo(**{})", bug13756)
     end;
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      bug15271 = '[ruby-core:89648] [Bug #15271]'
+      assert_valid_syntax("a **{}", bug15271)
+    end;
   end
 
   def test_keyword_self_reference
diff --git a/version.h b/version.h
index d89fc2804a7007..8e0f2a198e8e7a 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.5.4"
 #define RUBY_RELEASE_DATE "2018-11-07"
-#define RUBY_PATCHLEVEL 109
+#define RUBY_PATCHLEVEL 110
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 11