Author: Hakan Ardo <ha...@debian.org>
Branch:
Changeset: r54811:cc436eb0a04b
Date: 2012-04-29 15:29 +0200
http://bitbucket.org/pypy/pypy/changeset/cc436eb0a04b/
Log: hg merge
diff --git a/pypy/jit/metainterp/jitexc.py b/pypy/jit/metainterp/jitexc.py
--- a/pypy/jit/metainterp/jitexc.py
+++ b/pypy/jit/metainterp/jitexc.py
@@ -12,7 +12,6 @@
"""
_go_through_llinterp_uncaught_ = True # ugh
-
def _get_standard_error(rtyper, Class):
exdata = rtyper.getexceptiondata()
clsdef = rtyper.annotator.bookkeeper.getuniqueclassdef(Class)
diff --git a/pypy/jit/metainterp/optimize.py b/pypy/jit/metainterp/optimize.py
--- a/pypy/jit/metainterp/optimize.py
+++ b/pypy/jit/metainterp/optimize.py
@@ -5,3 +5,9 @@
"""Raised when the optimize*.py detect that the loop that
we are trying to build cannot possibly make sense as a
long-running loop (e.g. it cannot run 2 complete iterations)."""
+
+ def __init__(self, msg='?'):
+ debug_start("jit-abort")
+ debug_print(msg)
+ debug_stop("jit-abort")
+ self.msg = msg
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
