Author: Maciej Fijalkowski <[email protected]>
Branch: jitframe-on-heap
Changeset: r60275:9e4122b124f4
Date: 2013-01-21 10:55 +0200
http://bitbucket.org/pypy/pypy/changeset/9e4122b124f4/
Log: fix
diff --git a/rpython/jit/metainterp/compile.py
b/rpython/jit/metainterp/compile.py
--- a/rpython/jit/metainterp/compile.py
+++ b/rpython/jit/metainterp/compile.py
@@ -1,7 +1,6 @@
import weakref
from rpython.rtyper.lltypesystem import lltype
-from rpython.rtyper.ootypesystem import ootype
-from rpython.flowspace.model import Constant, Variable
+from rpython.rtyper.annlowlevel import cast_instance_to_gcref
from rpython.rlib.objectmodel import we_are_translated
from rpython.rlib.debug import debug_start, debug_stop, debug_print
from rpython.rlib import rstack
@@ -867,7 +866,7 @@
cpu = metainterp_sd.cpu
exception = cpu.grab_exc_value(deadframe)
if not exception:
- exception = memory_error
+ exception = cast_instance_to_gcref(memory_error)
assert exception, "PropagateExceptionDescr: no exception??"
raise metainterp_sd.ExitFrameWithExceptionRef(cpu, exception)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
