[pypy-commit] pypy optresult: gah, that took forever to fix

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: optresult
Changeset: r74728:279090680681
Date: 2014-11-26 13:06 +0200
http://bitbucket.org/pypy/pypy/changeset/279090680681/

Log:	gah, that took forever to fix

diff --git a/rpython/jit/metainterp/executor.py b/rpython/jit/metainterp/executor.py
--- a/rpython/jit/metainterp/executor.py
+++ b/rpython/jit/metainterp/executor.py
@@ -479,7 +479,7 @@
 def execute_nonspec_const(cpu, metainterp, opnum, argboxes, descr=None,
                           type='i'):
     return wrap_constant(_execute_nonspec(cpu, metainterp, opnum, argboxes,
-                                          descr, type))
+                                          descr))
 
 @specialize.arg(2)
 def _execute_nonspec(cpu, metainterp, opnum, argboxes, descr=None):
diff --git a/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py b/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
--- a/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
+++ b/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
@@ -2421,12 +2421,12 @@
             pfieldvar = match.group(3)
             pendingfields.append((pvar, pfieldname, pfieldvar))
         #
-        def _variables_equal(value, varname, strict):
+        def _variables_equal(box, varname, strict):
             if varname not in virtuals:
                 if strict:
                     assert box.same_box(oparse.getvar(varname))
                 else:
-                    assert value == oparse.getvar(varname).getvalue()
+                    assert box.getvalue() == oparse.getvar(varname).getvalue()
             else:
                 tag, resolved, fieldstext = virtuals[varname]
                 if tag[0] == 'virtual':
@@ -2438,7 +2438,7 @@
                 else:
                     assert 0
                 if resolved is not None:
-                    assert resolved.value == box.value
+                    assert resolved.getvalue() == box.getvalue()
                 else:
                     virtuals[varname] = tag, box, fieldstext
         #
@@ -2482,7 +2482,8 @@
                                                 resolved, ConstInt(index))
                 else:
                     assert 0
-                _variables_equal(fieldval, fieldvalue.strip(), strict=False)
+                _variables_equal(executor.wrap_constant(fieldval),
+                                 fieldvalue.strip(), strict=False)
                 index += 1
 
     def check_expanded_fail_descr(self, expectedtext, guard_opnum):