Author: Antonio Cuni <anto.c...@gmail.com>
Branch: refactor-call_release_gil
Changeset: r63144:c25a11a6ad46
Date: 2013-04-08 16:41 +0100
http://bitbucket.org/pypy/pypy/changeset/c25a11a6ad46/
Log: hg merge default
diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py
--- a/pypy/interpreter/baseobjspace.py
+++ b/pypy/interpreter/baseobjspace.py
@@ -709,7 +709,8 @@
def new_interned_w_str(self, w_s):
s = self.str_w(w_s)
- assert type(s) is str
+ if not we_are_translated():
+ assert type(s) is str
try:
return self.interned_strings[s]
except KeyError:
@@ -718,7 +719,8 @@
return w_s
def new_interned_str(self, s):
- assert type(s) is str
+ if not we_are_translated():
+ assert type(s) is str
try:
return self.interned_strings[s]
except KeyError:
diff --git a/rpython/jit/backend/arm/assembler.py
b/rpython/jit/backend/arm/assembler.py
--- a/rpython/jit/backend/arm/assembler.py
+++ b/rpython/jit/backend/arm/assembler.py
@@ -1035,7 +1035,8 @@
assert 0, 'unsupported case'
def _mov_stack_to_loc(self, prev_loc, loc, cond=c.AL):
- helper = self._regalloc.get_free_reg()
+ # disabled for now, has side effects in combination with
remap_frame_layout when called from a jump
+ helper = None # self._regalloc.get_free_reg()
if loc.is_reg():
assert prev_loc.type != FLOAT, 'trying to load from an \
incompatible location into a core register'
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
