[pypy-commit] pypy gc-incminimark-pinning: ups, reapply change to rfile from d6c6003d1ae93df5b54e50229989ced778502694

groggi noreply at buildbot.pypy.org
Mon Sep 8 12:39:20 CEST 2014


Author: Gregor Wegberg <code at gregorwegberg.com>
Branch: gc-incminimark-pinning
Changeset: r73374:ba0833e510ae
Date: 2014-09-08 12:38 +0200
http://bitbucket.org/pypy/pypy/changeset/ba0833e510ae/

Log:	ups, reapply change to rfile from
	d6c6003d1ae93df5b54e50229989ced778502694

diff --git a/rpython/rlib/rfile.py b/rpython/rlib/rfile.py
--- a/rpython/rlib/rfile.py
+++ b/rpython/rlib/rfile.py
@@ -317,7 +317,7 @@
     @enforceargs(None, str)
     def write(self, value):
         self._check_closed()
-        ll_value = rffi.get_nonmovingbuffer(value)
+        ll_value, is_pinned, is_raw = rffi.get_nonmovingbuffer(value)
         try:
             # note that since we got a nonmoving buffer, it is either raw
             # or already cannot move, so the arithmetics below are fine
@@ -327,7 +327,7 @@
                 errno = rposix.get_errno()
                 raise OSError(errno, os.strerror(errno))
         finally:
-            rffi.free_nonmovingbuffer(value, ll_value)
+            rffi.free_nonmovingbuffer(value, ll_value, is_pinned, is_raw)
 
     def flush(self):
         self._check_closed()


More information about the pypy-commit mailing list