Author: Maciej Fijalkowski <[email protected]>
Branch: slim-down-resumedescr
Changeset: r75103:4b641be64135
Date: 2014-12-24 13:55 +0200
http://bitbucket.org/pypy/pypy/changeset/4b641be64135/
Log: Comment out the wref stuff, I'm not sure what it does (but there is
a strong reference stored by the backend anyway)
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
@@ -65,12 +65,14 @@
wref = weakref.ref(original_jitcell_token)
for op in loop.operations:
descr = op.getdescr()
- if isinstance(descr, ResumeDescr):
- descr.wref_original_loop_token = wref # stick it there
- n = descr.index
- if n >= 0: # we also record the resumedescr number
-
original_jitcell_token.compiled_loop_token.record_faildescr_index(n)
- elif isinstance(descr, JitCellToken):
+ # not sure what descr.index is about
+ #if isinstance(descr, ResumeDescr):
+ #descr.wref_original_loop_token = wref # stick it there
+ #n = descr.index
+ #if n >= 0: # we also record the resumedescr number
+ #
original_jitcell_token.compiled_loop_token.record_faildescr_index(n)
+ # pass
+ if isinstance(descr, JitCellToken):
# for a CALL_ASSEMBLER: record it as a potential jump.
if descr is not original_jitcell_token:
original_jitcell_token.record_jump_to(descr)
diff --git a/rpython/jit/metainterp/pyjitpl.py
b/rpython/jit/metainterp/pyjitpl.py
--- a/rpython/jit/metainterp/pyjitpl.py
+++ b/rpython/jit/metainterp/pyjitpl.py
@@ -2170,7 +2170,8 @@
assert isinstance(key, compile.ResumeGuardDescr)
# store the resumekey.wref_original_loop_token() on 'self' to make
# sure that it stays alive as long as this MetaInterp
- self.resumekey_original_loop_token = key.wref_original_loop_token()
+ # XXXX this is stored these days via rd_loop_token on resumedescr
+ #self.resumekey_original_loop_token = key.wref_original_loop_token()
self.staticdata.try_to_free_some_loops()
self.initialize_state_from_guard_failure(key, deadframe)
try:
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
