Author: Armin Rigo <[email protected]>
Branch: stmgc-c7
Changeset: r75786:fbaaff38d9d6
Date: 2015-02-09 21:12 +0100
http://bitbucket.org/pypy/pypy/changeset/fbaaff38d9d6/
Log: tweaks
diff --git a/rpython/jit/metainterp/optimizeopt/virtualize.py
b/rpython/jit/metainterp/optimizeopt/virtualize.py
--- a/rpython/jit/metainterp/optimizeopt/virtualize.py
+++ b/rpython/jit/metainterp/optimizeopt/virtualize.py
@@ -159,6 +159,8 @@
iteritems.sort(key=lambda (x, y): x.sort_key())
for ofs, value in iteritems:
subbox = value.force_box(optforce)
+ # STM note: recording stm_location is pointless, because
+ # it should not fail here: we just allocated 'box'
op = ResOperation(rop.SETFIELD_GC, [box, subbox], None,
descr=ofs)
optforce.emit_operation(op)
diff --git a/rpython/jit/metainterp/resoperation.py
b/rpython/jit/metainterp/resoperation.py
--- a/rpython/jit/metainterp/resoperation.py
+++ b/rpython/jit/metainterp/resoperation.py
@@ -87,6 +87,7 @@
if descr is None:
descr = self.getdescr()
newop = ResOperation(opnum, args, result, descr)
+ newop.stm_location = self.stm_location
return newop
def clone(self):
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit