Author: Christian Tismer <tis...@stackless.com>
Branch: win64-stage1
Changeset: r49755:ecd85170665a
Date: 2011-11-24 20:16 +0100
http://bitbucket.org/pypy/pypy/changeset/ecd85170665a/
Log: merge
diff --git a/pypy/jit/metainterp/test/test_string.py
b/pypy/jit/metainterp/test/test_string.py
--- a/pypy/jit/metainterp/test/test_string.py
+++ b/pypy/jit/metainterp/test/test_string.py
@@ -491,7 +491,7 @@
def __init__(self, s):
self.defaultencoding = s
_str = self._str
- sys = Sys(_str('ascii'))
+ sys = Sys(_str('ascii'))
mydriver = JitDriver(reds = ['n', 'sa'], greens = [])
def f(n):
sa = 0
@@ -510,7 +510,7 @@
def test_promote_string(self):
driver = JitDriver(greens = [], reds = ['n'])
-
+
def f(n):
while n < 21:
driver.jit_merge_point(n=n)
diff --git a/pypy/rpython/lltypesystem/rstr.py
b/pypy/rpython/lltypesystem/rstr.py
--- a/pypy/rpython/lltypesystem/rstr.py
+++ b/pypy/rpython/lltypesystem/rstr.py
@@ -316,7 +316,7 @@
s.chars[0] = ch
return s
- @jit.look_inside_iff(lambda str: jit.isconstant(len(str.chars)) and
len(str.chars) == 1)
+ # @jit.look_inside_iff(lambda str: jit.isconstant(len(str.chars)) and
len(str.chars) == 1)
@jit.oopspec("str.str2unicode(str)")
def ll_str2unicode(str):
lgt = len(str.chars)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
