Author: Armin Rigo <ar...@tunes.org>
Branch:
Changeset: r54123:3baa10110134
Date: 2012-04-01 18:12 +0200
http://bitbucket.org/pypy/pypy/changeset/3baa10110134/
Log: merge heads
diff --git a/pypy/rlib/rerased.py b/pypy/rlib/rerased.py
--- a/pypy/rlib/rerased.py
+++ b/pypy/rlib/rerased.py
@@ -100,6 +100,7 @@
def specialize_call(self, hop):
bk = hop.rtyper.annotator.bookkeeper
s_obj = identity.get_input_annotation(bk)
+ hop.exception_cannot_occur()
return hop.r_result.rtype_erase(hop, s_obj)
class Entry(ExtRegistryEntry):
@@ -113,6 +114,7 @@
if hop.r_result.lowleveltype is lltype.Void:
return hop.inputconst(lltype.Void, None)
[v] = hop.inputargs(hop.args_r[0])
+ hop.exception_cannot_occur()
return hop.args_r[0].rtype_unerase(hop, v)
return erase, unerase
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
