[pypy-commit] pypy pypy-dont-copy-ops: fix first problems (it is going to be fun)

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: pypy-dont-copy-ops
Changeset: r75123:eac43a44411d
Date: 2014-12-25 22:47 +0200
http://bitbucket.org/pypy/pypy/changeset/eac43a44411d/

Log:	fix first problems (it is going to be fun)

diff --git a/rpython/jit/metainterp/optimizeopt/optimizer.py b/rpython/jit/metainterp/optimizeopt/optimizer.py
--- a/rpython/jit/metainterp/optimizeopt/optimizer.py
+++ b/rpython/jit/metainterp/optimizeopt/optimizer.py
@@ -378,10 +378,10 @@
     def getintbound(self):
         return self.intbound
 
-    def get_last_guard(self):
+    def get_last_guard(self, optimizer):
         return None
 
-    def get_known_class(self):
+    def get_known_class(self, optimizer):
         return None
 
     def getlenbound(self):
diff --git a/rpython/jit/metainterp/optimizeopt/rewrite.py b/rpython/jit/metainterp/optimizeopt/rewrite.py
--- a/rpython/jit/metainterp/optimizeopt/rewrite.py
+++ b/rpython/jit/metainterp/optimizeopt/rewrite.py
@@ -317,7 +317,6 @@
                         args = [old_guard_op.getarg(0), op.getarg(1)],
                         descr = descr)
             self.optimizer.replace_guard(op, value)
-            descr.make_a_counter_per_value(op)
             # to be safe
             if isinstance(value, PtrOptValue):
                 value.last_guard_pos = -1
@@ -365,8 +364,8 @@
                             args = [old_guard_op.getarg(0), op.getarg(1)],
                             descr=descr)
                 self.optimizer.replace_guard(op, value)
+        value.make_constant_class(self.optimizer, expectedclassbox)
         self.emit_operation(op)
-        value.make_constant_class(self.optimizer, expectedclassbox)
 
     def optimize_GUARD_NONNULL_CLASS(self, op):
         value = self.getvalue(op.getarg(0))