Patches for AIX

src/builtin.c

@@ -1,14 +1,14 @@
 #define _BSD_SOURCE
 #define _GNU_SOURCE
+#ifndef _AIX
 #ifndef __sun__
 # define _XOPEN_SOURCE
 # define _XOPEN_SOURCE_EXTENDED 1
-#elif defined _AIX
-# define _XOPEN_SOURCE 700
 #else
 # define _XPG6
 # define __EXTENSIONS__
 #endif
+#endif /* _AIX */
 #include <sys/time.h>
 #include <stdlib.h>
 #include <stddef.h>

src/bytecode.c

@@ -56,7 +56,8 @@ static void dump_code(int indent, struct bytecode* bc) {
 }
 
 static void symbol_table_free(struct symbol_table* syms) {
-  jv_mem_free(syms->cfunctions);
+  if (syms->cfunctions)
+    jv_mem_free(syms->cfunctions);
   jv_free(syms->cfunc_names);
   jv_mem_free(syms);
 }

src/bytecode.h

@@ -55,6 +55,7 @@ struct cfunction {
 struct symbol_table {
   struct cfunction* cfunctions;
   int ncfunctions;
+  int lencfunctions;
   jv cfunc_names;
 };
 

src/compile.c

@@ -1257,6 +1257,7 @@ static int compile(struct bytecode* bc, block b, struct locfile* lf, jv args, jv
       int idx = bc->globals->ncfunctions++;
       bc->globals->cfunc_names = jv_array_append(bc->globals->cfunc_names,
                                                  jv_string(curr->symbol));
+      assert(idx <= bc->globals->lencfunctions);
       bc->globals->cfunctions[idx] = *curr->imm.cfunc;
       curr->imm.intval = idx;
     }
@@ -1359,8 +1360,13 @@ int block_compile(block b, struct bytecode** out, struct locfile* lf, jv args) {
   bc->nclosures = 0;
   bc->globals = jv_mem_alloc(sizeof(struct symbol_table));
   int ncfunc = count_cfunctions(b);
+  bc->globals->lencfunctions = ncfunc;
   bc->globals->ncfunctions = 0;
-  bc->globals->cfunctions = jv_mem_calloc(sizeof(struct cfunction), ncfunc);
+  if (ncfunc > 0) {
+    bc->globals->cfunctions = jv_mem_calloc(sizeof(struct cfunction), ncfunc);
+  } else {
+    bc->globals->cfunctions = NULL;
+  }
   bc->globals->cfunc_names = jv_array();
   bc->debuginfo = jv_object_set(jv_object(), jv_string("name"), jv_null());
   jv env = jv_invalid();