Author: Maciej Fijalkowski <[email protected]>
Branch: jitframe-on-heap
Changeset: r60409:2a8f21ff4463
Date: 2013-01-24 00:49 +0200
http://bitbucket.org/pypy/pypy/changeset/2a8f21ff4463/
Log: RPythonization
diff --git a/rpython/jit/backend/x86/assembler.py
b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -676,7 +676,7 @@
new_jumping_to = []
for wref in self.current_clt.jumping_to:
clt = wref()
- if clt:
+ if clt is not None:
clt.frame_info.jfi_frame_depth = max(frame_depth,
clt.frame_info.jfi_frame_depth)
new_jumping_to.append(weakref.ref(clt))
@@ -2435,8 +2435,10 @@
curpos = self.mc.get_relative_pos() + 5
self.mc.JMP_l(target - curpos)
else:
+ clt = self.current_clt
+ assert clt is not None
target_token._x86_clt.jumping_to.append(
- weakref.ref(self.current_clt))
+ weakref.ref(clt))
self.mc.JMP(imm(target))
def malloc_cond(self, nursery_free_adr, nursery_top_adr, size, gcmap):
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
