[pypy-commit] pypy default: Fixed missing import of compute_unique_id.

[eventh]

Author: Even Wiik Thomassen <eventh at gmail.com>
Branch: 
Changeset: r56288:b9464961c684
Date: 2012-07-20 15:20 +0200
http://bitbucket.org/pypy/pypy/changeset/b9464961c684/

Log:	Fixed missing import of compute_unique_id.

	Changeset e3249f3bf105 introduced several uses of compute_unique_id,
	which was only imported inside dump_storage and not globally.

	This lead to translation with -opt=jit on PyHaskell failed. This
	could possibly affect other RPython VMs too.

	The fix is simply to move the import of compute_unique_id from
	inside dump_storage to the top of the file.

diff --git a/pypy/jit/metainterp/resume.py b/pypy/jit/metainterp/resume.py
--- a/pypy/jit/metainterp/resume.py
+++ b/pypy/jit/metainterp/resume.py
@@ -10,6 +10,7 @@
 from pypy.rpython import annlowlevel
 from pypy.rlib import rarithmetic, rstack
 from pypy.rlib.objectmodel import we_are_translated, specialize
+from pypy.rlib.objectmodel import compute_unique_id
 from pypy.rlib.debug import have_debug_prints, ll_assert
 from pypy.rlib.debug import debug_start, debug_stop, debug_print
 from pypy.jit.metainterp.optimize import InvalidLoop
@@ -1280,7 +1281,6 @@
 
 def dump_storage(storage, liveboxes):
     "For profiling only."
-    from pypy.rlib.objectmodel import compute_unique_id
     debug_start("jit-resume")
     if have_debug_prints():
         debug_print('Log storage', compute_unique_id(storage))