Author: Carl Friedrich Bolz <cfb...@gmx.de>
Branch:
Changeset: r68715:9dd14335d58e
Date: 2014-01-17 13:26 +0100
http://bitbucket.org/pypy/pypy/changeset/9dd14335d58e/
Log: merge
diff --git a/pypy/objspace/std/listobject.py b/pypy/objspace/std/listobject.py
--- a/pypy/objspace/std/listobject.py
+++ b/pypy/objspace/std/listobject.py
@@ -1337,10 +1337,9 @@
l[index] = self.unwrap(w_item)
except IndexError:
raise
- return
-
- w_list.switch_to_object_strategy()
- w_list.setitem(index, w_item)
+ else:
+ w_list.switch_to_object_strategy()
+ w_list.setitem(index, w_item)
def setslice(self, w_list, start, step, slicelength, w_other):
assert slicelength >= 0
diff --git a/rpython/jit/metainterp/pyjitpl.py
b/rpython/jit/metainterp/pyjitpl.py
--- a/rpython/jit/metainterp/pyjitpl.py
+++ b/rpython/jit/metainterp/pyjitpl.py
@@ -2102,11 +2102,11 @@
if not box1.same_constant(box2):
break
else:
- # Found! Compile it as a loop.
- # raises in case it works -- which is the common case
if self.partial_trace:
if start != self.retracing_from:
raise SwitchToBlackhole(Counters.ABORT_BAD_LOOP) # For
now
+ # Found! Compile it as a loop.
+ # raises in case it works -- which is the common case
self.compile_loop(original_boxes, live_arg_boxes, start,
resumedescr)
# creation of the loop was cancelled!
self.cancel_count += 1
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
