archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-16 17:14:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge revision(s) 58503: [Backport #13523]

Browse source 
node.h: sign-extend

	* node.h (nd_line): should sign-extend.  shifting `VALUE` extends
	  with zero bits if `sizeof(VALUE)` equals to `sizeof(int)`.  the
	  zero bits are truncated if `sizeof(VALUE)` is bigger enough.
	  [ruby-core:80920] [Bug #13523]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@59488 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2017-08-03 13:29:12 +00:00
parent fd2fca8395
commit 16acdaefd3
3 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
node.h
View file

@ -277,7 +277,7 @@ typedef struct RNode {
#define NODE_LSHIFT (NODE_TYPESHIFT+7)
#define NODE_LMASK (((SIGNED_VALUE)1<<(sizeof(VALUE)*CHAR_BIT-NODE_LSHIFT))-1)
#define nd_line(n) (int)(RNODE(n)->flags>>NODE_LSHIFT)
#define nd_line(n) (int)(((SIGNED_VALUE)RNODE(n)->flags)>>NODE_LSHIFT)
#define nd_set_line(n,l) \
RNODE(n)->flags=((RNODE(n)->flags&~((VALUE)(-1)<<NODE_LSHIFT))|((VALUE)((l)&NODE_LMASK)<<NODE_LSHIFT))

10
test/ruby/test_parse.rb
View file

@ -960,6 +960,16 @@ x = __ENCODING__
assert_syntax_error(" 0b\n", /\^/)
end
def test_negative_line_number
bug = '[ruby-core:80920] [Bug #13523]'
obj = Object.new
obj.instance_eval("def t(e = false);raise if e; __LINE__;end", "test", -100)
assert_equal(-100, obj.t, bug)
assert_equal(-100, obj.method(:t).source_location[1], bug)
e = assert_raise(RuntimeError) {obj.t(true)}
assert_equal(-100, e.backtrace_locations.first.lineno, bug)
end
=begin
def test_past_scope_variable
assert_warning(/past scope/) {catch {|tag| eval("BEGIN{throw tag}; tap {a = 1}; a")}}

8
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.4.2"
#define RUBY_RELEASE_DATE "2017-07-23"
#define RUBY_PATCHLEVEL 161
#define RUBY_RELEASE_DATE "2017-08-03"
#define RUBY_PATCHLEVEL 162
#define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 7
#define RUBY_RELEASE_DAY 23
#define RUBY_RELEASE_MONTH 8
#define RUBY_RELEASE_DAY 3
#include "ruby/version.h"