Author: Maciej Fijalkowski <fij...@gmail.com>
Branch: kill-gen-store-back-in
Changeset: r65325:a83e379514aa
Date: 2013-07-10 20:57 +0200
http://bitbucket.org/pypy/pypy/changeset/a83e379514aa/
Log: ups
diff --git a/rpython/jit/metainterp/resoperation.py
b/rpython/jit/metainterp/resoperation.py
--- a/rpython/jit/metainterp/resoperation.py
+++ b/rpython/jit/metainterp/resoperation.py
@@ -158,7 +158,8 @@
return rop._MALLOC_FIRST <= self.getopnum() <= rop._MALLOC_LAST
def can_malloc(self):
- return self.is_call() or self.is_malloc()
+ return (rop._CANMALLOC_FIRST <= self.getopnum() <= rop._CANMALLOC_LAST
+ or self.is_call())
def is_call(self):
return rop._CALL_FIRST <= self.getopnum() <= rop._CALL_LAST
@@ -482,14 +483,16 @@
'RAW_LOAD/2d',
'GETFIELD_GC/1d',
'GETFIELD_RAW/1d',
+ '_CANMALLOC_FIRST',
'_MALLOC_FIRST',
'NEW/0d',
'NEW_WITH_VTABLE/1',
'NEW_ARRAY/1d',
'NEWSTR/1',
'NEWUNICODE/1',
+ '_MALLOC_LAST',
'FORCE_VIRTUALIZABLE/1d', # forces a non-standard virtualizable
- '_MALLOC_LAST',
+ '_CANMALLOC_LAST'
'FORCE_TOKEN/0',
'VIRTUAL_REF/2', # removed before it's passed to the backend
'READ_TIMESTAMP/0',
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
