Author: Armin Rigo <[email protected]>
Branch:
Changeset: r90359:78cdf1e8c131
Date: 2017-02-26 12:31 +0100
http://bitbucket.org/pypy/pypy/changeset/78cdf1e8c131/
Log: Oops, fix translation
diff --git a/rpython/jit/metainterp/optimizeopt/info.py
b/rpython/jit/metainterp/optimizeopt/info.py
--- a/rpython/jit/metainterp/optimizeopt/info.py
+++ b/rpython/jit/metainterp/optimizeopt/info.py
@@ -70,7 +70,7 @@
def same_info(self, other):
return self is other
- def getstrlen(self, op, string_optimizer, mode, create_ops=True):
+ def getstrlen(self, op, string_optimizer, mode):
return None
def getstrhash(self, op, mode):
@@ -777,21 +777,20 @@
# XXX we can do better if we know it's an array
return IntLowerBound(0)
else:
- return ConstIntBound(self.getstrlen(None, None, mode).getint())
-
- def getstrlen(self, op, string_optimizer, mode, create_ops=True):
+ return ConstIntBound(self.getstrlen1(mode))
+
+ def getstrlen(self, op, string_optimizer, mode):
+ return ConstInt(self.getstrlen1(mode))
+
+ def getstrlen1(self, mode):
from rpython.jit.metainterp.optimizeopt import vstring
if mode is vstring.mode_string:
s = self._unpack_str(vstring.mode_string)
- if s is None:
- return None
- return ConstInt(len(s))
+ return len(s)
else:
s = self._unpack_str(vstring.mode_unicode)
- if s is None:
- return None
- return ConstInt(len(s))
+ return len(s)
def getstrhash(self, op, mode):
from rpython.jit.metainterp.optimizeopt import vstring
@@ -812,7 +811,7 @@
from rpython.jit.metainterp.optimizeopt import vstring
from rpython.jit.metainterp.optimizeopt.optimizer import CONST_0
- lgt = self.getstrlen(op, string_optimizer, mode, False)
+ lgt = self.getstrlen(op, string_optimizer, mode)
return vstring.copy_str_content(string_optimizer, self._const,
targetbox, CONST_0, offsetbox,
lgt, mode)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
