zig

commit 28ad4e6d83e307b814d76f53795fa5ff61bbdb2f (tree)
parent 3b535d2c3af5259a71916681d87ab0c01f24b58d
Author: Andrew Kelley <superjoe30@gmail.com>
Date:   Thu,  7 Apr 2016 15:09:55 -0700

fix segfault in generic functions

See #22

Diffstat:
M
src/parser.cpp
 | 
8
++++++--
M
test/self_hosted.zig
 | 
12
++++++++++++

2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/parser.cpp b/src/parser.cpp
@@ -2861,8 +2861,12 @@ static void clone_subtree_list_ptr(ZigList<AstNode *> **dest_ptr, ZigList<AstNod
 }
 
 static void clone_subtree_field(AstNode **dest, AstNode *src, uint32_t *next_node_index) {
-    *dest = ast_clone_subtree(src, next_node_index);
-    (*dest)->parent_field = dest;
+    if (src) {
+        *dest = ast_clone_subtree(src, next_node_index);
+        (*dest)->parent_field = dest;
+    } else {
+        *dest = nullptr;
+    }
 }
 
 static void clone_subtree_tld(TopLevelDecl *dest, TopLevelDecl *src, uint32_t *next_node_index) {
diff --git a/test/self_hosted.zig b/test/self_hosted.zig
@@ -542,6 +542,18 @@ fn generic_function_equality() {
 }
 
 
+#attribute("test")
+fn generic_malloc_free() {
+    const a = %%mem_alloc(u8)(10);
+    mem_free(u8)(a);
+}
+const some_mem : [100]u8 = undefined;
+fn mem_alloc(T: type)(n: isize) -> %[]T {
+    return (&T)(&some_mem[0])[0...n];
+}
+fn mem_free(T: type)(mem: []T) { }
+
+
 fn assert(b: bool) {
     if (!b) unreachable{}
 }