Author: Armin Rigo <[email protected]>
Branch: kill-gen-store-back-in
Changeset: r65947:2e8522488faa
Date: 2013-08-05 14:45 +0200
http://bitbucket.org/pypy/pypy/changeset/2e8522488faa/
Log: Revert these changes, not needed any more
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,8 +158,7 @@
return rop._MALLOC_FIRST <= self.getopnum() <= rop._MALLOC_LAST
def can_malloc(self):
- return (rop._CANMALLOC_FIRST <= self.getopnum() <= rop._CANMALLOC_LAST
- or self.is_call())
+ return self.is_call() or self.is_malloc()
def is_call(self):
return rop._CALL_FIRST <= self.getopnum() <= rop._CALL_LAST
@@ -479,7 +478,6 @@
'RAW_LOAD/2d',
'GETFIELD_GC/1d',
'GETFIELD_RAW/1d',
- '_CANMALLOC_FIRST',
'_MALLOC_FIRST',
'NEW/0d',
'NEW_WITH_VTABLE/1',
@@ -487,7 +485,6 @@
'NEWSTR/1',
'NEWUNICODE/1',
'_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
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
