Change the control flow for error handling in the function prelude to

gvanrossum · gvanrossum · commit 8c5df06ec7f1 · 1997-01-24T04:19:24.000Z
jump to the "Kill locals" section at the end.  Add #ifdef macintosh
bandaid to make sure we call sigcheck() on the Mac.
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -409,6 +409,10 @@ eval_code2(co, globals, locals,
 			kwdict = newmappingobject();
 			if (kwdict == NULL)
 				goto fail;
+			i = co->co_argcount;
+			if (co->co_flags & CO_VARARGS)
+				i++;
+			SETLOCAL(i, kwdict);
 		}
 		if (argcount > co->co_argcount) {
 			if (!(co->co_flags & CO_VARARGS)) {
@@ -424,12 +428,14 @@ eval_code2(co, globals, locals,
 		}
 		if (co->co_flags & CO_VARARGS) {
 			u = newtupleobject(argcount - n);
+			if (u == NULL)
+				goto fail;
+			SETLOCAL(co->co_argcount, u);
 			for (i = n; i < argcount; i++) {
 				x = args[i];
 				INCREF(x);
 				SETTUPLEITEM(u, i-n, x);
 			}
-			SETLOCAL(co->co_argcount, u);
 		}
 		for (i = 0; i < kwcount; i++) {
 			object *keyword = kws[2*i];
@@ -479,25 +485,11 @@ eval_code2(co, globals, locals,
 				}
 			}
 		}
-		if (kwdict != NULL) {
-			i = co->co_argcount;
-			if (co->co_flags & CO_VARARGS)
-				i++;
-			SETLOCAL(i, kwdict);
-		}
-		if (0) {
-	 fail:
-			XDECREF(kwdict);
-			goto fail2;
-		}
 	}
 	else {
 		if (argcount > 0 || kwcount > 0) {
 			err_setstr(TypeError, "no arguments expected");
- fail2:
-			current_frame = f->f_back;
-			DECREF(f);
-			return NULL;
+			goto fail;
 		}
 	}
 
@@ -517,9 +509,7 @@ eval_code2(co, globals, locals,
 		if (call_trace(&sys_trace, &f->f_trace, f, "call",
 			       None/*XXX how to compute arguments now?*/)) {
 			/* Trace function raised an error */
-			current_frame = f->f_back;
-			DECREF(f);
-			return NULL;
+			goto fail;
 		}
 	}
 
@@ -528,9 +518,7 @@ eval_code2(co, globals, locals,
 		   itself and isn't called for "line" events */
 		if (call_trace(&sys_profile, (object**)0, f, "call",
 			       None/*XXX*/)) {
-			current_frame = f->f_back;
-			DECREF(f);
-			return NULL;
+			goto fail;
 		}
 	}
 
@@ -567,6 +555,9 @@ eval_code2(co, globals, locals,
 					goto on_error;
 				}
 			}
+#ifdef macintosh
+#undef HAVE_SIGNAL_H
+#endif
 #ifndef HAVE_SIGNAL_H /* Is this the right #define? */
 /* If we have true signals, the signal handler will call
    Py_AddPendingCall() so we don't have to call sigcheck().
@@ -1697,6 +1688,10 @@ eval_code2(co, globals, locals,
 		}
 	}
 
+	--recursion_depth;
+
+  fail: /* Jump here from prelude on failure */
+
 	/* Kill all local variables */
 
 	{
@@ -1713,7 +1708,6 @@ eval_code2(co, globals, locals,
 
 	current_frame = f->f_back;
 	DECREF(f);
-	--recursion_depth;
 	
 	return retval;
 }

Original file line number	Diff line number	Diff line change
`@@ -409,6 +409,10 @@ eval_code2(co, globals, locals,`
`409`	`409`	`kwdict = newmappingobject();`
`410`	`410`	`if (kwdict == NULL)`
`411`	`411`	`goto fail;`
	`412`	`+ i = co->co_argcount;`
	`413`	`+ if (co->co_flags & CO_VARARGS)`
	`414`	`+ i++;`
	`415`	`+ SETLOCAL(i, kwdict);`
`412`	`416`	`}`
`413`	`417`	`if (argcount > co->co_argcount) {`
`414`	`418`	`if (!(co->co_flags & CO_VARARGS)) {`
`@@ -424,12 +428,14 @@ eval_code2(co, globals, locals,`
`424`	`428`	`}`
`425`	`429`	`if (co->co_flags & CO_VARARGS) {`
`426`	`430`	`u = newtupleobject(argcount - n);`
	`431`	`+ if (u == NULL)`
	`432`	`+ goto fail;`
	`433`	`+ SETLOCAL(co->co_argcount, u);`
`427`	`434`	`for (i = n; i < argcount; i++) {`
`428`	`435`	`x = args[i];`
`429`	`436`	`INCREF(x);`
`430`	`437`	`SETTUPLEITEM(u, i-n, x);`
`431`	`438`	`}`
`432`		`- SETLOCAL(co->co_argcount, u);`
`433`	`439`	`}`
`434`	`440`	`for (i = 0; i < kwcount; i++) {`
`435`	`441`	`object keyword = kws[2i];`
`@@ -479,25 +485,11 @@ eval_code2(co, globals, locals,`
`479`	`485`	`}`
`480`	`486`	`}`
`481`	`487`	`}`
`482`		`- if (kwdict != NULL) {`
`483`		`- i = co->co_argcount;`
`484`		`- if (co->co_flags & CO_VARARGS)`
`485`		`- i++;`
`486`		`- SETLOCAL(i, kwdict);`
`487`		`- }`
`488`		`- if (0) {`
`489`		`- fail:`
`490`		`- XDECREF(kwdict);`
`491`		`- goto fail2;`
`492`		`- }`
`493`	`488`	`}`
`494`	`489`	`else {`
`495`	`490`	`if (argcount > 0 \|\| kwcount > 0) {`
`496`	`491`	`err_setstr(TypeError, "no arguments expected");`
`497`		`- fail2:`
`498`		`- current_frame = f->f_back;`
`499`		`- DECREF(f);`
`500`		`- return NULL;`
	`492`	`+ goto fail;`
`501`	`493`	`}`
`502`	`494`	`}`
`503`	`495`
`@@ -517,9 +509,7 @@ eval_code2(co, globals, locals,`
`517`	`509`	`if (call_trace(&sys_trace, &f->f_trace, f, "call",`
`518`	`510`	`None/XXX how to compute arguments now?/)) {`
`519`	`511`	`/* Trace function raised an error */`
`520`		`- current_frame = f->f_back;`
`521`		`- DECREF(f);`
`522`		`- return NULL;`
	`512`	`+ goto fail;`
`523`	`513`	`}`
`524`	`514`	`}`
`525`	`515`
`@@ -528,9 +518,7 @@ eval_code2(co, globals, locals,`
`528`	`518`	`itself and isn't called for "line" events */`
`529`	`519`	`if (call_trace(&sys_profile, (object**)0, f, "call",`
`530`	`520`	`None/XXX/)) {`
`531`		`- current_frame = f->f_back;`
`532`		`- DECREF(f);`
`533`		`- return NULL;`
	`521`	`+ goto fail;`
`534`	`522`	`}`
`535`	`523`	`}`
`536`	`524`
`@@ -567,6 +555,9 @@ eval_code2(co, globals, locals,`
`567`	`555`	`goto on_error;`
`568`	`556`	`}`
`569`	`557`	`}`
	`558`	`+#ifdef macintosh`
	`559`	`+#undef HAVE_SIGNAL_H`
	`560`	`+#endif`
`570`	`561`	`#ifndef HAVE_SIGNAL_H /* Is this the right #define? */`
`571`	`562`	`/* If we have true signals, the signal handler will call`
`572`	`563`	`Py_AddPendingCall() so we don't have to call sigcheck().`
`@@ -1697,6 +1688,10 @@ eval_code2(co, globals, locals,`
`1697`	`1688`	`}`
`1698`	`1689`	`}`
`1699`	`1690`
	`1691`	`+ --recursion_depth;`
	`1692`	`+`
	`1693`	`+ fail: /* Jump here from prelude on failure */`
	`1694`	`+`
`1700`	`1695`	`/* Kill all local variables */`
`1701`	`1696`
`1702`	`1697`	`{`
`@@ -1713,7 +1708,6 @@ eval_code2(co, globals, locals,`
`1713`	`1708`
`1714`	`1709`	`current_frame = f->f_back;`
`1715`	`1710`	`DECREF(f);`
`1716`		`- --recursion_depth;`
`1717`	`1711`
`1718`	`1712`	`return retval;`
`1719`	`1713`	`}`