merge revision(s) 39733: [Backport ruby#8527]

nagachika · nagachika · commit e5989985c769 · 2013-06-15T16:55:49.000Z
* insns.def: fix condition.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41321 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Jun 16 01:32:26 2013  TAKANO Mitsuhiro <tak@no32.tk>
+
+	* insns.def: fix condition.
+
 Sun Jun 16 01:22:35 2013  Eric Hodel  <drbrain@segment7.net>
 
 	* ext/socket/extconf.rb:  Enable RFC 3542 IPV6 socket options for OS X
diff --git a/insns.def b/insns.def
@@ -866,7 +866,7 @@ trace
     }
 
     EXEC_EVENT_HOOK(th, flag, GET_SELF(), 0, 0 /* id and klass are resolved at callee */,
-		    (flag & RUBY_EVENT_RETURN | RUBY_EVENT_B_RETURN) ? TOPN(0) : Qundef);
+		    (flag & (RUBY_EVENT_RETURN | RUBY_EVENT_B_RETURN)) ? TOPN(0) : Qundef);
 }
 
 /**********************************************************/
diff --git a/version.h b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-06-16"
-#define RUBY_PATCHLEVEL 220
+#define RUBY_PATCHLEVEL 221
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 6

-Original file line number
+Diff line change
@@ @@ -1,3 +1,7 @@ @@
 +Sun Jun 16 01:32:26 2013  TAKANO Mitsuhiro <[email protected]>
++
 +	* insns.def: fix condition.
++
 Sun Jun 16 01:22:35 2013  Eric Hodel  <[email protected]>
 	* ext/socket/extconf.rb:  Enable RFC 3542 IPV6 socket options for OS X
Original file line number	Diff line number	Diff line change
`@@ -866,7 +866,7 @@ trace`
`866`	`866`	`}`
`867`	`867`
`868`	`868`	`EXEC_EVENT_HOOK(th, flag, GET_SELF(), 0, 0 /* id and klass are resolved at callee */,`
`869`		`- (flag & RUBY_EVENT_RETURN \| RUBY_EVENT_B_RETURN) ? TOPN(0) : Qundef);`
	`869`	`+ (flag & (RUBY_EVENT_RETURN \| RUBY_EVENT_B_RETURN)) ? TOPN(0) : Qundef);`
`870`	`870`	`}`
`871`	`871`
`872`	`872`	`/**********************************************************/`