[svn:parrot] r41720 - in branches/pcc_reapply: include/parrot src/call

[bacek at svn.parrot.org]

Author: bacek
Date: Sun Oct  4 23:11:52 2009
New Revision: 41720
URL: https://trac.parrot.org/parrot/changeset/41720

Log:
Fix ARGMOD guard in fill_returns_from_op

Modified:
   branches/pcc_reapply/include/parrot/call.h
   branches/pcc_reapply/src/call/args.c

Modified: branches/pcc_reapply/include/parrot/call.h
==============================================================================
--- branches/pcc_reapply/include/parrot/call.h	Sun Oct  4 23:10:44 2009	(r41719)
+++ branches/pcc_reapply/include/parrot/call.h	Sun Oct  4 23:11:52 2009	(r41720)
@@ -299,11 +299,10 @@
 
 PARROT_EXPORT
 void Parrot_pcc_fill_returns_from_c_args(PARROT_INTERP,
-    ARGMOD(PMC *call_object),
+    ARGMOD_NULLOK(PMC *call_object),
     ARGIN(const char *signature),
     ...)
         __attribute__nonnull__(1)
-        __attribute__nonnull__(2)
         __attribute__nonnull__(3)
         FUNC_MODIFIES(*call_object);
 
@@ -344,7 +343,6 @@
 #define ASSERT_ARGS_Parrot_pcc_fill_returns_from_c_args \
      __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \
-    , PARROT_ASSERT_ARG(call_object) \
     , PARROT_ASSERT_ARG(signature))
 #define ASSERT_ARGS_Parrot_pcc_fill_returns_from_op \
      __attribute__unused__ int _ASSERT_ARGS_CHECK = (\

Modified: branches/pcc_reapply/src/call/args.c
==============================================================================
--- branches/pcc_reapply/src/call/args.c	Sun Oct  4 23:10:44 2009	(r41719)
+++ branches/pcc_reapply/src/call/args.c	Sun Oct  4 23:11:52 2009	(r41720)
@@ -1417,7 +1417,7 @@
 
 PARROT_EXPORT
 void
-Parrot_pcc_fill_returns_from_c_args(PARROT_INTERP, ARGMOD(PMC *call_object),
+Parrot_pcc_fill_returns_from_c_args(PARROT_INTERP, ARGMOD_NULLOK(PMC *call_object),
         ARGIN(const char *signature), ...)
 {
     ASSERT_ARGS(Parrot_pcc_fill_returns_from_c_args)