Author: Maciej Fijalkowski <fij...@gmail.com> Branch: better-jit-hooks Changeset: r49834:b201d7c9f25f Date: 2011-11-26 20:47 +0200 http://bitbucket.org/pypy/pypy/changeset/b201d7c9f25f/
Log: spring cleaning - remove ABORT_BAD_LOOP (unused) diff --git a/pypy/jit/metainterp/jitprof.py b/pypy/jit/metainterp/jitprof.py --- a/pypy/jit/metainterp/jitprof.py +++ b/pypy/jit/metainterp/jitprof.py @@ -21,7 +21,6 @@ ABORT_TOO_LONG ABORT_BRIDGE ABORT_ESCAPE -ABORT_BAD_LOOP ABORT_FORCE_QUASIIMMUT NVIRTUALS NVHOLES @@ -179,7 +178,6 @@ self._print_intline("abort: trace too long", cnt[ABORT_TOO_LONG]) self._print_intline("abort: compiling", cnt[ABORT_BRIDGE]) self._print_intline("abort: vable escape", cnt[ABORT_ESCAPE]) - self._print_intline("abort: bad loop", cnt[ABORT_BAD_LOOP]) self._print_intline("abort: force quasi-immut", cnt[ABORT_FORCE_QUASIIMMUT]) self._print_intline("nvirtuals", cnt[NVIRTUALS]) diff --git a/pypy/jit/metainterp/pyjitpl.py b/pypy/jit/metainterp/pyjitpl.py --- a/pypy/jit/metainterp/pyjitpl.py +++ b/pypy/jit/metainterp/pyjitpl.py @@ -15,7 +15,7 @@ from pypy.jit.metainterp.jitprof import EmptyProfiler from pypy.jit.metainterp.jitprof import GUARDS, RECORDED_OPS, ABORT_ESCAPE from pypy.jit.metainterp.jitprof import ABORT_TOO_LONG, ABORT_BRIDGE, \ - ABORT_FORCE_QUASIIMMUT, ABORT_BAD_LOOP + ABORT_FORCE_QUASIIMMUT from pypy.jit.metainterp.jitexc import JitException, get_llexception from pypy.jit.metainterp.heapcache import HeapCache from pypy.rlib.objectmodel import specialize @@ -1965,8 +1965,6 @@ self.compile(original_boxes, live_arg_boxes, start, resumedescr) # creation of the loop was cancelled! self.staticdata.log('cancelled, tracing more...') - #self.staticdata.log('cancelled, stopping tracing') - #raise SwitchToBlackhole(ABORT_BAD_LOOP) # Otherwise, no loop found so far, so continue tracing. start = len(self.history.operations) _______________________________________________ pypy-commit mailing list pypy-commit@python.org http://mail.python.org/mailman/listinfo/pypy-commit