summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortakano32 <takano32@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-12 08:02:17 +0000
committertakano32 <takano32@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-12 08:02:17 +0000
commit8f73480c3d9b1497b6ddebdf92b79b480d365670 (patch)
tree647a574a770a3300ea221bed1a000b3c124e6412
parent5e04bb66973015fa0edfe4881dd46fd7f4f72a7e (diff)
* insns.def: fix condition.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39733 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--insns.def2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index cc45f27456..e9e4e19d2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Mar 12 17:00:45 2013 TAKANO Mitsuhiro <tak@no32.tk>
+
+ * insns.def: fix condition.
+
Tue Mar 12 16:48:19 2013 TAKANO Mitsuhiro <tak@no32.tk>
* rational.c: fix dangling if, else-if and else.
diff --git a/insns.def b/insns.def
index 85c0a38471..979aa1cc6a 100644
--- 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);
}
/**********************************************************/