[pypy-commit] pypy optresult: intermediate checkin

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: optresult
Changeset: r76090:a1041f0d5ff5
Date: 2015-02-23 19:21 +0200
http://bitbucket.org/pypy/pypy/changeset/a1041f0d5ff5/

Log:	intermediate checkin

diff --git a/rpython/jit/metainterp/optimizeopt/unroll.py b/rpython/jit/metainterp/optimizeopt/unroll.py
--- a/rpython/jit/metainterp/optimizeopt/unroll.py
+++ b/rpython/jit/metainterp/optimizeopt/unroll.py
@@ -521,7 +521,7 @@
             self.import_box(a, inputargs, short_jumpargs, jumpargs)
 
     def jump_to_already_compiled_trace(self, jumpop, patchguardop):
-        jumpop = jumpop.clone()
+        jumpop = jumpop.copy_and_change(jumpop.getopnum())
         assert jumpop.getopnum() == rop.JUMP
         cell_token = jumpop.getdescr()
 
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
@@ -120,7 +120,7 @@
     def clone(self, memo):
         args = [memo.get(arg, arg) for arg in self.getarglist()]
         descr = self.getdescr()
-        op = ResOperation(self.getopnum(), args[:], self.result, descr)
+        op = ResOperation(self.getopnum(), args[:], descr)
         if not we_are_translated():
             op.name = self.name
             op.pc = self.pc
@@ -306,8 +306,7 @@
         return newop
 
     def clone(self, memo):
-        xxx
-        newop = AbstractResOp.clone(self)
+        newop = AbstractResOp.clone(self, memo)
         assert isinstance(newop, GuardResOp)
         newop.setfailargs(self.getfailargs())
         newop.rd_snapshot = self.rd_snapshot