[svn:parrot] r42929 - in trunk: compilers/pirc/src src/runcore

[whiteknight at svn.parrot.org]

Author: whiteknight
Date: Mon Dec  7 20:38:51 2009
New Revision: 42929
URL: https://trac.parrot.org/parrot/changeset/42929

Log:
fix for cotto++

Modified:
   trunk/compilers/pirc/src/bcgen.h
   trunk/src/runcore/profiling.c

Modified: trunk/compilers/pirc/src/bcgen.h
==============================================================================
--- trunk/compilers/pirc/src/bcgen.h	Mon Dec  7 20:27:19 2009	(r42928)
+++ trunk/compilers/pirc/src/bcgen.h	Mon Dec  7 20:38:51 2009	(r42929)
@@ -162,6 +162,10 @@
 emit_opcode(ARGIN(bytecode * const bc), opcode_t op)
         __attribute__nonnull__(1);
 
+int emit_pbc_key(ARGIN(bytecode * const bc), ARGIN(key * const k))
+        __attribute__nonnull__(1)
+        __attribute__nonnull__(2);
+
 FLOATVAL get_num_const(ARGIN(bytecode * const bc), unsigned index)
         __attribute__nonnull__(1);
 

Modified: trunk/src/runcore/profiling.c
==============================================================================
--- trunk/src/runcore/profiling.c	Mon Dec  7 20:27:19 2009	(r42928)
+++ trunk/src/runcore/profiling.c	Mon Dec  7 20:38:51 2009	(r42929)
@@ -54,9 +54,8 @@
 
 static void record_values_ascii_pprof(
     ARGIN(Parrot_profiling_runcore_t * runcore),
-    ARGIN(Parrot_profiling_line type))
-        __attribute__nonnull__(1)
-        __attribute__nonnull__(2);
+    ARGIN_NULLOK(Parrot_profiling_line type))
+        __attribute__nonnull__(1);
 
 PARROT_WARN_UNUSED_RESULT
 PARROT_CAN_RETURN_NULL
@@ -72,8 +71,7 @@
     , PARROT_ASSERT_ARG(runcore) \
     , PARROT_ASSERT_ARG(pc))
 #define ASSERT_ARGS_record_values_ascii_pprof __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
-       PARROT_ASSERT_ARG(runcore) \
-    , PARROT_ASSERT_ARG(type))
+       PARROT_ASSERT_ARG(runcore))
 #define ASSERT_ARGS_runops_profiling_core __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \
     , PARROT_ASSERT_ARG(runcore) \
@@ -418,7 +416,7 @@
 
 static void
 record_values_ascii_pprof(ARGIN(Parrot_profiling_runcore_t * runcore),
-ARGIN(Parrot_profiling_line type))
+ARGIN_NULLOK(Parrot_profiling_line type))
 {
     ASSERT_ARGS(record_values_ascii_pprof)