[svn:parrot] r45642 - trunk/src

petdance at svn.parrot.org petdance at svn.parrot.org
Tue Apr 13 20:33:16 UTC 2010


Author: petdance
Date: Tue Apr 13 20:33:16 2010
New Revision: 45642
URL: https://trac.parrot.org/parrot/changeset/45642

Log:
We can't use PMC_IS_NULL() because that calls us here in some cases

Modified:
   trunk/src/pmc.c

Modified: trunk/src/pmc.c
==============================================================================
--- trunk/src/pmc.c	Tue Apr 13 20:26:37 2010	(r45641)
+++ trunk/src/pmc.c	Tue Apr 13 20:33:16 2010	(r45642)
@@ -86,7 +86,12 @@
 Parrot_pmc_is_null(SHIM_INTERP, ARGIN_NULLOK(const PMC *pmc))
 {
     ASSERT_ARGS(Parrot_pmc_is_null)
-    return PMC_IS_NULL(pmc);
+    /* We can't use PMC_IS_NULL() because that calls us here in some cases */
+#if PARROT_CATCH_NULL
+    return pmc == PMCNULL || pmc == NULL;
+#else
+    return pmc == NULL;
+#endif
 }
 
 /*


More information about the parrot-commits mailing list