[pypy-svn] r24987 - in pypy/dist/pypy: rpython/memory translator/c

[pedronis at codespeak.net]

Author: pedronis
Date: Sat Mar 25 00:39:47 2006
New Revision: 24987

Modified:
   pypy/dist/pypy/rpython/memory/gctransform.py
   pypy/dist/pypy/translator/c/funcgen.py
Log:
oops. this was the real intention.



Modified: pypy/dist/pypy/rpython/memory/gctransform.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/gctransform.py	(original)
+++ pypy/dist/pypy/rpython/memory/gctransform.py	Sat Mar 25 00:39:47 2006
@@ -267,10 +267,10 @@
     return c
 
 class MinimalGCTransformer(GCTransformer):
-    def push_alive_nopyobj(self, var):
+    def push_alive(self, var):
         return []
 
-    def pop_alive_nopyobj(self, var):
+    def pop_alive(self, var):
         return []
 
     def replace_getfield(self, op, livevars, block): # XXX hackish solution for now

Modified: pypy/dist/pypy/translator/c/funcgen.py
==============================================================================
--- pypy/dist/pypy/translator/c/funcgen.py	(original)
+++ pypy/dist/pypy/translator/c/funcgen.py	Sat Mar 25 00:39:47 2006
@@ -458,8 +458,7 @@
         newvalue = self.expr(op.result, special_case_void=False)
         result = ['%s = %s;' % (newvalue, sourceexpr)]
         # need to adjust the refcount of the result only for PyObjects
-        print "BARE", bare
-        if NEED_OLD_EXTRA_REFS and T == PyObjPtr:
+        if not bare and NEED_OLD_EXTRA_REFS and T == PyObjPtr:
             result.append('Py_XINCREF(%s);' % newvalue)
         result = '\n'.join(result)
         if T is Void: