Author: Maciej Fijalkowski <fij...@gmail.com> Branch: optresult-unroll Changeset: r79433:54877cf6df19 Date: 2015-09-04 17:25 +0200 http://bitbucket.org/pypy/pypy/changeset/54877cf6df19/
Log: fix import error diff --git a/rpython/jit/metainterp/optimizeopt/test/test_unroll.py b/rpython/jit/metainterp/optimizeopt/test/test_unroll.py --- a/rpython/jit/metainterp/optimizeopt/test/test_unroll.py +++ b/rpython/jit/metainterp/optimizeopt/test/test_unroll.py @@ -16,7 +16,7 @@ from rpython.jit.metainterp.compile import LoopCompileData from rpython.jit.metainterp.optimizeopt.virtualstate import \ NotVirtualStateInfo, LEVEL_CONSTANT, LEVEL_UNKNOWN, LEVEL_KNOWNCLASS,\ - VirtualStateInfo, BadVirtualState + VirtualStateInfo from rpython.jit.metainterp.optimizeopt import info from rpython.jit.codewriter import heaptracker diff --git a/rpython/jit/metainterp/optimizeopt/unroll.py b/rpython/jit/metainterp/optimizeopt/unroll.py --- a/rpython/jit/metainterp/optimizeopt/unroll.py +++ b/rpython/jit/metainterp/optimizeopt/unroll.py @@ -9,7 +9,7 @@ Optimization, LoopInfo, MININT, MAXINT from rpython.jit.metainterp.optimizeopt.vstring import StrPtrInfo from rpython.jit.metainterp.optimizeopt.virtualstate import ( - VirtualStateConstructor, VirtualStatesCantMatch, BadVirtualState) + VirtualStateConstructor, VirtualStatesCantMatch) from rpython.jit.metainterp.resoperation import rop, ResOperation, GuardResOp from rpython.jit.metainterp import compile from rpython.rlib.debug import debug_print @@ -149,7 +149,7 @@ self.optimizer, force_boxes=True) for arg in args: self.optimizer.force_box(arg) - except BadVirtualState: + except VirtualStatesCantMatch: raise InvalidLoop extra_same_as = self.short_preamble_producer.extra_same_as[:] target_token = self.finalize_short_preamble(label_op, _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit