Author: Armin Rigo <ar...@tunes.org> Branch: exception-cannot-occur Changeset: r54128:2335956a2d4d Date: 2012-04-01 19:37 +0200 http://bitbucket.org/pypy/pypy/changeset/2335956a2d4d/
Log: More. diff --git a/pypy/rpython/lltypesystem/rtuple.py b/pypy/rpython/lltypesystem/rtuple.py --- a/pypy/rpython/lltypesystem/rtuple.py +++ b/pypy/rpython/lltypesystem/rtuple.py @@ -55,6 +55,7 @@ vtup = hop.inputarg(self, 0) LIST = hop.r_result.lowleveltype.TO cno = inputconst(Signed, nitems) + hop.exception_is_here() vlist = hop.gendirectcall(LIST.ll_newlist, cno) v_func = hop.inputconst(Void, rlist.dum_nocheck) for index in range(nitems): diff --git a/pypy/rpython/ootypesystem/rtuple.py b/pypy/rpython/ootypesystem/rtuple.py --- a/pypy/rpython/ootypesystem/rtuple.py +++ b/pypy/rpython/ootypesystem/rtuple.py @@ -39,6 +39,7 @@ RESULT = hop.r_result.lowleveltype c_resulttype = inputconst(ootype.Void, RESULT) c_length = inputconst(ootype.Signed, len(self.items_r)) + hop.exception_is_here() if isinstance(RESULT, ootype.Array): v_list = hop.genop('oonewarray', [c_resulttype, c_length], resulttype=RESULT) else: diff --git a/pypy/rpython/rbuiltin.py b/pypy/rpython/rbuiltin.py --- a/pypy/rpython/rbuiltin.py +++ b/pypy/rpython/rbuiltin.py @@ -249,6 +249,7 @@ def rtype_builtin_min(hop): v1, v2 = hop.inputargs(hop.r_result, hop.r_result) + hop.exception_cannot_occur() return hop.gendirectcall(ll_min, v1, v2) def ll_min(i1, i2): @@ -258,6 +259,7 @@ def rtype_builtin_max(hop): v1, v2 = hop.inputargs(hop.r_result, hop.r_result) + hop.exception_cannot_occur() return hop.gendirectcall(ll_max, v1, v2) def ll_max(i1, i2): @@ -569,6 +571,7 @@ def rtype_raw_malloc(hop): v_size, = hop.inputargs(lltype.Signed) + hop.exception_cannot_occur() return hop.genop('raw_malloc', [v_size], resulttype=llmemory.Address) def rtype_raw_malloc_usage(hop): @@ -597,6 +600,7 @@ if s_addr.is_null_address(): raise TyperError("raw_memclear(x, n) where x is the constant NULL") v_list = hop.inputargs(llmemory.Address, lltype.Signed) + hop.exception_cannot_occur() return hop.genop('raw_memclear', v_list) BUILTIN_TYPER[llmemory.raw_malloc] = rtype_raw_malloc diff --git a/pypy/rpython/rlist.py b/pypy/rpython/rlist.py --- a/pypy/rpython/rlist.py +++ b/pypy/rpython/rlist.py @@ -115,6 +115,7 @@ def rtype_bltn_list(self, hop): v_lst = hop.inputarg(self, 0) cRESLIST = hop.inputconst(Void, hop.r_result.LIST) + hop.exception_is_here() return hop.gendirectcall(ll_copy, cRESLIST, v_lst) def rtype_len(self, hop): _______________________________________________ pypy-commit mailing list pypy-commit@python.org http://mail.python.org/mailman/listinfo/pypy-commit