Author: Armin Rigo <ar...@tunes.org>
Branch: reverse-debugger
Changeset: r86507:290549df34f4
Date: 2016-08-24 19:11 +0100
http://bitbucket.org/pypy/pypy/changeset/290549df34f4/
Log: fix for the merge
diff --git a/rpython/translator/c/funcgen.py b/rpython/translator/c/funcgen.py
--- a/rpython/translator/c/funcgen.py
+++ b/rpython/translator/c/funcgen.py
@@ -171,11 +171,12 @@
# ____________________________________________________________
+ extra_return_text = None
+
def cfunction_body(self):
- extra_return_text = None
if self.db.reverse_debugger:
from rpython.translator.revdb import gencsupp
- (extra_enter_text, extra_return_text) = (
+ (extra_enter_text, self.extra_return_text) = (
gencsupp.prepare_function(self))
if extra_enter_text:
yield extra_enter_text
@@ -219,8 +220,8 @@
retval = self.expr(block.inputargs[0])
if self.exception_policy != "exc_helper":
yield 'RPY_DEBUG_RETURN();'
- if extra_return_text:
- yield extra_return_text
+ if self.extra_return_text:
+ yield self.extra_return_text
yield 'return %s;' % retval
return
elif block.exitswitch is None:
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
