From: Raymond Hettinger <python@rcn.com>
Date: Sun, 11 Apr 2004 14:59:33 +0000 (+0000)
Subject: Some (but not all) of the why code bitfield tests ran faster as
X-Git-Tag: v2.4a1~506
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c8aa08b1725420c00b8960f1915d5a3a7c32b8c5;p=python

Some (but not all) of the why code bitfield tests ran faster as
separate equality tests.  Now, all are set to their best timing.
---

diff --git a/Python/ceval.c b/Python/ceval.c
index 82a95a937d..c103f14339 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -1650,7 +1650,8 @@ eval_frame(PyFrameObject *f)
 			if (PyInt_Check(v)) {
 				why = (enum why_code) PyInt_AS_LONG(v);
 				assert(why != WHY_YIELD);
-				if (why & (WHY_RETURN | WHY_CONTINUE))
+				if (why == WHY_RETURN ||
+				    why == WHY_CONTINUE)
 					retval = POP();
 			}
 			else if (PyClass_Check(v) || PyString_Check(v)) {
@@ -2289,7 +2290,7 @@ eval_frame(PyFrameObject *f)
 
 		/* Double-check exception status */
 
-		if (why & (WHY_EXCEPTION | WHY_RERAISE)) {
+		if (why == WHY_EXCEPTION || why == WHY_RERAISE) {
 			if (!PyErr_Occurred()) {
 				PyErr_SetString(PyExc_SystemError,
 					"error return without exception set");
@@ -2411,7 +2412,7 @@ fast_block_end:
 fast_yield:
 	if (tstate->use_tracing) {
 		if (tstate->c_tracefunc
-		    && (why & (WHY_RETURN | WHY_YIELD))) {
+		    && (why == WHY_RETURN || why == WHY_YIELD)) {
 			if (call_trace(tstate->c_tracefunc,
 				       tstate->c_traceobj, f,
 				       PyTrace_RETURN, retval)) {