Author: Armin Rigo <ar...@tunes.org>
Branch: stmgc-c7-rewindjmp
Changeset: r72848:778a09fd4f39
Date: 2014-08-17 18:22 +0200
http://bitbucket.org/pypy/pypy/changeset/778a09fd4f39/
Log: Revert this change
diff --git a/rpython/jit/metainterp/history.py
b/rpython/jit/metainterp/history.py
--- a/rpython/jit/metainterp/history.py
+++ b/rpython/jit/metainterp/history.py
@@ -759,10 +759,9 @@
# ____________________________________________________________
class History(object):
- def __init__(self, metainterp_sd):
+ def __init__(self):
self.inputargs = None
self.operations = []
- self.config = metainterp_sd.config
self.stm_location = None
def record(self, opnum, argboxes, resbox, descr=None):
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
@@ -1849,7 +1849,7 @@
self.framestack[-1].pc = saved_pc
def create_empty_history(self):
- self.history = history.History(self.staticdata)
+ self.history = history.History()
self.staticdata.stats.set_history(self.history)
def _all_constants(self, *boxes):
@@ -2453,7 +2453,7 @@
rstack._stack_criticalcode_start()
try:
self.portal_call_depth = -1 # always one portal around
- self.history = history.History(self.staticdata)
+ self.history = history.History()
inputargs_and_holes = self.rebuild_state_after_failure(resumedescr,
deadframe)
self.history.inputargs = [box for box in inputargs_and_holes if
box]
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
