From: Zackery Spytz <zspytz@gmail.com>
Date: Fri, 22 Mar 2019 13:20:49 +0000 (-0600)
Subject: bpo-35284: Fix the error handling in the compiler's compiler_call(). (GH-10625) ... 
X-Git-Tag: v3.7.4rc1~313
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bdb9c497e177cdf881892de289b9d8a2b132f138;p=thirdparty%2FPython%2Fcpython.git

bpo-35284: Fix the error handling in the compiler's compiler_call(). (GH-10625) (GH-12496)

compiler_call() needs to check if an error occurred during the
maybe_optimize_method_call() call.
(cherry picked from commit 97f5de01adf993aee17dcd26e22ae421d013f372)
---

diff --git a/Python/compile.c b/Python/compile.c
index 3564ca2b904f..5688ef8479c0 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -3536,6 +3536,7 @@ compiler_compare(struct compiler *c, expr_ty e)
     return 1;
 }
 
+// Return 1 if the method call was optimized, -1 if not, and 0 on error.
 static int
 maybe_optimize_method_call(struct compiler *c, expr_ty e)
 {
@@ -3569,9 +3570,10 @@ maybe_optimize_method_call(struct compiler *c, expr_ty e)
 static int
 compiler_call(struct compiler *c, expr_ty e)
 {
-    if (maybe_optimize_method_call(c, e) > 0)
-        return 1;
-
+    int ret = maybe_optimize_method_call(c, e);
+    if (ret >= 0) {
+        return ret;
+    }
     VISIT(c, expr, e->v.Call.func);
     return compiler_call_helper(c, 0,
                                 e->v.Call.args,