Author: Hakan Ardo <[email protected]>
Branch: jit-optimizeopt-cleanups
Changeset: r47598:41edc1bac86b
Date: 2011-09-25 09:59 +0200
http://bitbucket.org/pypy/pypy/changeset/41edc1bac86b/
Log: fix merge
diff --git a/pypy/jit/metainterp/optimizeopt/vstring.py
b/pypy/jit/metainterp/optimizeopt/vstring.py
--- a/pypy/jit/metainterp/optimizeopt/vstring.py
+++ b/pypy/jit/metainterp/optimizeopt/vstring.py
@@ -142,9 +142,9 @@
def string_copy_parts(self, string_optimizer, targetbox, offsetbox, mode):
if not self.is_virtual() and targetbox is not self.box:
- lengthbox = self.getstrlen(optimizer, mode)
+ lengthbox = self.getstrlen(string_optimizer, mode)
srcbox = self.force_box()
- return copy_str_content(optimizer, srcbox, targetbox,
+ return copy_str_content(string_optimizer, srcbox, targetbox,
CONST_0, offsetbox, lengthbox, mode)
for i in range(len(self._chars)):
charbox = self._chars[i].force_box()
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
