summaryrefslogtreecommitdiff
path: root/insns.def
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-15 16:55:49 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-15 16:55:49 +0000
commite5989985c7698b606625eddfd5e437ddd6efa77b (patch)
treed274b3f028a988d1bbcfb970155a27efffc492e8 /insns.def
parent9fb5a1cdbf799fd6ab36eb4782b1a1e0dd3783f4 (diff)
merge revision(s) 39733: [Backport #8527]
* 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
Diffstat (limited to 'insns.def')
-rw-r--r--insns.def2
1 files changed, 1 insertions, 1 deletions
diff --git a/insns.def b/insns.def
index 3d518d0489..479d0daefe 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);
}
/**********************************************************/