[pypy-commit] pypy py3k: (arigo, mjacob) Disable the StackDepthComputationError for now on this branch.

[mjacob]

Author: Manuel Jacob <me at manueljacob.de>
Branch: py3k
Changeset: r77727:867d6f301a03
Date: 2015-05-31 20:36 +0200
http://bitbucket.org/pypy/pypy/changeset/867d6f301a03/

Log:	(arigo, mjacob) Disable the StackDepthComputationError for now on
	this branch.

diff --git a/pypy/interpreter/astcompiler/assemble.py b/pypy/interpreter/astcompiler/assemble.py
--- a/pypy/interpreter/astcompiler/assemble.py
+++ b/pypy/interpreter/astcompiler/assemble.py
@@ -395,9 +395,13 @@
         for block in blocks:
             depth = self._do_stack_depth_walk(block)
             if block.auto_inserted_return and depth != 0:
-                os.write(2, "StackDepthComputationError in %s at %s:%s\n" % (
-                    self.compile_info.filename, self.name, self.first_lineno))
-                raise StackDepthComputationError   # fatal error
+                assert depth >= 0
+                # Disable this error for now.  On this branch the stack depth
+                # computation gives a slightly incorrect but conservative
+                # estimation of how much stack depth is actually needed.
+                #os.write(2, "StackDepthComputationError in %s at %s:%s\n" % (
+                #    self.compile_info.filename, self.name, self.first_lineno))
+                #raise StackDepthComputationError   # fatal error
         return self._max_depth
 
     def _next_stack_depth_walk(self, nextblock, depth):