[pypy-commit] pypy continulet-jit-3: progress

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: continulet-jit-3
Changeset: r58235:7e62f1b8a959
Date: 2012-10-18 22:08 +0200
http://bitbucket.org/pypy/pypy/changeset/7e62f1b8a959/

Log:	progress

diff --git a/pypy/jit/backend/llgraph/runner.py b/pypy/jit/backend/llgraph/runner.py
--- a/pypy/jit/backend/llgraph/runner.py
+++ b/pypy/jit/backend/llgraph/runner.py
@@ -256,6 +256,9 @@
     def set_savedata_ref(self, frame, data):
         frame.saved_data = data
 
+    def get_savedata_ref(self, frame):
+        return frame.saved_data
+
     def calldescrof(self, FUNC, ARGS, RESULT, effect_info):
         key = ('call', getkind(RESULT),
                tuple([getkind(A) for A in ARGS]),
diff --git a/pypy/jit/metainterp/test/test_virtualizable.py b/pypy/jit/metainterp/test/test_virtualizable.py
--- a/pypy/jit/metainterp/test/test_virtualizable.py
+++ b/pypy/jit/metainterp/test/test_virtualizable.py
@@ -410,7 +410,7 @@
         res = self.meta_interp(f, [20], enable_opts='')
         assert res == expected
         self.check_simple_loop(setarrayitem_gc=1, setfield_gc=0,
-                               getarrayitem_gc=1, arraylen_gc=1, getfield_gc=1)
+                               getarrayitem_gc=1, arraylen_gc=1, getfield_gc=2)
 
     # ------------------------------
 
diff --git a/pypy/jit/metainterp/warmspot.py b/pypy/jit/metainterp/warmspot.py
--- a/pypy/jit/metainterp/warmspot.py
+++ b/pypy/jit/metainterp/warmspot.py
@@ -441,7 +441,10 @@
         def crash_in_jit(e):
             tb = not we_are_translated() and sys.exc_info()[2]
             try:
-                raise e
+                if we_are_translated():
+                    raise e
+                else:
+                    raise
             except JitException:
                 raise     # go through
             except MemoryError: