[pypy-commit] pypy optresult: disable the unroll-related change for now, it breaks stuff

[cfbolz]

Author: Carl Friedrich Bolz <cfbolz at gmx.de>
Branch: optresult
Changeset: r78185:c76bc6248751
Date: 2015-06-18 17:28 +0200
http://bitbucket.org/pypy/pypy/changeset/c76bc6248751/

Log:	disable the unroll-related change for now, it breaks stuff

diff --git a/rpython/jit/metainterp/optimizeopt/pure.py b/rpython/jit/metainterp/optimizeopt/pure.py
--- a/rpython/jit/metainterp/optimizeopt/pure.py
+++ b/rpython/jit/metainterp/optimizeopt/pure.py
@@ -144,8 +144,15 @@
         if self.optimizer.emitting_dissabled:
             self.extra_call_pure.append(op) # XXX
         else:
-            effectinfo = op.getdescr().get_extra_info()
-            if not effectinfo.check_can_raise(ignore_memoryerror=True):
+            # don't move call_pure_with_exception in the short preamble...
+            # issue #2015
+
+            # XXX default has this code:
+            # this does not work with how pure calls are done on this branch
+            # fix together with unroll
+            #effectinfo = op.getdescr().get_extra_info()
+            #if not effectinfo.check_can_raise(ignore_memoryerror=True):
+            if 1:
                 self.call_pure_positions.append(
                     len(self.optimizer._newoperations) - 1)