Author: Maciej Fijalkowski <[email protected]>
Branch: kill-gen-store-back-in
Changeset: r64618:331b467d0c3d
Date: 2013-05-28 15:46 +0200
http://bitbucket.org/pypy/pypy/changeset/331b467d0c3d/
Log: simplify
diff --git a/rpython/jit/backend/llgraph/runner.py
b/rpython/jit/backend/llgraph/runner.py
--- a/rpython/jit/backend/llgraph/runner.py
+++ b/rpython/jit/backend/llgraph/runner.py
@@ -258,9 +258,6 @@
def get_latest_descr(self, deadframe):
return deadframe._latest_descr
- def get_force_descr(self, deadframe):
- xxx
-
def grab_exc_value(self, deadframe):
if deadframe._last_exception is not None:
result = deadframe._last_exception.args[1]
diff --git a/rpython/jit/backend/model.py b/rpython/jit/backend/model.py
--- a/rpython/jit/backend/model.py
+++ b/rpython/jit/backend/model.py
@@ -101,11 +101,6 @@
"""Returns the Descr for the last operation executed by the frame."""
raise NotImplementedError
- def get_force_descr(self, deadframe):
- """Returns the Descr of last GUARD_NOT_FORCED
- """
- raise NotImplementedError
-
def get_int_value(self, deadframe, index):
"""Returns the value for the index'th argument to the
last executed operation (from 'fail_args' if it was a guard,
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
@@ -703,11 +703,9 @@
rstack._stack_criticalcode_start()
try:
deadframe = cpu.force(token)
+ # this should set descr to ResumeGuardForceDescr, if it
+ # was not that already
faildescr = cpu.get_latest_descr(deadframe)
- if not isinstance(faildescr, ResumeGuardForcedDescr):
- assert faildescr.final_descr # we have to fish from
- # guard_exc_descr instead
- faildescr = cpu.get_force_descr(deadframe)
assert isinstance(faildescr, ResumeGuardForcedDescr)
faildescr.handle_async_forcing(deadframe)
finally:
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
