[svn:parrot] r42054 - in trunk: include/parrot src/call
bacek at svn.parrot.org
bacek at svn.parrot.org
Fri Oct 23 22:49:41 UTC 2009
Author: bacek
Date: Fri Oct 23 22:49:41 2009
New Revision: 42054
URL: https://trac.parrot.org/parrot/changeset/42054
Log:
[core] Update guards in Parrot_pcc_merge_signature_for_tailcall. We test argument for nullness inside
Modified:
trunk/include/parrot/call.h
trunk/src/call/args.c
Modified: trunk/include/parrot/call.h
==============================================================================
--- trunk/include/parrot/call.h Fri Oct 23 22:49:15 2009 (r42053)
+++ trunk/include/parrot/call.h Fri Oct 23 22:49:41 2009 (r42054)
@@ -235,11 +235,9 @@
FUNC_MODIFIES(*call_object);
void Parrot_pcc_merge_signature_for_tailcall(PARROT_INTERP,
- ARGMOD(PMC * parent),
- ARGMOD(PMC * tailcall))
+ ARGMOD_NULLOK(PMC * parent),
+ ARGMOD_NULLOK(PMC * tailcall))
__attribute__nonnull__(1)
- __attribute__nonnull__(2)
- __attribute__nonnull__(3)
FUNC_MODIFIES(* parent)
FUNC_MODIFIES(* tailcall);
@@ -295,9 +293,7 @@
, PARROT_ASSERT_ARG(raw_returns))
#define ASSERT_ARGS_Parrot_pcc_merge_signature_for_tailcall \
__attribute__unused__ int _ASSERT_ARGS_CHECK = (\
- PARROT_ASSERT_ARG(interp) \
- , PARROT_ASSERT_ARG(parent) \
- , PARROT_ASSERT_ARG(tailcall))
+ PARROT_ASSERT_ARG(interp))
#define ASSERT_ARGS_Parrot_pcc_parse_signature_string \
__attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
Modified: trunk/src/call/args.c
==============================================================================
--- trunk/src/call/args.c Fri Oct 23 22:49:15 2009 (r42053)
+++ trunk/src/call/args.c Fri Oct 23 22:49:41 2009 (r42054)
@@ -2348,7 +2348,8 @@
*/
void
-Parrot_pcc_merge_signature_for_tailcall(PARROT_INTERP, ARGMOD(PMC * parent), ARGMOD(PMC * tailcall))
+Parrot_pcc_merge_signature_for_tailcall(PARROT_INTERP,
+ ARGMOD_NULLOK(PMC * parent), ARGMOD_NULLOK(PMC * tailcall))
{
ASSERT_ARGS(Parrot_pcc_merge_signature_for_tailcall)
if (PMC_IS_NULL(parent) || PMC_IS_NULL(tailcall))
More information about the parrot-commits
mailing list