[svn:parrot] r39270 - in trunk: include/parrot src

[bacek at svn.parrot.org]

Author: bacek
Date: Sat May 30 14:20:58 2009
New Revision: 39270
URL: https://trac.parrot.org/parrot/changeset/39270

Log:
[core] dest can be null in Parrot_pmc_try_reuse.

Modified:
   trunk/include/parrot/pmc.h
   trunk/src/pmc.c

Modified: trunk/include/parrot/pmc.h
==============================================================================
--- trunk/include/parrot/pmc.h	Sat May 30 14:16:44 2009	(r39269)
+++ trunk/include/parrot/pmc.h	Sat May 30 14:20:58 2009	(r39270)
@@ -54,10 +54,9 @@
 PMC* Parrot_pmc_try_reuse(PARROT_INTERP,
     ARGIN(PMC *self),
     ARGIN_NULLOK(PMC * value),
-    ARGIN(PMC *dest))
+    ARGIN_NULLOK(PMC *dest))
         __attribute__nonnull__(1)
-        __attribute__nonnull__(2)
-        __attribute__nonnull__(4);
+        __attribute__nonnull__(2);
 
 PARROT_EXPORT
 INTVAL PMC_is_null(SHIM_INTERP, ARGIN_NULLOK(const PMC *pmc));
@@ -146,8 +145,7 @@
        PARROT_ASSERT_ARG(interp)
 #define ASSERT_ARGS_Parrot_pmc_try_reuse __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
-    || PARROT_ASSERT_ARG(self) \
-    || PARROT_ASSERT_ARG(dest)
+    || PARROT_ASSERT_ARG(self)
 #define ASSERT_ARGS_PMC_is_null __attribute__unused__ int _ASSERT_ARGS_CHECK = 0
 #define ASSERT_ARGS_pmc_new __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp)

Modified: trunk/src/pmc.c
==============================================================================
--- trunk/src/pmc.c	Sat May 30 14:16:44 2009	(r39269)
+++ trunk/src/pmc.c	Sat May 30 14:20:58 2009	(r39270)
@@ -243,7 +243,7 @@
 PARROT_WARN_UNUSED_RESULT
 PMC*
 Parrot_pmc_try_reuse(PARROT_INTERP, ARGIN(PMC *self), ARGIN_NULLOK(PMC * value),
-    ARGIN(PMC *dest))
+    ARGIN_NULLOK(PMC *dest))
 {
     ASSERT_ARGS(Parrot_pmc_try_reuse)
     /* Can't reuse dest because we'll lost value */