[pypy-commit] pypy optresult: fix the merge

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: optresult
Changeset: r74904:d75fb78484b4
Date: 2014-12-12 18:45 +0200
http://bitbucket.org/pypy/pypy/changeset/d75fb78484b4/

Log:	fix the merge

diff --git a/rpython/jit/metainterp/optimizeopt/intbounds.py b/rpython/jit/metainterp/optimizeopt/intbounds.py
--- a/rpython/jit/metainterp/optimizeopt/intbounds.py
+++ b/rpython/jit/metainterp/optimizeopt/intbounds.py
@@ -351,10 +351,10 @@
         stop = 1 << (numbits - 1)
         bounds = IntBound(start, stop - 1)
         if bounds.contains_bound(value.intbound):
-            self.make_equal_to(op.result, value)
+            self.make_equal_to(op, value)
         else:
             self.emit_operation(op)
-            vres = self.getvalue(op.result)
+            vres = self.getvalue(op)
             vres.intbound.intersect(bounds)
 
     def optimize_ARRAYLEN_GC(self, op):
diff --git a/rpython/jit/metainterp/optimizeopt/virtualstate.py b/rpython/jit/metainterp/optimizeopt/virtualstate.py
--- a/rpython/jit/metainterp/optimizeopt/virtualstate.py
+++ b/rpython/jit/metainterp/optimizeopt/virtualstate.py
@@ -659,11 +659,7 @@
             return
         if op in self.short_boxes_in_production:
             raise BoxNotProducable
-<<<<<<< local
-        if self.availible_boxes is not None and op not in self.availible_boxes:
-=======
-        if self.available_boxes is not None and box not in self.available_boxes:
->>>>>>> other
+        if self.availible_boxes is not None and op not in self.available_boxes:
             raise BoxNotProducable
         self.short_boxes_in_production[op] = None