[pypy-commit] pypy default: Fix and comment.

arigo noreply at buildbot.pypy.org
Mon Feb 27 16:18:11 CET 2012


Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r52929:4991f822e3a7
Date: 2012-02-27 16:17 +0100
http://bitbucket.org/pypy/pypy/changeset/4991f822e3a7/

Log:	Fix and comment.

diff --git a/pypy/rpython/memory/gc/minimark.py b/pypy/rpython/memory/gc/minimark.py
--- a/pypy/rpython/memory/gc/minimark.py
+++ b/pypy/rpython/memory/gc/minimark.py
@@ -608,8 +608,9 @@
         specified as 0 if the object is not varsized.  The returned
         object is fully initialized and zero-filled."""
         #
-        # Here we really need a valid 'typeid'.
-        ll_assert(rffi.cast(lltype.Signed, typeid) != 0,
+        # Here we really need a valid 'typeid', not 0 (as the JIT might
+        # try to send us if there is still a bug).
+        ll_assert(bool(self.combine(typeid, 0)),
                   "external_malloc: typeid == 0")
         #
         # Compute the total size, carefully checking for overflows.


More information about the pypy-commit mailing list