Ticket #105: headerizer-asserts-as-local-variable-decl.patch

include/parrot/exceptions.h

@@ -259 +259 @@
 #  define PARROT_ASSERT(x) (x) ? ((void)0) : Parrot_confess(#x, __FILE__, __LINE__)
 #endif
 
+/* having a function version of this lets us put ASSERT_ARGS() at the top
+ * of the list of local variables.  Thus, we can catch bad pointers before
+ * any of the local initialization logic is run.  And it always returns 0,
+ * so headerizer can define the ASSERT_ARGS_* macros like:
+ * int _ASSERT_ARGS = PARROT_ASSERT_ARG(a) || PARROT_ASSERT_ARG(b) || ...
+ */
+static inline int PARROT_ASSERT_ARG(const void *x) {
+    PARROT_ASSERT(x);
+    return 0;
+}
 #define ASSERT_ARGS(a) ASSERT_ARGS_ ## a
 
 

tools/build/headerizer.pl

@@ -311 +311 @@
                 # strip off everything before the final space or asterisk.
                 $var =~ s[.+[* ]([^* ]+)$][$1];
             }
-            push( @asserts, "assert($var);" );
+            push( @asserts, "PARROT_ASSERT_ARG($var)" );
         }
         if( $arg eq 'PARROT_INTERP' ) {
-            push( @asserts, "assert(interp);" );
+            push( @asserts, "PARROT_ASSERT_ARG(interp)" );
         }
     }
 
@@ -380 +380 @@
 
         my $assert = "#define ASSERT_ARGS_" . $func->{name};
         if(@asserts) {
-            $assert .= ' ';
-            $assert .= join(" \\\n" . ' ' x length($assert), @asserts);
+            $assert .= " __attribute__unused__ int _ASSERT_ARGS_CHECK = \\\n       ";
+            $assert .= join(" \\\n    || ", @asserts);
         }
         push(@decls, $assert);
     }