Author: Maciej Fijalkowski <[email protected]>
Branch: string-promote-2
Changeset: r47933:71ea9a22ca51
Date: 2011-10-11 12:07 +0200
http://bitbucket.org/pypy/pypy/changeset/71ea9a22ca51/
Log: (fijal, arigo) make the test pass
diff --git a/pypy/jit/metainterp/blackhole.py b/pypy/jit/metainterp/blackhole.py
--- a/pypy/jit/metainterp/blackhole.py
+++ b/pypy/jit/metainterp/blackhole.py
@@ -523,9 +523,9 @@
@arguments("f")
def bhimpl_float_guard_value(a):
pass
- @arguments("r")
- def bhimpl_str_guard_value(a):
- pass
+ @arguments("r", "i", "d", returns="r")
+ def bhimpl_str_guard_value(a, i, d):
+ return a
@arguments("self", "i")
def bhimpl_int_push(self, a):
diff --git a/pypy/jit/metainterp/pyjitpl.py b/pypy/jit/metainterp/pyjitpl.py
--- a/pypy/jit/metainterp/pyjitpl.py
+++ b/pypy/jit/metainterp/pyjitpl.py
@@ -903,7 +903,9 @@
else:
constbox = box.constbox()
resbox = self.do_residual_call(funcbox, descr, [box, constbox])
- self.generate_guard(rop.GUARD_TRUE, resbox, resumepc=orgpc)
+ promoted_box = resbox.constbox()
+ self.generate_guard(rop.GUARD_VALUE, resbox, [promoted_box],
+ resumepc=orgpc)
self.metainterp.replace_box(box, constbox)
return constbox
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
