[pypy-commit] pypy default: oops

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: 
Changeset: r47296:b3a8aec61f40
Date: 2011-09-14 10:15 +0200
http://bitbucket.org/pypy/pypy/changeset/b3a8aec61f40/

Log:	oops

diff --git a/pypy/objspace/std/stringobject.py b/pypy/objspace/std/stringobject.py
--- a/pypy/objspace/std/stringobject.py
+++ b/pypy/objspace/std/stringobject.py
@@ -362,7 +362,7 @@
 from pypy.rlib.jit import JitDriver
 
 one = JitDriver(greens = [], reds = ['size', 'reslen', 'self', 'list_w'])
-two = JitDriver(greens = [], reds = ['i', 'list_w', 'sb'])
+two = JitDriver(greens = [], reds = ['i', 'list_w', 'sb', 'self'])
 
 def _str_join_compute_reslen(space, self, list_w, size):
     reslen = len(self) * (size - 1)
@@ -393,7 +393,7 @@
 
     sb = StringBuilder(reslen)
     for i in range(size):
-        two.jit_merge_point(i=i, sb=sb, list_w=list_w)
+        two.jit_merge_point(i=i, sb=sb, list_w=list_w, self=self)
         if self and i != 0:
             sb.append(self)
         sb.append(space.str_w(list_w[i]))