Author: Armin Rigo <ar...@tunes.org> Branch: kill-gen-store-back-in Changeset: r65759:b7706614544c Date: 2013-07-28 22:04 +0200 http://bitbucket.org/pypy/pypy/changeset/b7706614544c/
Log: merge mistake diff --git a/rpython/jit/metainterp/test/test_virtualizable.py b/rpython/jit/metainterp/test/test_virtualizable.py --- a/rpython/jit/metainterp/test/test_virtualizable.py +++ b/rpython/jit/metainterp/test/test_virtualizable.py @@ -4,7 +4,7 @@ from rpython.jit.codewriter.policy import StopAtXPolicy from rpython.jit.metainterp.optimizeopt.test.test_util import LLtypeMixin from rpython.jit.metainterp.test.support import LLJitMixin -from rpython.jit.metainterp.warmspot import get_translator +from rpython.jit.metainterp.warmspot import get_translator, get_stats from rpython.jit.metainterp.resoperation import rop from rpython.rlib.jit import JitDriver, hint, dont_look_inside, promote, virtual_ref from rpython.rlib.rarithmetic import intmask _______________________________________________ pypy-commit mailing list pypy-commit@python.org http://mail.python.org/mailman/listinfo/pypy-commit
